From e779412209d025294b120ada5d3494ce008f794c Mon Sep 17 00:00:00 2001 From: Kendrick Tan Date: Wed, 8 Apr 2020 06:10:04 +1000 Subject: [PATCH 01/11] tabs for options page --- .../import-vault/useAllowVaultTransfer.ts | 2 +- .../features/position/CoinOptions.tsx | 96 ++++++++++++++++--- 2 files changed, 82 insertions(+), 16 deletions(-) diff --git a/packages/frontend/features/import-vault/useAllowVaultTransfer.ts b/packages/frontend/features/import-vault/useAllowVaultTransfer.ts index bbc71d8..12c70bb 100644 --- a/packages/frontend/features/import-vault/useAllowVaultTransfer.ts +++ b/packages/frontend/features/import-vault/useAllowVaultTransfer.ts @@ -75,7 +75,7 @@ const useAllowVaultTransfer = (selectedVaultId: number) => { }; useEffect(() => { - if (hasProxy) { + if (hasProxy && selectedVaultId !== null) { getAllowStatus(); } }, [selectedVaultId]); diff --git a/packages/frontend/features/position/CoinOptions.tsx b/packages/frontend/features/position/CoinOptions.tsx index 51f051b..473db88 100644 --- a/packages/frontend/features/position/CoinOptions.tsx +++ b/packages/frontend/features/position/CoinOptions.tsx @@ -4,6 +4,7 @@ import { Card, Box, Flex, + Pill, Text, Field, Input, @@ -19,10 +20,18 @@ import BorrowCoin from "./BorrowCoin"; import WithdrawCoin from "./WithdrawCoin"; import RepayCoin from "./RepayCoin"; +enum TAB_OPTIONS { + Borrow, + Repay, + Supply, + Withdraw, +} + const CoinOptions = ({ symbol }) => { const { hasProxy } = DACProxyContainer.useContainer(); const { COINS } = CoinsContainer.useContainer(); const [isOpen, setIsOpen] = useState(false); + const [selectedTab, setSelectedTab] = useState(TAB_OPTIONS.Borrow); const coin = COINS[symbol.toLowerCase()]; @@ -44,24 +53,81 @@ const CoinOptions = ({ symbol }) => { - Options for {coin.name} + + + + Debt + {selectedTab === TAB_OPTIONS.Borrow ? ( + + Borrow + + ) : ( + setSelectedTab(TAB_OPTIONS.Borrow)} + > + Borrow + + )} + {selectedTab === TAB_OPTIONS.Repay ? ( + + Repay + + ) : ( + setSelectedTab(TAB_OPTIONS.Repay)} + > + Repay + + )} + - - Borrow or Repay Debt - - - - - + + Collateral + {selectedTab === TAB_OPTIONS.Supply ? ( + + Supply + + ) : ( + setSelectedTab(TAB_OPTIONS.Supply)} + > + Supply + + )} + {selectedTab === TAB_OPTIONS.Withdraw ? ( + + Withdraw + + ) : ( + setSelectedTab(TAB_OPTIONS.Withdraw)} + > + Withdraw + + )} + + + -
+
- - Supply or Withdraw Collateral - - - - + + {selectedTab === TAB_OPTIONS.Borrow ? ( + + ) : null} + {selectedTab === TAB_OPTIONS.Repay ? ( + + ) : null} + {selectedTab === TAB_OPTIONS.Supply ? ( + + ) : null} + {selectedTab === TAB_OPTIONS.Withdraw ? ( + + ) : null} From 2bdca52192b00fe77c70209ddb74cd5a2599c078 Mon Sep 17 00:00:00 2001 From: Adrian Li Date: Wed, 8 Apr 2020 00:32:16 -0400 Subject: [PATCH 02/11] give constant height to coin options --- packages/frontend/features/position/BorrowCoin.tsx | 14 +++++++------- .../frontend/features/position/CoinOptions.tsx | 2 +- packages/frontend/features/position/RepayCoin.tsx | 4 ++-- packages/frontend/features/position/SupplyCoin.tsx | 4 ++-- .../frontend/features/position/WithdrawCoin.tsx | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/frontend/features/position/BorrowCoin.tsx b/packages/frontend/features/position/BorrowCoin.tsx index 5d9c549..baebe81 100644 --- a/packages/frontend/features/position/BorrowCoin.tsx +++ b/packages/frontend/features/position/BorrowCoin.tsx @@ -22,7 +22,7 @@ const BorrowCoin = ({ coin }) => { // and our `getNewLiquidationPrice` doesn't clobber with one another const [getLiquidationCallId, setGetLiquidationCallId] = useState(null); const [gettingNewLiquidationPrice, setGettingNewLiquidationPrice] = useState( - false + false, ); const [newLiquidationPrice, setNewLiquidationPrice] = useState("—"); @@ -34,7 +34,7 @@ const BorrowCoin = ({ coin }) => { proxy.address, coin.cTokenEquilaventAddress, ethers.utils.parseUnits(amount, coin.decimals), - dedgeHelpers.compound.CTOKEN_ACTIONS.Borrow + dedgeHelpers.compound.CTOKEN_ACTIONS.Borrow, ); setNewLiquidationPrice(liquidationPriceUSD.toFixed(2)); setGettingNewLiquidationPrice(false); @@ -49,14 +49,14 @@ const BorrowCoin = ({ coin }) => { } setGettingNewLiquidationPrice(true); setGetLiquidationCallId( - setTimeout(() => getNewLiquidationPrice(), 500) + setTimeout(() => getNewLiquidationPrice(), 500), ); } catch (e) {} } }, [amount]); return ( - + {/* Supply {coin.symbol} */} @@ -82,7 +82,7 @@ const BorrowCoin = ({ coin }) => { proxy, dedgeCompoundManager.address, coin.cTokenEquilaventAddress, - ethers.utils.parseUnits(amount, coin.decimals) + ethers.utils.parseUnits(amount, coin.decimals), ); window.toastProvider.addMessage(`Borrowing ${coin.symbol}...`, { secondaryMessage: "Check progress on Etherscan", @@ -96,7 +96,7 @@ const BorrowCoin = ({ coin }) => { `Successfully borrowed ${coin.symbol}!`, { variant: "success", - } + }, ); setLoading(false); @@ -119,7 +119,7 @@ const BorrowCoin = ({ coin }) => { New liqudation price:{" $ "} {gettingNewLiquidationPrice ? `...` : newLiquidationPrice.toString()} - + ); }; diff --git a/packages/frontend/features/position/CoinOptions.tsx b/packages/frontend/features/position/CoinOptions.tsx index 473db88..3168f9c 100644 --- a/packages/frontend/features/position/CoinOptions.tsx +++ b/packages/frontend/features/position/CoinOptions.tsx @@ -115,7 +115,7 @@ const CoinOptions = ({ symbol }) => {
- + {selectedTab === TAB_OPTIONS.Borrow ? ( ) : null} diff --git a/packages/frontend/features/position/RepayCoin.tsx b/packages/frontend/features/position/RepayCoin.tsx index 363a93c..9ad78f8 100644 --- a/packages/frontend/features/position/RepayCoin.tsx +++ b/packages/frontend/features/position/RepayCoin.tsx @@ -98,7 +98,7 @@ const RepayCoin = ({ coin }) => { }, [amount]); return ( - + {/* Supply {coin.symbol} */} @@ -219,7 +219,7 @@ const RepayCoin = ({ coin }) => { )} - + ); }; diff --git a/packages/frontend/features/position/SupplyCoin.tsx b/packages/frontend/features/position/SupplyCoin.tsx index cc2b8e8..47ebd13 100644 --- a/packages/frontend/features/position/SupplyCoin.tsx +++ b/packages/frontend/features/position/SupplyCoin.tsx @@ -97,7 +97,7 @@ const SupplyCoin = ({ coin }) => { }, [amount]); return ( - + {/* Supply {coin.symbol} */} @@ -219,7 +219,7 @@ const SupplyCoin = ({ coin }) => { )} - + ); }; diff --git a/packages/frontend/features/position/WithdrawCoin.tsx b/packages/frontend/features/position/WithdrawCoin.tsx index 6327521..4d153ec 100644 --- a/packages/frontend/features/position/WithdrawCoin.tsx +++ b/packages/frontend/features/position/WithdrawCoin.tsx @@ -65,7 +65,7 @@ const WithdrawCoin = ({ coin }) => { }, [amount]); return ( - + {/* Supply {coin.symbol} */} @@ -126,7 +126,7 @@ const WithdrawCoin = ({ coin }) => { New liqudation price:{" $ "} {gettingNewLiquidationPrice ? `...` : newLiquidationPrice.toString()} - + ); }; From 5ba0b4c4641dd49c1c46c441102d9b04553ed680 Mon Sep 17 00:00:00 2001 From: Adrian Li Date: Wed, 8 Apr 2020 00:57:33 -0400 Subject: [PATCH 03/11] render all tabs all the time --- .../frontend/features/position/BorrowCoin.tsx | 9 ++++-- .../features/position/CoinOptions.tsx | 31 +++++++++++-------- .../frontend/features/position/RepayCoin.tsx | 29 ++++++++++------- .../frontend/features/position/SupplyCoin.tsx | 25 +++++++++------ .../features/position/WithdrawCoin.tsx | 19 +++++++----- 5 files changed, 69 insertions(+), 44 deletions(-) diff --git a/packages/frontend/features/position/BorrowCoin.tsx b/packages/frontend/features/position/BorrowCoin.tsx index baebe81..2a301b4 100644 --- a/packages/frontend/features/position/BorrowCoin.tsx +++ b/packages/frontend/features/position/BorrowCoin.tsx @@ -10,7 +10,7 @@ import ConnectionContainer from "../../containers/Connection"; import { useState, useEffect } from "react"; -const BorrowCoin = ({ coin }) => { +const BorrowCoin = ({ coin, hide }) => { const { getBalances } = CompoundPositions.useContainer(); const { contracts } = ContractsContainer.useContainer(); const { proxy } = DACProxyContainer.useContainer(); @@ -56,7 +56,12 @@ const BorrowCoin = ({ coin }) => { }, [amount]); return ( - + {/* Supply {coin.symbol} */} diff --git a/packages/frontend/features/position/CoinOptions.tsx b/packages/frontend/features/position/CoinOptions.tsx index 3168f9c..d78f0c3 100644 --- a/packages/frontend/features/position/CoinOptions.tsx +++ b/packages/frontend/features/position/CoinOptions.tsx @@ -115,19 +115,24 @@ const CoinOptions = ({ symbol }) => {
- - {selectedTab === TAB_OPTIONS.Borrow ? ( - - ) : null} - {selectedTab === TAB_OPTIONS.Repay ? ( - - ) : null} - {selectedTab === TAB_OPTIONS.Supply ? ( - - ) : null} - {selectedTab === TAB_OPTIONS.Withdraw ? ( - - ) : null} + + + + + diff --git a/packages/frontend/features/position/RepayCoin.tsx b/packages/frontend/features/position/RepayCoin.tsx index 9ad78f8..87aa6b2 100644 --- a/packages/frontend/features/position/RepayCoin.tsx +++ b/packages/frontend/features/position/RepayCoin.tsx @@ -11,7 +11,7 @@ import DACProxyContainer from "../../containers/DACProxy"; import { useState, useEffect } from "react"; -const RepayCoin = ({ coin }) => { +const RepayCoin = ({ coin, hide }) => { const { getBalances } = CompoundPositions.useContainer(); const { contracts } = ContractsContainer.useContainer(); const { signer, address } = ConnectionContainer.useContainer(); @@ -26,7 +26,7 @@ const RepayCoin = ({ coin }) => { // and our `getNewLiquidationPrice` doesn't clobber with one another const [getLiquidationCallId, setGetLiquidationCallId] = useState(null); const [gettingNewLiquidationPrice, setGettingNewLiquidationPrice] = useState( - false + false, ); const [newLiquidationPrice, setNewLiquidationPrice] = useState("—"); @@ -38,7 +38,7 @@ const RepayCoin = ({ coin }) => { proxy.address, coin.cTokenEquilaventAddress, ethers.utils.parseUnits(amount, coin.decimals), - dedgeHelpers.compound.CTOKEN_ACTIONS.Repay + dedgeHelpers.compound.CTOKEN_ACTIONS.Repay, ); setNewLiquidationPrice(liquidationPriceUSD.toFixed(2)); setGettingNewLiquidationPrice(false); @@ -53,7 +53,7 @@ const RepayCoin = ({ coin }) => { } setGettingNewLiquidationPrice(true); setGetLiquidationCallId( - setTimeout(() => getNewLiquidationPrice(), 500) + setTimeout(() => getNewLiquidationPrice(), 500), ); } catch (e) {} } @@ -68,7 +68,7 @@ const RepayCoin = ({ coin }) => { const tokenContract = new ethers.Contract( coin.address, legos.erc20.abi, - signer + signer, ); const allowance = await tokenContract.allowance(address, proxyAddress); @@ -87,7 +87,6 @@ const RepayCoin = ({ coin }) => { } }, [proxy]); - useEffect(() => { if (amount !== "") { try { @@ -98,7 +97,12 @@ const RepayCoin = ({ coin }) => { }, [amount]); return ( - + {/* Supply {coin.symbol} */} @@ -129,7 +133,7 @@ const RepayCoin = ({ coin }) => { const tokenContract = new ethers.Contract( coin.address, legos.erc20.abi, - signer + signer, ); const tx = await tokenContract.approve(proxyAddress, maxUINT); @@ -145,7 +149,7 @@ const RepayCoin = ({ coin }) => { `Successfully approved ${coin.symbol}!`, { variant: "success", - } + }, ); setTransferLoading(false); @@ -179,7 +183,7 @@ const RepayCoin = ({ coin }) => { proxy, dedgeCompoundManager.address, coin.cTokenEquilaventAddress, - ethers.utils.parseUnits(amount, coin.decimals) + ethers.utils.parseUnits(amount, coin.decimals), ); window.toastProvider.addMessage(`Repaying ${coin.symbol}...`, { secondaryMessage: "Check progress on Etherscan", @@ -193,7 +197,7 @@ const RepayCoin = ({ coin }) => { `Successfully repayed ${coin.symbol}!`, { variant: "success", - } + }, ); setLoading(false); @@ -209,7 +213,8 @@ const RepayCoin = ({ coin }) => { )} -

+
+
New liqudation price:{" $ "} diff --git a/packages/frontend/features/position/SupplyCoin.tsx b/packages/frontend/features/position/SupplyCoin.tsx index 47ebd13..802867d 100644 --- a/packages/frontend/features/position/SupplyCoin.tsx +++ b/packages/frontend/features/position/SupplyCoin.tsx @@ -11,7 +11,7 @@ import DACProxyContainer from "../../containers/DACProxy"; import { useState, useEffect } from "react"; -const SupplyCoin = ({ coin }) => { +const SupplyCoin = ({ coin, hide }) => { const { getBalances } = CompoundPositions.useContainer(); const { contracts } = ContractsContainer.useContainer(); const { signer, address } = ConnectionContainer.useContainer(); @@ -26,7 +26,7 @@ const SupplyCoin = ({ coin }) => { // and our `getNewLiquidationPrice` doesn't clobber with one another const [getLiquidationCallId, setGetLiquidationCallId] = useState(null); const [gettingNewLiquidationPrice, setGettingNewLiquidationPrice] = useState( - false + false, ); const [newLiquidationPrice, setNewLiquidationPrice] = useState("—"); @@ -38,7 +38,7 @@ const SupplyCoin = ({ coin }) => { proxy.address, coin.cTokenEquilaventAddress, ethers.utils.parseUnits(amount, coin.decimals), - dedgeHelpers.compound.CTOKEN_ACTIONS.Supply + dedgeHelpers.compound.CTOKEN_ACTIONS.Supply, ); setNewLiquidationPrice(liquidationPriceUSD.toFixed(2)); setGettingNewLiquidationPrice(false); @@ -53,7 +53,7 @@ const SupplyCoin = ({ coin }) => { } setGettingNewLiquidationPrice(true); setGetLiquidationCallId( - setTimeout(() => getNewLiquidationPrice(), 500) + setTimeout(() => getNewLiquidationPrice(), 500), ); } catch (e) {} } @@ -68,7 +68,7 @@ const SupplyCoin = ({ coin }) => { const tokenContract = new ethers.Contract( coin.address, legos.erc20.abi, - signer + signer, ); const allowance = await tokenContract.allowance(address, proxyAddress); @@ -97,7 +97,12 @@ const SupplyCoin = ({ coin }) => { }, [amount]); return ( - + {/* Supply {coin.symbol} */} @@ -128,7 +133,7 @@ const SupplyCoin = ({ coin }) => { const tokenContract = new ethers.Contract( coin.address, legos.erc20.abi, - signer + signer, ); const tx = await tokenContract.approve(proxyAddress, maxUINT); @@ -144,7 +149,7 @@ const SupplyCoin = ({ coin }) => { `Successfully approved ${coin.symbol}!`, { variant: "success", - } + }, ); setTransferLoading(false); @@ -178,7 +183,7 @@ const SupplyCoin = ({ coin }) => { proxy, dedgeCompoundManager.address, coin.cTokenEquilaventAddress, - ethers.utils.parseUnits(amount, coin.decimals) + ethers.utils.parseUnits(amount, coin.decimals), ); window.toastProvider.addMessage(`Supplying ${coin.symbol}...`, { secondaryMessage: "Check progress on Etherscan", @@ -192,7 +197,7 @@ const SupplyCoin = ({ coin }) => { `Successfully supplied ${coin.symbol}!`, { variant: "success", - } + }, ); setLoading(false); diff --git a/packages/frontend/features/position/WithdrawCoin.tsx b/packages/frontend/features/position/WithdrawCoin.tsx index 4d153ec..6a51766 100644 --- a/packages/frontend/features/position/WithdrawCoin.tsx +++ b/packages/frontend/features/position/WithdrawCoin.tsx @@ -10,7 +10,7 @@ import ConnectionContainer from "../../containers/Connection"; import { useState, useEffect } from "react"; -const WithdrawCoin = ({ coin }) => { +const WithdrawCoin = ({ coin, hide }) => { const { getBalances } = CompoundPositions.useContainer(); const { contracts } = ContractsContainer.useContainer(); const { proxy } = DACProxyContainer.useContainer(); @@ -22,7 +22,7 @@ const WithdrawCoin = ({ coin }) => { // and our `getNewLiquidationPrice` doesn't clobber with one another const [getLiquidationCallId, setGetLiquidationCallId] = useState(null); const [gettingNewLiquidationPrice, setGettingNewLiquidationPrice] = useState( - false + false, ); const [newLiquidationPrice, setNewLiquidationPrice] = useState("—"); @@ -34,7 +34,7 @@ const WithdrawCoin = ({ coin }) => { proxy.address, coin.cTokenEquilaventAddress, ethers.utils.parseUnits(amount, coin.decimals), - dedgeHelpers.compound.CTOKEN_ACTIONS.Withdraw + dedgeHelpers.compound.CTOKEN_ACTIONS.Withdraw, ); setNewLiquidationPrice(liquidationPriceUSD.toFixed(2)); setGettingNewLiquidationPrice(false); @@ -49,7 +49,7 @@ const WithdrawCoin = ({ coin }) => { } setGettingNewLiquidationPrice(true); setGetLiquidationCallId( - setTimeout(() => getNewLiquidationPrice(), 500) + setTimeout(() => getNewLiquidationPrice(), 500), ); } catch (e) {} } @@ -65,7 +65,12 @@ const WithdrawCoin = ({ coin }) => { }, [amount]); return ( - + {/* Supply {coin.symbol} */} @@ -89,7 +94,7 @@ const WithdrawCoin = ({ coin }) => { proxy, dedgeCompoundManager.address, coin.cTokenEquilaventAddress, - ethers.utils.parseUnits(amount, coin.decimals) + ethers.utils.parseUnits(amount, coin.decimals), ); window.toastProvider.addMessage(`Withdrawing ${coin.symbol}...`, { secondaryMessage: "Check progress on Etherscan", @@ -103,7 +108,7 @@ const WithdrawCoin = ({ coin }) => { `Successfully withdrew ${coin.symbol}!`, { variant: "success", - } + }, ); setLoading(false); From 274badde09b2b546a349340ea8f3dd103101bb5d Mon Sep 17 00:00:00 2001 From: Adrian Li Date: Wed, 8 Apr 2020 01:11:11 -0400 Subject: [PATCH 04/11] prevent tabs from jumping around --- .../features/position/CoinOptions.tsx | 56 +++++++++++-------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/packages/frontend/features/position/CoinOptions.tsx b/packages/frontend/features/position/CoinOptions.tsx index d78f0c3..6558325 100644 --- a/packages/frontend/features/position/CoinOptions.tsx +++ b/packages/frontend/features/position/CoinOptions.tsx @@ -62,24 +62,28 @@ const CoinOptions = ({ symbol }) => { Borrow ) : ( - setSelectedTab(TAB_OPTIONS.Borrow)} - > - Borrow - + + setSelectedTab(TAB_OPTIONS.Borrow)} + > + Borrow + + )} {selectedTab === TAB_OPTIONS.Repay ? ( Repay ) : ( - setSelectedTab(TAB_OPTIONS.Repay)} - > - Repay - + + setSelectedTab(TAB_OPTIONS.Repay)} + > + Repay + + )} @@ -90,24 +94,28 @@ const CoinOptions = ({ symbol }) => { Supply ) : ( - setSelectedTab(TAB_OPTIONS.Supply)} - > - Supply - + + setSelectedTab(TAB_OPTIONS.Supply)} + > + Supply + + )} {selectedTab === TAB_OPTIONS.Withdraw ? ( Withdraw ) : ( - setSelectedTab(TAB_OPTIONS.Withdraw)} - > - Withdraw - + + setSelectedTab(TAB_OPTIONS.Withdraw)} + > + Withdraw + + )} From ea8317dc61414ddf2cc5bd12da0df15aa2ca65ae Mon Sep 17 00:00:00 2001 From: Kendrick Tan Date: Wed, 8 Apr 2020 06:41:08 +1000 Subject: [PATCH 05/11] handle logic if tx fails or if user cancels tx --- packages/frontend/containers/DACProxy.tsx | 75 ++++++++----- .../features/exit-position/ExitPosition.tsx | 63 +++++++---- .../import-vault/useAllowVaultTransfer.ts | 64 +++++++---- .../features/import-vault/useImportVault.ts | 61 ++++++---- .../frontend/features/position/BorrowCoin.tsx | 57 ++++++---- .../frontend/features/position/RepayCoin.tsx | 97 ++++++++++++---- .../frontend/features/position/SupplyCoin.tsx | 52 ++++++--- .../features/position/WithdrawCoin.tsx | 56 +++++---- .../frontend/features/swap-tokens/useSwap.ts | 106 ++++++++++++------ 9 files changed, 430 insertions(+), 201 deletions(-) diff --git a/packages/frontend/containers/DACProxy.tsx b/packages/frontend/containers/DACProxy.tsx index 5acff33..d8d95c9 100644 --- a/packages/frontend/containers/DACProxy.tsx +++ b/packages/frontend/containers/DACProxy.tsx @@ -43,34 +43,53 @@ function useDACProxy() { dedgeCompoundManager, } = contracts; setLoading(true); - const tx = await dedgeHelpers.proxyFactory.buildAndEnterMarkets( - dacProxyFactory, - dedgeCompoundManager.address, - [ - cEther.address, - cDai.address, - cRep.address, - cZrx.address, - cBat.address, - cUsdc.address, - cWbtc.address, - ], - ); - - window.toastProvider.addMessage("Creating Smart Wallet...", { - secondaryMessage: "Check progress on Etherscan", - actionHref: `https://etherscan.io/tx/${tx.hash}`, - actionText: "Check", - variant: "processing", - }); - - await tx.wait(); - - window.toastProvider.addMessage("Smart Wallet created", { - variant: "success", - }); - setLoading(false); + let tx = null; + try { + tx = await dedgeHelpers.proxyFactory.buildAndEnterMarkets( + dacProxyFactory, + dedgeCompoundManager.address, + [ + cEther.address, + cDai.address, + cRep.address, + cZrx.address, + cBat.address, + cUsdc.address, + cWbtc.address, + ] + ); + + window.toastProvider.addMessage("Creating Smart Wallet...", { + secondaryMessage: "Check progress on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "processing", + }); + + await tx.wait(); + + window.toastProvider.addMessage("Smart Wallet created", { + variant: "success", + }); + } catch (e) { + if (tx === null) { + window.toastProvider.addMessage(`Tx cancelled`, { + variant: "failure", + }); + } else { + window.toastProvider.addMessage(`Failed to create wallet...`, { + secondaryMessage: "Check reason on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "failure", + }); + } + setLoading(false); + return; + } + + setLoading(false); fetchProxyAddress(); }; @@ -86,7 +105,7 @@ function useDACProxy() { if (proxyAddress) { const { abi } = legos.dappsys.dsProxy; const proxyContract = new ethers.Contract(proxyAddress, abi, signer); - window.analytics.identify(proxyAddress) + window.analytics.identify(proxyAddress); setProxyContract(proxyContract); } }, [proxyAddress, signer]); diff --git a/packages/frontend/features/exit-position/ExitPosition.tsx b/packages/frontend/features/exit-position/ExitPosition.tsx index a2af3a9..93aef48 100644 --- a/packages/frontend/features/exit-position/ExitPosition.tsx +++ b/packages/frontend/features/exit-position/ExitPosition.tsx @@ -87,29 +87,50 @@ const ExitPositionsButton = () => { collateralMarkets, } = await dedgeHelpers.exit.getExitPositionParameters( signer, - proxy.address, + proxy.address ); - const tx = await dedgeHelpers.exit.exitPositionToETH( - address, - etherToBorrowWeiBN, - proxy, - dedgeAddressRegistry.address, - dedgeExitManager.address, - debtMarkets, - collateralMarkets, - ); - window.toastProvider.addMessage(`Exiting positions...`, { - secondaryMessage: "Check progress on Etherscan", - actionHref: `https://etherscan.io/tx/${tx.hash}`, - actionText: "Check", - variant: "processing", - }); - await tx.wait(); - - window.toastProvider.addMessage(`Exited Positions!`, { - variant: "success", - }); + let tx = null; + try { + tx = await dedgeHelpers.exit.exitPositionToETH( + address, + etherToBorrowWeiBN, + proxy, + dedgeAddressRegistry.address, + dedgeExitManager.address, + debtMarkets, + collateralMarkets + ); + window.toastProvider.addMessage(`Exiting positions...`, { + secondaryMessage: "Check progress on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "processing", + }); + await tx.wait(); + + window.toastProvider.addMessage(`Exited Positions!`, { + variant: "success", + }); + } catch (e) { + if (tx === null) { + window.toastProvider.addMessage(`Tx cancelled`, { + variant: "failure", + }); + } else { + window.toastProvider.addMessage( + `Failed to exit poisitions...`, + { + secondaryMessage: "Check reason on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "failure", + } + ); + } + setLoading(false); + return; + } window.analytics.track("Exit Positions Success"); setLoading(false); diff --git a/packages/frontend/features/import-vault/useAllowVaultTransfer.ts b/packages/frontend/features/import-vault/useAllowVaultTransfer.ts index 12c70bb..7c627d3 100644 --- a/packages/frontend/features/import-vault/useAllowVaultTransfer.ts +++ b/packages/frontend/features/import-vault/useAllowVaultTransfer.ts @@ -23,7 +23,7 @@ const useAllowVaultTransfer = (selectedVaultId: number) => { const allowed = await dedgeHelpers.maker.isUserAllowedVault( proxy.address, selectedVaultId, - makerCdpManager, + makerCdpManager ); setImportAllowed(Boolean(allowed)); @@ -44,31 +44,47 @@ const useAllowVaultTransfer = (selectedVaultId: number) => { const makerDsProxyContract = new ethers.Contract( userMakerdaoProxyAddress, legos.dappsys.dsProxy.abi, - signer, - ); - - const tx = await dedgeHelpers.maker.dsProxyCdpAllowDacProxy( - makerDsProxyContract, - proxyAddress, - makerCdpManager.address, - makerProxyActions.address, - selectedVaultId.toString(), + signer ); - window.toastProvider.addMessage(`Allowing vault #${selectedVaultId}...`, { - secondaryMessage: "Check progress on Etherscan", - actionHref: `https://etherscan.io/tx/${tx.hash}`, - actionText: "Check", - variant: "processing", - }); - - await tx.wait(); - - window.toastProvider.addMessage( - `Vault #${selectedVaultId} allowance approved`, - { variant: "success" }, - ); - window.analytics.track("Allow Vault Success", { selectedVaultId }); + let tx = null; + try { + tx = await dedgeHelpers.maker.dsProxyCdpAllowDacProxy( + makerDsProxyContract, + proxyAddress, + makerCdpManager.address, + makerProxyActions.address, + selectedVaultId.toString() + ); + window.toastProvider.addMessage(`Allowing vault #${selectedVaultId}...`, { + secondaryMessage: "Check progress on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "processing", + }); + await tx.wait(); + + window.toastProvider.addMessage( + `Vault #${selectedVaultId} allowance approved`, + { variant: "success" } + ); + window.analytics.track("Allow Vault Success", { selectedVaultId }); + } catch (e) { + if (tx === null) { + window.toastProvider.addMessage(`Tx cancelled`, { + variant: "failure", + }); + } else { + window.toastProvider.addMessage(`Failed to allow vault...`, { + secondaryMessage: "Check reason on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "failure", + }); + } + setLoading(false); + return; + } setLoading(false); getAllowStatus(); diff --git a/packages/frontend/features/import-vault/useImportVault.ts b/packages/frontend/features/import-vault/useImportVault.ts index 754128a..c874da2 100644 --- a/packages/frontend/features/import-vault/useImportVault.ts +++ b/packages/frontend/features/import-vault/useImportVault.ts @@ -44,28 +44,49 @@ const useImportVault = (selectedVaultId) => { console.error("Invalid ilk", ilk); } - const tx = await dedgeHelpers.maker.importMakerVault( - proxy, - dedgeMakerManager.address, - dedgeAddressRegistry.address, - selectedVaultId.toString(), - ilkCTokenEquilavent, - ilkJoinAddress, - decimals, - ); + let tx = null; + try { + tx = await dedgeHelpers.maker.importMakerVault( + proxy, + dedgeMakerManager.address, + dedgeAddressRegistry.address, + selectedVaultId.toString(), + ilkCTokenEquilavent, + ilkJoinAddress, + decimals + ); - window.toastProvider.addMessage(`Importing vault #${selectedVaultId}...`, { - secondaryMessage: "Check progress on Etherscan", - actionHref: `https://etherscan.io/tx/${tx.hash}`, - actionText: "Check", - variant: "processing", - }); + window.toastProvider.addMessage( + `Importing vault #${selectedVaultId}...`, + { + secondaryMessage: "Check progress on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "processing", + } + ); - await tx.wait(); - window.toastProvider.addMessage(`Vault #${selectedVaultId} imported!`, { - variant: "success", - }); - window.analytics.track("Import Vault Success", { selectedVaultId }); + await tx.wait(); + window.toastProvider.addMessage(`Vault #${selectedVaultId} imported!`, { + variant: "success", + }); + window.analytics.track("Import Vault Success", { selectedVaultId }); + } catch (e) { + if (tx === null) { + window.toastProvider.addMessage(`Tx cancelled`, { + variant: "failure", + }); + } else { + window.toastProvider.addMessage(`Failed to import vault...`, { + secondaryMessage: "Check reason on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "failure", + }); + } + setLoading(false); + return; + } setLoading(false); getVaults(); diff --git a/packages/frontend/features/position/BorrowCoin.tsx b/packages/frontend/features/position/BorrowCoin.tsx index 2a301b4..293facd 100644 --- a/packages/frontend/features/position/BorrowCoin.tsx +++ b/packages/frontend/features/position/BorrowCoin.tsx @@ -83,26 +83,45 @@ const BorrowCoin = ({ coin, hide }) => { setLoading(true); const { dedgeCompoundManager } = contracts; - const tx = await dedgeHelpers.compound.borrowThroughProxy( - proxy, - dedgeCompoundManager.address, - coin.cTokenEquilaventAddress, - ethers.utils.parseUnits(amount, coin.decimals), - ); - window.toastProvider.addMessage(`Borrowing ${coin.symbol}...`, { - secondaryMessage: "Check progress on Etherscan", - actionHref: `https://etherscan.io/tx/${tx.hash}`, - actionText: "Check", - variant: "processing", - }); - await tx.wait(); + let tx = null; - window.toastProvider.addMessage( - `Successfully borrowed ${coin.symbol}!`, - { - variant: "success", - }, - ); + try { + tx = await dedgeHelpers.compound.borrowThroughProxy( + proxy, + dedgeCompoundManager.address, + coin.cTokenEquilaventAddress, + ethers.utils.parseUnits(amount, coin.decimals) + ); + window.toastProvider.addMessage(`Borrowing ${coin.symbol}...`, { + secondaryMessage: "Check progress on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "processing", + }); + await tx.wait(); + + window.toastProvider.addMessage( + `Successfully borrowed ${coin.symbol}!`, + { + variant: "success", + } + ); + } catch (e) { + if (tx === null) { + window.toastProvider.addMessage(`Tx cancelled`, { + variant: "failure", + }); + } else { + window.toastProvider.addMessage(`Failed to borrow...`, { + secondaryMessage: "Check reason on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "failure", + }); + } + setLoading(false); + return; + } setLoading(false); getBalances(); diff --git a/packages/frontend/features/position/RepayCoin.tsx b/packages/frontend/features/position/RepayCoin.tsx index 87aa6b2..ab1e7db 100644 --- a/packages/frontend/features/position/RepayCoin.tsx +++ b/packages/frontend/features/position/RepayCoin.tsx @@ -136,6 +136,7 @@ const RepayCoin = ({ coin, hide }) => { signer, ); +<<<<<<< HEAD const tx = await tokenContract.approve(proxyAddress, maxUINT); window.toastProvider.addMessage(`Approving ${coin.symbol}...`, { secondaryMessage: "Check progress on Etherscan", @@ -151,9 +152,43 @@ const RepayCoin = ({ coin, hide }) => { variant: "success", }, ); +======= + let tx = null; + try { + tx = await tokenContract.approve(proxyAddress, maxUINT); + window.toastProvider.addMessage(`Approving ${coin.symbol}...`, { + secondaryMessage: "Check progress on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "processing", + }); + await tx.wait(); - setTransferLoading(false); + window.toastProvider.addMessage( + `Successfully approved ${coin.symbol}!`, + { + variant: "success", + } + ); + } catch (e) { + if (tx === null) { + window.toastProvider.addMessage(`Tx cancelled`, { + variant: "failure", + }); + } else { + window.toastProvider.addMessage(`Failed to approve ${coin.symbol}...`, { + secondaryMessage: "Check reason on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "failure", + }); + } + setTransferLoading(false); + return; + } +>>>>>>> handle logic if tx fails or if user cancels tx + setTransferLoading(false); getCanTransfer(); }} > @@ -179,26 +214,48 @@ const RepayCoin = ({ coin, hide }) => { setLoading(true); const { dedgeCompoundManager } = contracts; - const tx = await dedgeHelpers.compound.repayThroughProxy( - proxy, - dedgeCompoundManager.address, - coin.cTokenEquilaventAddress, - ethers.utils.parseUnits(amount, coin.decimals), - ); - window.toastProvider.addMessage(`Repaying ${coin.symbol}...`, { - secondaryMessage: "Check progress on Etherscan", - actionHref: `https://etherscan.io/tx/${tx.hash}`, - actionText: "Check", - variant: "processing", - }); - await tx.wait(); + let tx = null; - window.toastProvider.addMessage( - `Successfully repayed ${coin.symbol}!`, - { - variant: "success", - }, - ); + try { + tx = await dedgeHelpers.compound.repayThroughProxy( + proxy, + dedgeCompoundManager.address, + coin.cTokenEquilaventAddress, + ethers.utils.parseUnits(amount, coin.decimals) + ); + window.toastProvider.addMessage(`Repaying ${coin.symbol}...`, { + secondaryMessage: "Check progress on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "processing", + }); + await tx.wait(); + + window.toastProvider.addMessage( + `Successfully repayed ${coin.symbol}!`, + { + variant: "success", + } + ); + } catch (e) { + if (tx === null) { + window.toastProvider.addMessage(`Tx cancelled`, { + variant: "failure", + }); + } else { + window.toastProvider.addMessage( + `Failed to repay...`, + { + secondaryMessage: "Check reason on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "failure", + } + ); + } + setLoading(false); + return; + } setLoading(false); getBalances(); diff --git a/packages/frontend/features/position/SupplyCoin.tsx b/packages/frontend/features/position/SupplyCoin.tsx index 802867d..24e9f6b 100644 --- a/packages/frontend/features/position/SupplyCoin.tsx +++ b/packages/frontend/features/position/SupplyCoin.tsx @@ -136,24 +136,44 @@ const SupplyCoin = ({ coin, hide }) => { signer, ); - const tx = await tokenContract.approve(proxyAddress, maxUINT); - window.toastProvider.addMessage(`Approving ${coin.symbol}...`, { - secondaryMessage: "Check progress on Etherscan", - actionHref: `https://etherscan.io/tx/${tx.hash}`, - actionText: "Check", - variant: "processing", - }); - await tx.wait(); - - window.toastProvider.addMessage( - `Successfully approved ${coin.symbol}!`, - { - variant: "success", - }, - ); + let tx = null; + try { + tx = await tokenContract.approve(proxyAddress, maxUINT); + window.toastProvider.addMessage(`Approving ${coin.symbol}...`, { + secondaryMessage: "Check progress on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "processing", + }); + await tx.wait(); + + window.toastProvider.addMessage( + `Successfully approved ${coin.symbol}!`, + { + variant: "success", + } + ); + } catch (e) { + if (tx === null) { + window.toastProvider.addMessage(`Tx cancelled`, { + variant: "failure", + }); + } else { + window.toastProvider.addMessage( + `Failed to approve ${coin.symbol}...`, + { + secondaryMessage: "Check reason on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "failure", + } + ); + } + setTransferLoading(false); + return; + } setTransferLoading(false); - getCanTransfer(); }} > diff --git a/packages/frontend/features/position/WithdrawCoin.tsx b/packages/frontend/features/position/WithdrawCoin.tsx index 6a51766..ebf9fa3 100644 --- a/packages/frontend/features/position/WithdrawCoin.tsx +++ b/packages/frontend/features/position/WithdrawCoin.tsx @@ -90,26 +90,44 @@ const WithdrawCoin = ({ coin, hide }) => { setLoading(true); const { dedgeCompoundManager } = contracts; - const tx = await dedgeHelpers.compound.withdrawThroughProxy( - proxy, - dedgeCompoundManager.address, - coin.cTokenEquilaventAddress, - ethers.utils.parseUnits(amount, coin.decimals), - ); - window.toastProvider.addMessage(`Withdrawing ${coin.symbol}...`, { - secondaryMessage: "Check progress on Etherscan", - actionHref: `https://etherscan.io/tx/${tx.hash}`, - actionText: "Check", - variant: "processing", - }); - await tx.wait(); + let tx = null; + try { + tx = await dedgeHelpers.compound.withdrawThroughProxy( + proxy, + dedgeCompoundManager.address, + coin.cTokenEquilaventAddress, + ethers.utils.parseUnits(amount, coin.decimals) + ); + window.toastProvider.addMessage(`Withdrawing ${coin.symbol}...`, { + secondaryMessage: "Check progress on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "processing", + }); + await tx.wait(); - window.toastProvider.addMessage( - `Successfully withdrew ${coin.symbol}!`, - { - variant: "success", - }, - ); + window.toastProvider.addMessage( + `Successfully withdrew ${coin.symbol}!`, + { + variant: "success", + } + ); + } catch (e) { + if (tx === null) { + window.toastProvider.addMessage(`Tx cancelled`, { + variant: "failure", + }); + } else { + window.toastProvider.addMessage(`Failed to withdraw...`, { + secondaryMessage: "Check reason on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "failure", + }); + } + setLoading(false); + return; + } setLoading(false); getBalances(); diff --git a/packages/frontend/features/swap-tokens/useSwap.ts b/packages/frontend/features/swap-tokens/useSwap.ts index 117ea2c..5b01507 100644 --- a/packages/frontend/features/swap-tokens/useSwap.ts +++ b/packages/frontend/features/swap-tokens/useSwap.ts @@ -49,12 +49,65 @@ const useSwap = (thingToSwap, fromTokenStr, toTokenStr, amountToSwap) => { to: toTokenStr, amount: amountToSwap, }); - const tx = await swapDebt( + let tx = null; + + try { + await swapDebt( + ADDRESS_MAP[fromTokenStr], + ADDRESS_MAP[toTokenStr], + amount + ); + window.toastProvider.addMessage(`Swapping debt...`, { + secondaryMessage: "Check progress on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "processing", + }); + await tx.wait(); + window.toastProvider.addMessage(`Swap Debt Success!`, { + variant: "success", + }); + window.analytics.track("Swap Debt Success", { + from: fromTokenStr, + to: toTokenStr, + amount: amountToSwap, + }); + } catch (e) { + if (tx === null) { + window.toastProvider.addMessage(`Tx cancelled`, { + variant: "failure", + }); + } else { + window.toastProvider.addMessage(`Failed to swap debt...`, { + secondaryMessage: "Check reason on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "failure", + }); + } + setLoading(false); + return; + } + + setLoading(false); + return; + } + + // perform swap collateral + window.analytics.track("Swap Collateral Start", { + from: fromTokenStr, + to: toTokenStr, + amount: amountToSwap, + }); + let tx = null; + + try { + tx = await swapCollateral( ADDRESS_MAP[fromTokenStr], ADDRESS_MAP[toTokenStr], amount ); - window.toastProvider.addMessage(`Swapping debt...`, { + window.toastProvider.addMessage(`Swapping collateral...`, { secondaryMessage: "Check progress on Etherscan", actionHref: `https://etherscan.io/tx/${tx.hash}`, actionText: "Check", @@ -62,46 +115,31 @@ const useSwap = (thingToSwap, fromTokenStr, toTokenStr, amountToSwap) => { }); await tx.wait(); setLoading(false); - window.toastProvider.addMessage(`Swap Debt Success!`, { + + window.toastProvider.addMessage(`Swap Collateral Success!`, { variant: "success", }); - window.analytics.track("Swap Debt Success", { + window.analytics.track("Swap Collateral Success", { from: fromTokenStr, to: toTokenStr, amount: amountToSwap, }); + } catch (e) { + if (tx === null) { + window.toastProvider.addMessage(`Tx cancelled`, { + variant: "failure", + }); + } else { + window.toastProvider.addMessage(`Failed to swap collateral...`, { + secondaryMessage: "Check reason on Etherscan", + actionHref: `https://etherscan.io/tx/${tx.hash}`, + actionText: "Check", + variant: "failure", + }); + } + setLoading(false); return; } - - // perform swap collateral - window.analytics.track("Swap Collateral Start", { - from: fromTokenStr, - to: toTokenStr, - amount: amountToSwap, - }); - const tx = await swapCollateral( - ADDRESS_MAP[fromTokenStr], - ADDRESS_MAP[toTokenStr], - amount - ); - window.toastProvider.addMessage(`Swapping collateral...`, { - secondaryMessage: "Check progress on Etherscan", - actionHref: `https://etherscan.io/tx/${tx.hash}`, - actionText: "Check", - variant: "processing", - }); - await tx.wait(); - - window.toastProvider.addMessage(`Swap Collateral Success!`, { - variant: "success", - }); - window.analytics.track("Swap Collateral Success", { - from: fromTokenStr, - to: toTokenStr, - amount: amountToSwap, - }); - setLoading(false); - return; }; return { swapFunction, loading }; From 791592803b7f0f3dd18feb849d33f1c706525976 Mon Sep 17 00:00:00 2001 From: Adrian Li Date: Wed, 8 Apr 2020 04:20:41 -0400 Subject: [PATCH 06/11] rename Tx to Transaction --- packages/frontend/containers/DACProxy.tsx | 2 +- packages/frontend/features/exit-position/ExitPosition.tsx | 2 +- .../frontend/features/import-vault/useAllowVaultTransfer.ts | 2 +- packages/frontend/features/import-vault/useImportVault.ts | 2 +- packages/frontend/features/position/BorrowCoin.tsx | 2 +- packages/frontend/features/position/RepayCoin.tsx | 2 +- packages/frontend/features/position/SupplyCoin.tsx | 2 +- packages/frontend/features/position/WithdrawCoin.tsx | 2 +- packages/frontend/features/swap-tokens/useSwap.ts | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/frontend/containers/DACProxy.tsx b/packages/frontend/containers/DACProxy.tsx index d8d95c9..8ddf5c7 100644 --- a/packages/frontend/containers/DACProxy.tsx +++ b/packages/frontend/containers/DACProxy.tsx @@ -74,7 +74,7 @@ function useDACProxy() { }); } catch (e) { if (tx === null) { - window.toastProvider.addMessage(`Tx cancelled`, { + window.toastProvider.addMessage(`Transaction cancelled`, { variant: "failure", }); } else { diff --git a/packages/frontend/features/exit-position/ExitPosition.tsx b/packages/frontend/features/exit-position/ExitPosition.tsx index 93aef48..6128c41 100644 --- a/packages/frontend/features/exit-position/ExitPosition.tsx +++ b/packages/frontend/features/exit-position/ExitPosition.tsx @@ -114,7 +114,7 @@ const ExitPositionsButton = () => { }); } catch (e) { if (tx === null) { - window.toastProvider.addMessage(`Tx cancelled`, { + window.toastProvider.addMessage(`Transaction cancelled`, { variant: "failure", }); } else { diff --git a/packages/frontend/features/import-vault/useAllowVaultTransfer.ts b/packages/frontend/features/import-vault/useAllowVaultTransfer.ts index 7c627d3..ee37bac 100644 --- a/packages/frontend/features/import-vault/useAllowVaultTransfer.ts +++ b/packages/frontend/features/import-vault/useAllowVaultTransfer.ts @@ -71,7 +71,7 @@ const useAllowVaultTransfer = (selectedVaultId: number) => { window.analytics.track("Allow Vault Success", { selectedVaultId }); } catch (e) { if (tx === null) { - window.toastProvider.addMessage(`Tx cancelled`, { + window.toastProvider.addMessage(`Transaction cancelled`, { variant: "failure", }); } else { diff --git a/packages/frontend/features/import-vault/useImportVault.ts b/packages/frontend/features/import-vault/useImportVault.ts index c874da2..e69e98f 100644 --- a/packages/frontend/features/import-vault/useImportVault.ts +++ b/packages/frontend/features/import-vault/useImportVault.ts @@ -73,7 +73,7 @@ const useImportVault = (selectedVaultId) => { window.analytics.track("Import Vault Success", { selectedVaultId }); } catch (e) { if (tx === null) { - window.toastProvider.addMessage(`Tx cancelled`, { + window.toastProvider.addMessage(`Transaction cancelled`, { variant: "failure", }); } else { diff --git a/packages/frontend/features/position/BorrowCoin.tsx b/packages/frontend/features/position/BorrowCoin.tsx index 293facd..501008a 100644 --- a/packages/frontend/features/position/BorrowCoin.tsx +++ b/packages/frontend/features/position/BorrowCoin.tsx @@ -108,7 +108,7 @@ const BorrowCoin = ({ coin, hide }) => { ); } catch (e) { if (tx === null) { - window.toastProvider.addMessage(`Tx cancelled`, { + window.toastProvider.addMessage(`Transaction cancelled`, { variant: "failure", }); } else { diff --git a/packages/frontend/features/position/RepayCoin.tsx b/packages/frontend/features/position/RepayCoin.tsx index ab1e7db..890460e 100644 --- a/packages/frontend/features/position/RepayCoin.tsx +++ b/packages/frontend/features/position/RepayCoin.tsx @@ -239,7 +239,7 @@ const RepayCoin = ({ coin, hide }) => { ); } catch (e) { if (tx === null) { - window.toastProvider.addMessage(`Tx cancelled`, { + window.toastProvider.addMessage(`Transaction cancelled`, { variant: "failure", }); } else { diff --git a/packages/frontend/features/position/SupplyCoin.tsx b/packages/frontend/features/position/SupplyCoin.tsx index 24e9f6b..7021f64 100644 --- a/packages/frontend/features/position/SupplyCoin.tsx +++ b/packages/frontend/features/position/SupplyCoin.tsx @@ -155,7 +155,7 @@ const SupplyCoin = ({ coin, hide }) => { ); } catch (e) { if (tx === null) { - window.toastProvider.addMessage(`Tx cancelled`, { + window.toastProvider.addMessage(`Transaction cancelled`, { variant: "failure", }); } else { diff --git a/packages/frontend/features/position/WithdrawCoin.tsx b/packages/frontend/features/position/WithdrawCoin.tsx index ebf9fa3..59753ac 100644 --- a/packages/frontend/features/position/WithdrawCoin.tsx +++ b/packages/frontend/features/position/WithdrawCoin.tsx @@ -114,7 +114,7 @@ const WithdrawCoin = ({ coin, hide }) => { ); } catch (e) { if (tx === null) { - window.toastProvider.addMessage(`Tx cancelled`, { + window.toastProvider.addMessage(`Transaction cancelled`, { variant: "failure", }); } else { diff --git a/packages/frontend/features/swap-tokens/useSwap.ts b/packages/frontend/features/swap-tokens/useSwap.ts index 5b01507..e376038 100644 --- a/packages/frontend/features/swap-tokens/useSwap.ts +++ b/packages/frontend/features/swap-tokens/useSwap.ts @@ -74,7 +74,7 @@ const useSwap = (thingToSwap, fromTokenStr, toTokenStr, amountToSwap) => { }); } catch (e) { if (tx === null) { - window.toastProvider.addMessage(`Tx cancelled`, { + window.toastProvider.addMessage(`Transaction cancelled`, { variant: "failure", }); } else { @@ -126,7 +126,7 @@ const useSwap = (thingToSwap, fromTokenStr, toTokenStr, amountToSwap) => { }); } catch (e) { if (tx === null) { - window.toastProvider.addMessage(`Tx cancelled`, { + window.toastProvider.addMessage(`Transaction cancelled`, { variant: "failure", }); } else { From 66e83fe95d4cedcc48f0bdbdcfd6d65d765c7317 Mon Sep 17 00:00:00 2001 From: Adrian Li Date: Wed, 8 Apr 2020 04:28:47 -0400 Subject: [PATCH 07/11] fix conflict --- .../frontend/features/position/RepayCoin.tsx | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/packages/frontend/features/position/RepayCoin.tsx b/packages/frontend/features/position/RepayCoin.tsx index 890460e..602d378 100644 --- a/packages/frontend/features/position/RepayCoin.tsx +++ b/packages/frontend/features/position/RepayCoin.tsx @@ -136,23 +136,6 @@ const RepayCoin = ({ coin, hide }) => { signer, ); -<<<<<<< HEAD - const tx = await tokenContract.approve(proxyAddress, maxUINT); - window.toastProvider.addMessage(`Approving ${coin.symbol}...`, { - secondaryMessage: "Check progress on Etherscan", - actionHref: `https://etherscan.io/tx/${tx.hash}`, - actionText: "Check", - variant: "processing", - }); - await tx.wait(); - - window.toastProvider.addMessage( - `Successfully approved ${coin.symbol}!`, - { - variant: "success", - }, - ); -======= let tx = null; try { tx = await tokenContract.approve(proxyAddress, maxUINT); @@ -186,7 +169,6 @@ const RepayCoin = ({ coin, hide }) => { setTransferLoading(false); return; } ->>>>>>> handle logic if tx fails or if user cancels tx setTransferLoading(false); getCanTransfer(); From c93934a97d6013a43f7e17b44ede7a18e70204bc Mon Sep 17 00:00:00 2001 From: Kendrick Tan Date: Wed, 8 Apr 2020 22:12:35 +1000 Subject: [PATCH 08/11] updated deployment scripts --- .../migrations/1_initial_migration.js | 2 +- .../smart-contracts/migrations/2_deploy_contracts.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/smart-contracts/migrations/1_initial_migration.js b/packages/smart-contracts/migrations/1_initial_migration.js index ee2135d..0d92b02 100644 --- a/packages/smart-contracts/migrations/1_initial_migration.js +++ b/packages/smart-contracts/migrations/1_initial_migration.js @@ -1,5 +1,5 @@ const Migrations = artifacts.require("Migrations"); module.exports = function(deployer) { - deployer.deploy(Migrations); + deployer.deploy(Migrations, { overwrite: false }); }; diff --git a/packages/smart-contracts/migrations/2_deploy_contracts.js b/packages/smart-contracts/migrations/2_deploy_contracts.js index 4c7b5df..9c15b8f 100644 --- a/packages/smart-contracts/migrations/2_deploy_contracts.js +++ b/packages/smart-contracts/migrations/2_deploy_contracts.js @@ -9,12 +9,12 @@ const DedgeMakerManager = artifacts.require("DedgeMakerManager"); const AddressRegistry = artifacts.require("AddressRegistry"); module.exports = async deployer => { - await deployer.deploy(DACProxyFactory) - await deployer.deploy(DedgeCompoundManager) - await deployer.deploy(DedgeGeneralManager) - await deployer.deploy(DedgeExitManager) - await deployer.deploy(DedgeMakerManager) - await deployer.deploy(AddressRegistry) + await deployer.deploy(DACProxyFactory, { overwrite: false }) + await deployer.deploy(DedgeCompoundManager, { overwrite: true }) + await deployer.deploy(DedgeGeneralManager, { overwrite: false }) + await deployer.deploy(DedgeExitManager, { overwrite: false }) + await deployer.deploy(DedgeMakerManager, { overwrite: false }) + await deployer.deploy(AddressRegistry, { overwrite: false }) // Saves to a file if needed const data = JSON.stringify({ From 9ec8ba67abaa804b6278cb41837f6058579c3084 Mon Sep 17 00:00:00 2001 From: Kendrick Tan Date: Wed, 8 Apr 2020 22:23:51 +1000 Subject: [PATCH 09/11] deployed to mainnet --- .../features/swap-tokens/SwapConfirm.tsx | 10 - .../swap-tokens/useIsAmountAvailable.ts | 4 +- .../smart-contracts/artifacts/Address.json | 458 +- .../artifacts/AddressRegistry.json | 330 +- .../artifacts/BytesLibLite.json | 586 +- .../smart-contracts/artifacts/Common.json | 5898 ++-- .../artifacts/CompoundBase.json | 10462 ++++---- .../smart-contracts/artifacts/DACProxy.json | 1030 +- .../artifacts/DACProxyFactory.json | 1718 +- .../smart-contracts/artifacts/DSAuth.json | 890 +- .../artifacts/DSAuthEvents.json | 890 +- .../artifacts/DSAuthority.json | 890 +- .../smart-contracts/artifacts/DSGuard.json | 1666 +- .../artifacts/DSGuardEvents.json | 1666 +- .../artifacts/DSGuardFactory.json | 1666 +- .../smart-contracts/artifacts/DSMath.json | 1778 +- .../smart-contracts/artifacts/DSNote.json | 274 +- .../smart-contracts/artifacts/DSProxy.json | 1658 +- .../artifacts/DSProxyCache.json | 1658 +- .../artifacts/DSProxyFactory.json | 1658 +- .../artifacts/DaiJoinLike.json | 5898 ++-- .../artifacts/DedgeCompoundManager.json | 22278 +++++++--------- .../artifacts/DedgeExitManager.json | 3576 +-- .../artifacts/DedgeGeneralManager.json | 334 +- .../artifacts/DedgeMakerManager.json | 4048 +-- .../artifacts/DeployedAddresses.json | 9 +- .../artifacts/DssProxyActionsBase.json | 5898 ++-- .../artifacts/FlashLoanReceiverBase.json | 590 +- .../artifacts/GemJoinLike.json | 5898 ++-- .../smart-contracts/artifacts/GemLike.json | 5898 ++-- .../smart-contracts/artifacts/ICEther.json | 430 +- .../smart-contracts/artifacts/ICToken.json | 1310 +- .../artifacts/ICompoundPriceOracle.json | 66 +- .../artifacts/IComptroller.json | 1330 +- .../artifacts/IDssProxyActions.json | 2742 +- .../smart-contracts/artifacts/IERC20.json | 2 +- .../artifacts/IFlashLoanReceiver.json | 2 +- .../artifacts/ILendingPool.json | 2 +- .../ILendingPoolAddressesProvider.json | 2 +- .../ILendingPoolParametersProvider.json | 2 +- .../artifacts/IUniswapExchange.json | 2010 +- .../artifacts/IUniswapFactory.json | 238 +- .../smart-contracts/artifacts/JugLike.json | 5898 ++-- .../artifacts/ManagerLike.json | 5898 ++-- .../smart-contracts/artifacts/Migrations.json | 10 +- .../smart-contracts/artifacts/SafeERC20.json | 122 +- .../smart-contracts/artifacts/SafeMath.json | 1198 +- .../artifacts/UniswapBase.json | 1310 +- .../artifacts/UniswapLiteBase.json | 1782 +- .../smart-contracts/artifacts/VatLike.json | 5898 ++-- 50 files changed, 59760 insertions(+), 60109 deletions(-) diff --git a/packages/frontend/features/swap-tokens/SwapConfirm.tsx b/packages/frontend/features/swap-tokens/SwapConfirm.tsx index 3da6111..a7e4307 100644 --- a/packages/frontend/features/swap-tokens/SwapConfirm.tsx +++ b/packages/frontend/features/swap-tokens/SwapConfirm.tsx @@ -52,16 +52,6 @@ const SwapConfirm = ({ - {thingToSwap === "collateral" && ( - <> - - Due to nature of slippages: - - - MAX: 95% (90% recommended) - - - )} diff --git a/packages/frontend/features/swap-tokens/useIsAmountAvailable.ts b/packages/frontend/features/swap-tokens/useIsAmountAvailable.ts index 3bfe5fc..4066f07 100644 --- a/packages/frontend/features/swap-tokens/useIsAmountAvailable.ts +++ b/packages/frontend/features/swap-tokens/useIsAmountAvailable.ts @@ -3,7 +3,7 @@ import CompoundPositions from "../../containers/CompoundPositions"; const useIsAmountAvailable = ( amount: string, tokenStr: string, - thingToSwap: string, + thingToSwap: string ) => { const { compoundPositions } = CompoundPositions.useContainer(); @@ -17,7 +17,7 @@ const useIsAmountAvailable = ( const canSwapAmount = thingToSwap === "debt" ? parseFloat(tokenBalance.borrow) - : 0.95 * parseFloat(tokenBalance.supply); + : parseFloat(tokenBalance.supply); const result = parseFloat(amount) <= canSwapAmount; diff --git a/packages/smart-contracts/artifacts/Address.json b/packages/smart-contracts/artifacts/Address.json index fcbfee4..7563402 100644 --- a/packages/smart-contracts/artifacts/Address.json +++ b/packages/smart-contracts/artifacts/Address.json @@ -12,14 +12,14 @@ "absolutePath": "@openzeppelin/contracts/utils/Address.sol", "exportedSymbols": { "Address": [ - 7812 + 7803 ] }, - "id": 7813, + "id": 7804, "nodeType": "SourceUnit", "nodes": [ { - "id": 7739, + "id": 7730, "literals": [ "solidity", "^", @@ -35,30 +35,30 @@ "contractKind": "library", "documentation": "@dev Collection of functions related to the address type", "fullyImplemented": true, - "id": 7812, + "id": 7803, "linearizedBaseContracts": [ - 7812 + 7803 ], "name": "Address", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 7763, + "id": 7754, "nodeType": "Block", "src": "752:544:33", "statements": [ { "assignments": [ - 7747 + 7738 ], "declarations": [ { "constant": false, - "id": 7747, + "id": 7738, "name": "codehash", "nodeType": "VariableDeclaration", - "scope": 7763, + "scope": 7754, "src": "1004:16:33", "stateVariable": false, "storageLocation": "default", @@ -67,7 +67,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 7746, + "id": 7737, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1004:7:33", @@ -80,22 +80,22 @@ "visibility": "internal" } ], - "id": 7748, + "id": 7739, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "1004:16:33" }, { "assignments": [ - 7750 + 7741 ], "declarations": [ { "constant": false, - "id": 7750, + "id": 7741, "name": "accountHash", "nodeType": "VariableDeclaration", - "scope": 7763, + "scope": 7754, "src": "1030:19:33", "stateVariable": false, "storageLocation": "default", @@ -104,7 +104,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 7749, + "id": 7740, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1030:7:33", @@ -117,11 +117,11 @@ "visibility": "internal" } ], - "id": 7752, + "id": 7743, "initialValue": { "argumentTypes": null, "hexValue": "307863356432343630313836663732333363393237653764623264636337303363306535303062363533636138323237336237626661643830343564383561343730", - "id": 7751, + "id": 7742, "isConstant": false, "isLValue": false, "isPure": true, @@ -143,7 +143,7 @@ "externalReferences": [ { "codehash": { - "declaration": 7747, + "declaration": 7738, "isOffset": false, "isSlot": false, "src": "1195:8:33", @@ -152,7 +152,7 @@ }, { "account": { - "declaration": 7741, + "declaration": 7732, "isOffset": false, "isSlot": false, "src": "1219:7:33", @@ -160,7 +160,7 @@ } } ], - "id": 7753, + "id": 7744, "nodeType": "InlineAssembly", "operations": "{\n codehash := extcodehash(account)\n}", "src": "1184:45:33" @@ -175,7 +175,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 7760, + "id": 7751, "isConstant": false, "isLValue": false, "isPure": false, @@ -186,18 +186,18 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 7756, + "id": 7747, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7754, + "id": 7745, "name": "codehash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7747, + "referencedDeclaration": 7738, "src": "1246:8:33", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -208,11 +208,11 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 7755, + "id": 7746, "name": "accountHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7750, + "referencedDeclaration": 7741, "src": "1258:11:33", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -233,18 +233,18 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 7759, + "id": 7750, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7757, + "id": 7748, "name": "codehash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7747, + "referencedDeclaration": 7738, "src": "1273:8:33", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -256,7 +256,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "307830", - "id": 7758, + "id": 7749, "isConstant": false, "isLValue": false, "isPure": true, @@ -284,7 +284,7 @@ } } ], - "id": 7761, + "id": 7752, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -297,30 +297,30 @@ "typeString": "bool" } }, - "functionReturnParameters": 7745, - "id": 7762, + "functionReturnParameters": 7736, + "id": 7753, "nodeType": "Return", "src": "1238:51:33" } ] }, "documentation": "@dev Returns true if `account` is a contract.\n * [IMPORTANT]\n====\nIt is unsafe to assume that an address for which this function returns\nfalse is an externally-owned account (EOA) and not a contract.\n * Among others, `isContract` will return false for the following \ntypes of addresses:\n * - an externally-owned account\n - a contract in construction\n - an address where a contract will be created\n - an address where a contract lived, but was destroyed\n====", - "id": 7764, + "id": 7755, "implemented": true, "kind": "function", "modifiers": [], "name": "isContract", "nodeType": "FunctionDefinition", "parameters": { - "id": 7742, + "id": 7733, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7741, + "id": 7732, "name": "account", "nodeType": "VariableDeclaration", - "scope": 7764, + "scope": 7755, "src": "706:15:33", "stateVariable": false, "storageLocation": "default", @@ -329,7 +329,7 @@ "typeString": "address" }, "typeName": { - "id": 7740, + "id": 7731, "name": "address", "nodeType": "ElementaryTypeName", "src": "706:7:33", @@ -346,15 +346,15 @@ "src": "705:17:33" }, "returnParameters": { - "id": 7745, + "id": 7736, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7744, + "id": 7735, "name": "", "nodeType": "VariableDeclaration", - "scope": 7764, + "scope": 7755, "src": "746:4:33", "stateVariable": false, "storageLocation": "default", @@ -363,7 +363,7 @@ "typeString": "bool" }, "typeName": { - "id": 7743, + "id": 7734, "name": "bool", "nodeType": "ElementaryTypeName", "src": "746:4:33", @@ -378,7 +378,7 @@ ], "src": "745:6:33" }, - "scope": 7812, + "scope": 7803, "src": "686:610:33", "stateMutability": "view", "superFunction": null, @@ -386,7 +386,7 @@ }, { "body": { - "id": 7777, + "id": 7768, "nodeType": "Block", "src": "1581:49:33", "statements": [ @@ -399,11 +399,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7773, + "id": 7764, "name": "account", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7766, + "referencedDeclaration": 7757, "src": "1614:7:33", "typeDescriptions": { "typeIdentifier": "t_address", @@ -418,7 +418,7 @@ "typeString": "address" } ], - "id": 7772, + "id": 7763, "isConstant": false, "isLValue": false, "isPure": true, @@ -431,7 +431,7 @@ }, "typeName": "uint160" }, - "id": 7774, + "id": 7765, "isConstant": false, "isLValue": false, "isPure": false, @@ -453,7 +453,7 @@ "typeString": "uint160" } ], - "id": 7771, + "id": 7762, "isConstant": false, "isLValue": false, "isPure": true, @@ -466,7 +466,7 @@ }, "typeName": "address" }, - "id": 7775, + "id": 7766, "isConstant": false, "isLValue": false, "isPure": false, @@ -480,30 +480,30 @@ "typeString": "address payable" } }, - "functionReturnParameters": 7770, - "id": 7776, + "functionReturnParameters": 7761, + "id": 7767, "nodeType": "Return", "src": "1591:32:33" } ] }, "documentation": "@dev Converts an `address` into `address payable`. Note that this is\nsimply a type cast: the actual underlying value is not changed.\n * _Available since v2.4.0._", - "id": 7778, + "id": 7769, "implemented": true, "kind": "function", "modifiers": [], "name": "toPayable", "nodeType": "FunctionDefinition", "parameters": { - "id": 7767, + "id": 7758, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7766, + "id": 7757, "name": "account", "nodeType": "VariableDeclaration", - "scope": 7778, + "scope": 7769, "src": "1524:15:33", "stateVariable": false, "storageLocation": "default", @@ -512,7 +512,7 @@ "typeString": "address" }, "typeName": { - "id": 7765, + "id": 7756, "name": "address", "nodeType": "ElementaryTypeName", "src": "1524:7:33", @@ -529,15 +529,15 @@ "src": "1523:17:33" }, "returnParameters": { - "id": 7770, + "id": 7761, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7769, + "id": 7760, "name": "", "nodeType": "VariableDeclaration", - "scope": 7778, + "scope": 7769, "src": "1564:15:33", "stateVariable": false, "storageLocation": "default", @@ -546,7 +546,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7768, + "id": 7759, "name": "address", "nodeType": "ElementaryTypeName", "src": "1564:15:33", @@ -562,7 +562,7 @@ ], "src": "1563:17:33" }, - "scope": 7812, + "scope": 7803, "src": "1505:125:33", "stateMutability": "pure", "superFunction": null, @@ -570,7 +570,7 @@ }, { "body": { - "id": 7810, + "id": 7801, "nodeType": "Block", "src": "2658:294:33", "statements": [ @@ -584,7 +584,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7791, + "id": 7782, "isConstant": false, "isLValue": false, "isPure": false, @@ -596,14 +596,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7787, + "id": 7778, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7847, + "referencedDeclaration": 7838, "src": "2684:4:33", "typeDescriptions": { - "typeIdentifier": "t_contract$_Address_$7812", + "typeIdentifier": "t_contract$_Address_$7803", "typeString": "library Address" } } @@ -611,11 +611,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_Address_$7812", + "typeIdentifier": "t_contract$_Address_$7803", "typeString": "library Address" } ], - "id": 7786, + "id": 7777, "isConstant": false, "isLValue": false, "isPure": true, @@ -628,7 +628,7 @@ }, "typeName": "address" }, - "id": 7788, + "id": 7779, "isConstant": false, "isLValue": false, "isPure": false, @@ -642,7 +642,7 @@ "typeString": "address" } }, - "id": 7789, + "id": 7780, "isConstant": false, "isLValue": false, "isPure": false, @@ -660,11 +660,11 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 7790, + "id": 7781, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7782, + "referencedDeclaration": 7773, "src": "2701:6:33", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -680,7 +680,7 @@ { "argumentTypes": null, "hexValue": "416464726573733a20696e73756666696369656e742062616c616e6365", - "id": 7792, + "id": 7783, "isConstant": false, "isLValue": false, "isPure": true, @@ -707,21 +707,21 @@ "typeString": "literal_string \"Address: insufficient balance\"" } ], - "id": 7785, + "id": 7776, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2668:7:33", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7793, + "id": 7784, "isConstant": false, "isLValue": false, "isPure": false, @@ -735,22 +735,22 @@ "typeString": "tuple()" } }, - "id": 7794, + "id": 7785, "nodeType": "ExpressionStatement", "src": "2668:73:33" }, { "assignments": [ - 7796, + 7787, null ], "declarations": [ { "constant": false, - "id": 7796, + "id": 7787, "name": "success", "nodeType": "VariableDeclaration", - "scope": 7810, + "scope": 7801, "src": "2807:12:33", "stateVariable": false, "storageLocation": "default", @@ -759,7 +759,7 @@ "typeString": "bool" }, "typeName": { - "id": 7795, + "id": 7786, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2807:4:33", @@ -773,14 +773,14 @@ }, null ], - "id": 7804, + "id": 7795, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "", - "id": 7802, + "id": 7793, "isConstant": false, "isLValue": false, "isPure": true, @@ -806,11 +806,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7800, + "id": 7791, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7782, + "referencedDeclaration": 7773, "src": "2846:6:33", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -829,18 +829,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7797, + "id": 7788, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7780, + "referencedDeclaration": 7771, "src": "2825:9:33", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "id": 7798, + "id": 7789, "isConstant": false, "isLValue": false, "isPure": false, @@ -854,7 +854,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 7799, + "id": 7790, "isConstant": false, "isLValue": false, "isPure": false, @@ -868,7 +868,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 7801, + "id": 7792, "isConstant": false, "isLValue": false, "isPure": false, @@ -882,7 +882,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 7803, + "id": 7794, "isConstant": false, "isLValue": false, "isPure": false, @@ -905,11 +905,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7806, + "id": 7797, "name": "success", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7796, + "referencedDeclaration": 7787, "src": "2875:7:33", "typeDescriptions": { "typeIdentifier": "t_bool", @@ -919,7 +919,7 @@ { "argumentTypes": null, "hexValue": "416464726573733a20756e61626c6520746f2073656e642076616c75652c20726563697069656e74206d61792068617665207265766572746564", - "id": 7807, + "id": 7798, "isConstant": false, "isLValue": false, "isPure": true, @@ -946,21 +946,21 @@ "typeString": "literal_string \"Address: unable to send value, recipient may have reverted\"" } ], - "id": 7805, + "id": 7796, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2867:7:33", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7808, + "id": 7799, "isConstant": false, "isLValue": false, "isPure": false, @@ -974,29 +974,29 @@ "typeString": "tuple()" } }, - "id": 7809, + "id": 7800, "nodeType": "ExpressionStatement", "src": "2867:78:33" } ] }, "documentation": "@dev Replacement for Solidity's `transfer`: sends `amount` wei to\n`recipient`, forwarding all available gas and reverting on errors.\n * https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost\nof certain opcodes, possibly making contracts go over the 2300 gas limit\nimposed by `transfer`, making them unable to receive funds via\n`transfer`. {sendValue} removes this limitation.\n * https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more].\n * IMPORTANT: because control is transferred to `recipient`, care must be\ntaken to not create reentrancy vulnerabilities. Consider using\n{ReentrancyGuard} or the\nhttps://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern].\n * _Available since v2.4.0._", - "id": 7811, + "id": 7802, "implemented": true, "kind": "function", "modifiers": [], "name": "sendValue", "nodeType": "FunctionDefinition", "parameters": { - "id": 7783, + "id": 7774, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7780, + "id": 7771, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 7811, + "scope": 7802, "src": "2606:25:33", "stateVariable": false, "storageLocation": "default", @@ -1005,7 +1005,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7779, + "id": 7770, "name": "address", "nodeType": "ElementaryTypeName", "src": "2606:15:33", @@ -1020,10 +1020,10 @@ }, { "constant": false, - "id": 7782, + "id": 7773, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 7811, + "scope": 7802, "src": "2633:14:33", "stateVariable": false, "storageLocation": "default", @@ -1032,7 +1032,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7781, + "id": 7772, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2633:7:33", @@ -1048,19 +1048,19 @@ "src": "2605:43:33" }, "returnParameters": { - "id": 7784, + "id": 7775, "nodeType": "ParameterList", "parameters": [], "src": "2658:0:33" }, - "scope": 7812, + "scope": 7803, "src": "2587:365:33", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" } ], - "scope": 7813, + "scope": 7804, "src": "93:2861:33" } ], @@ -1070,14 +1070,14 @@ "absolutePath": "@openzeppelin/contracts/utils/Address.sol", "exportedSymbols": { "Address": [ - 7812 + 7803 ] }, - "id": 7813, + "id": 7804, "nodeType": "SourceUnit", "nodes": [ { - "id": 7739, + "id": 7730, "literals": [ "solidity", "^", @@ -1093,30 +1093,30 @@ "contractKind": "library", "documentation": "@dev Collection of functions related to the address type", "fullyImplemented": true, - "id": 7812, + "id": 7803, "linearizedBaseContracts": [ - 7812 + 7803 ], "name": "Address", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 7763, + "id": 7754, "nodeType": "Block", "src": "752:544:33", "statements": [ { "assignments": [ - 7747 + 7738 ], "declarations": [ { "constant": false, - "id": 7747, + "id": 7738, "name": "codehash", "nodeType": "VariableDeclaration", - "scope": 7763, + "scope": 7754, "src": "1004:16:33", "stateVariable": false, "storageLocation": "default", @@ -1125,7 +1125,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 7746, + "id": 7737, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1004:7:33", @@ -1138,22 +1138,22 @@ "visibility": "internal" } ], - "id": 7748, + "id": 7739, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "1004:16:33" }, { "assignments": [ - 7750 + 7741 ], "declarations": [ { "constant": false, - "id": 7750, + "id": 7741, "name": "accountHash", "nodeType": "VariableDeclaration", - "scope": 7763, + "scope": 7754, "src": "1030:19:33", "stateVariable": false, "storageLocation": "default", @@ -1162,7 +1162,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 7749, + "id": 7740, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1030:7:33", @@ -1175,11 +1175,11 @@ "visibility": "internal" } ], - "id": 7752, + "id": 7743, "initialValue": { "argumentTypes": null, "hexValue": "307863356432343630313836663732333363393237653764623264636337303363306535303062363533636138323237336237626661643830343564383561343730", - "id": 7751, + "id": 7742, "isConstant": false, "isLValue": false, "isPure": true, @@ -1201,7 +1201,7 @@ "externalReferences": [ { "codehash": { - "declaration": 7747, + "declaration": 7738, "isOffset": false, "isSlot": false, "src": "1195:8:33", @@ -1210,7 +1210,7 @@ }, { "account": { - "declaration": 7741, + "declaration": 7732, "isOffset": false, "isSlot": false, "src": "1219:7:33", @@ -1218,7 +1218,7 @@ } } ], - "id": 7753, + "id": 7744, "nodeType": "InlineAssembly", "operations": "{\n codehash := extcodehash(account)\n}", "src": "1184:45:33" @@ -1233,7 +1233,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 7760, + "id": 7751, "isConstant": false, "isLValue": false, "isPure": false, @@ -1244,18 +1244,18 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 7756, + "id": 7747, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7754, + "id": 7745, "name": "codehash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7747, + "referencedDeclaration": 7738, "src": "1246:8:33", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1266,11 +1266,11 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 7755, + "id": 7746, "name": "accountHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7750, + "referencedDeclaration": 7741, "src": "1258:11:33", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1291,18 +1291,18 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 7759, + "id": 7750, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7757, + "id": 7748, "name": "codehash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7747, + "referencedDeclaration": 7738, "src": "1273:8:33", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1314,7 +1314,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "307830", - "id": 7758, + "id": 7749, "isConstant": false, "isLValue": false, "isPure": true, @@ -1342,7 +1342,7 @@ } } ], - "id": 7761, + "id": 7752, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -1355,30 +1355,30 @@ "typeString": "bool" } }, - "functionReturnParameters": 7745, - "id": 7762, + "functionReturnParameters": 7736, + "id": 7753, "nodeType": "Return", "src": "1238:51:33" } ] }, "documentation": "@dev Returns true if `account` is a contract.\n * [IMPORTANT]\n====\nIt is unsafe to assume that an address for which this function returns\nfalse is an externally-owned account (EOA) and not a contract.\n * Among others, `isContract` will return false for the following \ntypes of addresses:\n * - an externally-owned account\n - a contract in construction\n - an address where a contract will be created\n - an address where a contract lived, but was destroyed\n====", - "id": 7764, + "id": 7755, "implemented": true, "kind": "function", "modifiers": [], "name": "isContract", "nodeType": "FunctionDefinition", "parameters": { - "id": 7742, + "id": 7733, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7741, + "id": 7732, "name": "account", "nodeType": "VariableDeclaration", - "scope": 7764, + "scope": 7755, "src": "706:15:33", "stateVariable": false, "storageLocation": "default", @@ -1387,7 +1387,7 @@ "typeString": "address" }, "typeName": { - "id": 7740, + "id": 7731, "name": "address", "nodeType": "ElementaryTypeName", "src": "706:7:33", @@ -1404,15 +1404,15 @@ "src": "705:17:33" }, "returnParameters": { - "id": 7745, + "id": 7736, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7744, + "id": 7735, "name": "", "nodeType": "VariableDeclaration", - "scope": 7764, + "scope": 7755, "src": "746:4:33", "stateVariable": false, "storageLocation": "default", @@ -1421,7 +1421,7 @@ "typeString": "bool" }, "typeName": { - "id": 7743, + "id": 7734, "name": "bool", "nodeType": "ElementaryTypeName", "src": "746:4:33", @@ -1436,7 +1436,7 @@ ], "src": "745:6:33" }, - "scope": 7812, + "scope": 7803, "src": "686:610:33", "stateMutability": "view", "superFunction": null, @@ -1444,7 +1444,7 @@ }, { "body": { - "id": 7777, + "id": 7768, "nodeType": "Block", "src": "1581:49:33", "statements": [ @@ -1457,11 +1457,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7773, + "id": 7764, "name": "account", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7766, + "referencedDeclaration": 7757, "src": "1614:7:33", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1476,7 +1476,7 @@ "typeString": "address" } ], - "id": 7772, + "id": 7763, "isConstant": false, "isLValue": false, "isPure": true, @@ -1489,7 +1489,7 @@ }, "typeName": "uint160" }, - "id": 7774, + "id": 7765, "isConstant": false, "isLValue": false, "isPure": false, @@ -1511,7 +1511,7 @@ "typeString": "uint160" } ], - "id": 7771, + "id": 7762, "isConstant": false, "isLValue": false, "isPure": true, @@ -1524,7 +1524,7 @@ }, "typeName": "address" }, - "id": 7775, + "id": 7766, "isConstant": false, "isLValue": false, "isPure": false, @@ -1538,30 +1538,30 @@ "typeString": "address payable" } }, - "functionReturnParameters": 7770, - "id": 7776, + "functionReturnParameters": 7761, + "id": 7767, "nodeType": "Return", "src": "1591:32:33" } ] }, "documentation": "@dev Converts an `address` into `address payable`. Note that this is\nsimply a type cast: the actual underlying value is not changed.\n * _Available since v2.4.0._", - "id": 7778, + "id": 7769, "implemented": true, "kind": "function", "modifiers": [], "name": "toPayable", "nodeType": "FunctionDefinition", "parameters": { - "id": 7767, + "id": 7758, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7766, + "id": 7757, "name": "account", "nodeType": "VariableDeclaration", - "scope": 7778, + "scope": 7769, "src": "1524:15:33", "stateVariable": false, "storageLocation": "default", @@ -1570,7 +1570,7 @@ "typeString": "address" }, "typeName": { - "id": 7765, + "id": 7756, "name": "address", "nodeType": "ElementaryTypeName", "src": "1524:7:33", @@ -1587,15 +1587,15 @@ "src": "1523:17:33" }, "returnParameters": { - "id": 7770, + "id": 7761, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7769, + "id": 7760, "name": "", "nodeType": "VariableDeclaration", - "scope": 7778, + "scope": 7769, "src": "1564:15:33", "stateVariable": false, "storageLocation": "default", @@ -1604,7 +1604,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7768, + "id": 7759, "name": "address", "nodeType": "ElementaryTypeName", "src": "1564:15:33", @@ -1620,7 +1620,7 @@ ], "src": "1563:17:33" }, - "scope": 7812, + "scope": 7803, "src": "1505:125:33", "stateMutability": "pure", "superFunction": null, @@ -1628,7 +1628,7 @@ }, { "body": { - "id": 7810, + "id": 7801, "nodeType": "Block", "src": "2658:294:33", "statements": [ @@ -1642,7 +1642,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7791, + "id": 7782, "isConstant": false, "isLValue": false, "isPure": false, @@ -1654,14 +1654,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7787, + "id": 7778, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7847, + "referencedDeclaration": 7838, "src": "2684:4:33", "typeDescriptions": { - "typeIdentifier": "t_contract$_Address_$7812", + "typeIdentifier": "t_contract$_Address_$7803", "typeString": "library Address" } } @@ -1669,11 +1669,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_Address_$7812", + "typeIdentifier": "t_contract$_Address_$7803", "typeString": "library Address" } ], - "id": 7786, + "id": 7777, "isConstant": false, "isLValue": false, "isPure": true, @@ -1686,7 +1686,7 @@ }, "typeName": "address" }, - "id": 7788, + "id": 7779, "isConstant": false, "isLValue": false, "isPure": false, @@ -1700,7 +1700,7 @@ "typeString": "address" } }, - "id": 7789, + "id": 7780, "isConstant": false, "isLValue": false, "isPure": false, @@ -1718,11 +1718,11 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 7790, + "id": 7781, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7782, + "referencedDeclaration": 7773, "src": "2701:6:33", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1738,7 +1738,7 @@ { "argumentTypes": null, "hexValue": "416464726573733a20696e73756666696369656e742062616c616e6365", - "id": 7792, + "id": 7783, "isConstant": false, "isLValue": false, "isPure": true, @@ -1765,21 +1765,21 @@ "typeString": "literal_string \"Address: insufficient balance\"" } ], - "id": 7785, + "id": 7776, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2668:7:33", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7793, + "id": 7784, "isConstant": false, "isLValue": false, "isPure": false, @@ -1793,22 +1793,22 @@ "typeString": "tuple()" } }, - "id": 7794, + "id": 7785, "nodeType": "ExpressionStatement", "src": "2668:73:33" }, { "assignments": [ - 7796, + 7787, null ], "declarations": [ { "constant": false, - "id": 7796, + "id": 7787, "name": "success", "nodeType": "VariableDeclaration", - "scope": 7810, + "scope": 7801, "src": "2807:12:33", "stateVariable": false, "storageLocation": "default", @@ -1817,7 +1817,7 @@ "typeString": "bool" }, "typeName": { - "id": 7795, + "id": 7786, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2807:4:33", @@ -1831,14 +1831,14 @@ }, null ], - "id": 7804, + "id": 7795, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "", - "id": 7802, + "id": 7793, "isConstant": false, "isLValue": false, "isPure": true, @@ -1864,11 +1864,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7800, + "id": 7791, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7782, + "referencedDeclaration": 7773, "src": "2846:6:33", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1887,18 +1887,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7797, + "id": 7788, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7780, + "referencedDeclaration": 7771, "src": "2825:9:33", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "id": 7798, + "id": 7789, "isConstant": false, "isLValue": false, "isPure": false, @@ -1912,7 +1912,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 7799, + "id": 7790, "isConstant": false, "isLValue": false, "isPure": false, @@ -1926,7 +1926,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 7801, + "id": 7792, "isConstant": false, "isLValue": false, "isPure": false, @@ -1940,7 +1940,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 7803, + "id": 7794, "isConstant": false, "isLValue": false, "isPure": false, @@ -1963,11 +1963,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7806, + "id": 7797, "name": "success", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7796, + "referencedDeclaration": 7787, "src": "2875:7:33", "typeDescriptions": { "typeIdentifier": "t_bool", @@ -1977,7 +1977,7 @@ { "argumentTypes": null, "hexValue": "416464726573733a20756e61626c6520746f2073656e642076616c75652c20726563697069656e74206d61792068617665207265766572746564", - "id": 7807, + "id": 7798, "isConstant": false, "isLValue": false, "isPure": true, @@ -2004,21 +2004,21 @@ "typeString": "literal_string \"Address: unable to send value, recipient may have reverted\"" } ], - "id": 7805, + "id": 7796, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2867:7:33", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7808, + "id": 7799, "isConstant": false, "isLValue": false, "isPure": false, @@ -2032,29 +2032,29 @@ "typeString": "tuple()" } }, - "id": 7809, + "id": 7800, "nodeType": "ExpressionStatement", "src": "2867:78:33" } ] }, "documentation": "@dev Replacement for Solidity's `transfer`: sends `amount` wei to\n`recipient`, forwarding all available gas and reverting on errors.\n * https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost\nof certain opcodes, possibly making contracts go over the 2300 gas limit\nimposed by `transfer`, making them unable to receive funds via\n`transfer`. {sendValue} removes this limitation.\n * https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more].\n * IMPORTANT: because control is transferred to `recipient`, care must be\ntaken to not create reentrancy vulnerabilities. Consider using\n{ReentrancyGuard} or the\nhttps://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern].\n * _Available since v2.4.0._", - "id": 7811, + "id": 7802, "implemented": true, "kind": "function", "modifiers": [], "name": "sendValue", "nodeType": "FunctionDefinition", "parameters": { - "id": 7783, + "id": 7774, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7780, + "id": 7771, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 7811, + "scope": 7802, "src": "2606:25:33", "stateVariable": false, "storageLocation": "default", @@ -2063,7 +2063,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7779, + "id": 7770, "name": "address", "nodeType": "ElementaryTypeName", "src": "2606:15:33", @@ -2078,10 +2078,10 @@ }, { "constant": false, - "id": 7782, + "id": 7773, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 7811, + "scope": 7802, "src": "2633:14:33", "stateVariable": false, "storageLocation": "default", @@ -2090,7 +2090,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7781, + "id": 7772, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2633:7:33", @@ -2106,19 +2106,19 @@ "src": "2605:43:33" }, "returnParameters": { - "id": 7784, + "id": 7775, "nodeType": "ParameterList", "parameters": [], "src": "2658:0:33" }, - "scope": 7812, + "scope": 7803, "src": "2587:365:33", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" } ], - "scope": 7813, + "scope": 7804, "src": "93:2861:33" } ], @@ -2130,7 +2130,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.653Z", + "updatedAt": "2020-04-08T12:21:13.941Z", "devdoc": { "details": "Collection of functions related to the address type", "methods": {} diff --git a/packages/smart-contracts/artifacts/AddressRegistry.json b/packages/smart-contracts/artifacts/AddressRegistry.json index ae32069..d46d3ba 100644 --- a/packages/smart-contracts/artifacts/AddressRegistry.json +++ b/packages/smart-contracts/artifacts/AddressRegistry.json @@ -298,14 +298,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol", "exportedSymbols": { "AddressRegistry": [ - 7550 + 7541 ] }, - "id": 7551, + "id": 7542, "nodeType": "SourceUnit", "nodes": [ { - "id": 7492, + "id": 7483, "literals": [ "solidity", "0.5", @@ -320,19 +320,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 7550, + "id": 7541, "linearizedBaseContracts": [ - 7550 + 7541 ], "name": "AddressRegistry", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 7495, + "id": 7486, "name": "AaveLendingPoolAddressProviderAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "68:97:31", "stateVariable": true, "storageLocation": "default", @@ -341,7 +341,7 @@ "typeString": "address" }, "typeName": { - "id": 7493, + "id": 7484, "name": "address", "nodeType": "ElementaryTypeName", "src": "68:7:31", @@ -354,7 +354,7 @@ "value": { "argumentTypes": null, "hexValue": "307832346134326644323843393736413631446635443030443035393943333463346639303734386338", - "id": 7494, + "id": 7485, "isConstant": false, "isLValue": false, "isPure": true, @@ -373,10 +373,10 @@ }, { "constant": false, - "id": 7498, + "id": 7489, "name": "AaveEthAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "171:74:31", "stateVariable": true, "storageLocation": "default", @@ -385,7 +385,7 @@ "typeString": "address" }, "typeName": { - "id": 7496, + "id": 7487, "name": "address", "nodeType": "ElementaryTypeName", "src": "171:7:31", @@ -398,7 +398,7 @@ "value": { "argumentTypes": null, "hexValue": "307845656565654565656545654565654565456545656545454565656565456565656565656545456545", - "id": 7497, + "id": 7488, "isConstant": false, "isLValue": false, "isPure": true, @@ -417,10 +417,10 @@ }, { "constant": false, - "id": 7501, + "id": 7492, "name": "UniswapFactoryAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "267:81:31", "stateVariable": true, "storageLocation": "default", @@ -429,7 +429,7 @@ "typeString": "address" }, "typeName": { - "id": 7499, + "id": 7490, "name": "address", "nodeType": "ElementaryTypeName", "src": "267:7:31", @@ -442,7 +442,7 @@ "value": { "argumentTypes": null, "hexValue": "307863306134376446653033344234303042343762446144354665634461323632316465366334643935", - "id": 7500, + "id": 7491, "isConstant": false, "isLValue": false, "isPure": true, @@ -461,10 +461,10 @@ }, { "constant": false, - "id": 7504, + "id": 7495, "name": "CompoundPriceOracleAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "371:86:31", "stateVariable": true, "storageLocation": "default", @@ -473,7 +473,7 @@ "typeString": "address" }, "typeName": { - "id": 7502, + "id": 7493, "name": "address", "nodeType": "ElementaryTypeName", "src": "371:7:31", @@ -486,7 +486,7 @@ "value": { "argumentTypes": null, "hexValue": "307831443861456463394539323437333044443366393634314344623444314239324238343862346264", - "id": 7503, + "id": 7494, "isConstant": false, "isLValue": false, "isPure": true, @@ -505,10 +505,10 @@ }, { "constant": false, - "id": 7507, + "id": 7498, "name": "CompoundComptrollerAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "463:86:31", "stateVariable": true, "storageLocation": "default", @@ -517,7 +517,7 @@ "typeString": "address" }, "typeName": { - "id": 7505, + "id": 7496, "name": "address", "nodeType": "ElementaryTypeName", "src": "463:7:31", @@ -530,7 +530,7 @@ "value": { "argumentTypes": null, "hexValue": "307833643938313932313041333162343936316233304546353462453261654437394239633943643342", - "id": 7506, + "id": 7497, "isConstant": false, "isLValue": false, "isPure": true, @@ -549,10 +549,10 @@ }, { "constant": false, - "id": 7510, + "id": 7501, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "555:73:31", "stateVariable": true, "storageLocation": "default", @@ -561,7 +561,7 @@ "typeString": "address" }, "typeName": { - "id": 7508, + "id": 7499, "name": "address", "nodeType": "ElementaryTypeName", "src": "555:7:31", @@ -574,7 +574,7 @@ "value": { "argumentTypes": null, "hexValue": "307834446463324431393339343839323644303266394231664539653164616130373138323730454435", - "id": 7509, + "id": 7500, "isConstant": false, "isLValue": false, "isPure": true, @@ -593,10 +593,10 @@ }, { "constant": false, - "id": 7513, + "id": 7504, "name": "CUSDCAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "634:72:31", "stateVariable": true, "storageLocation": "default", @@ -605,7 +605,7 @@ "typeString": "address" }, "typeName": { - "id": 7511, + "id": 7502, "name": "address", "nodeType": "ElementaryTypeName", "src": "634:7:31", @@ -618,7 +618,7 @@ "value": { "argumentTypes": null, "hexValue": "307833394141333963303231646662614538666143353435393336363933614339313764354537353633", - "id": 7512, + "id": 7503, "isConstant": false, "isLValue": false, "isPure": true, @@ -637,10 +637,10 @@ }, { "constant": false, - "id": 7516, + "id": 7507, "name": "CDaiAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "712:71:31", "stateVariable": true, "storageLocation": "default", @@ -649,7 +649,7 @@ "typeString": "address" }, "typeName": { - "id": 7514, + "id": 7505, "name": "address", "nodeType": "ElementaryTypeName", "src": "712:7:31", @@ -662,7 +662,7 @@ "value": { "argumentTypes": null, "hexValue": "307835643361353336453444364462443631313463633145616433353737376241423934384533363433", - "id": 7515, + "id": 7506, "isConstant": false, "isLValue": false, "isPure": true, @@ -681,10 +681,10 @@ }, { "constant": false, - "id": 7519, + "id": 7510, "name": "CSaiAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "789:71:31", "stateVariable": true, "storageLocation": "default", @@ -693,7 +693,7 @@ "typeString": "address" }, "typeName": { - "id": 7517, + "id": 7508, "name": "address", "nodeType": "ElementaryTypeName", "src": "789:7:31", @@ -706,7 +706,7 @@ "value": { "argumentTypes": null, "hexValue": "307846354443653537323832413538344432373436466146313539336433313231466361633434346443", - "id": 7518, + "id": 7509, "isConstant": false, "isLValue": false, "isPure": true, @@ -725,10 +725,10 @@ }, { "constant": false, - "id": 7522, + "id": 7513, "name": "DaiAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "883:70:31", "stateVariable": true, "storageLocation": "default", @@ -737,7 +737,7 @@ "typeString": "address" }, "typeName": { - "id": 7520, + "id": 7511, "name": "address", "nodeType": "ElementaryTypeName", "src": "883:7:31", @@ -750,7 +750,7 @@ "value": { "argumentTypes": null, "hexValue": "307836423137353437344538393039344334344461393862393534456564654143343935323731643046", - "id": 7521, + "id": 7512, "isConstant": false, "isLValue": false, "isPure": true, @@ -769,10 +769,10 @@ }, { "constant": false, - "id": 7525, + "id": 7516, "name": "BatAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "959:70:31", "stateVariable": true, "storageLocation": "default", @@ -781,7 +781,7 @@ "typeString": "address" }, "typeName": { - "id": 7523, + "id": 7514, "name": "address", "nodeType": "ElementaryTypeName", "src": "959:7:31", @@ -794,7 +794,7 @@ "value": { "argumentTypes": null, "hexValue": "307830443837373546363438343330363739413730394539386432623043623632353064323838374546", - "id": 7524, + "id": 7515, "isConstant": false, "isLValue": false, "isPure": true, @@ -813,10 +813,10 @@ }, { "constant": false, - "id": 7528, + "id": 7519, "name": "UsdcAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1035:71:31", "stateVariable": true, "storageLocation": "default", @@ -825,7 +825,7 @@ "typeString": "address" }, "typeName": { - "id": 7526, + "id": 7517, "name": "address", "nodeType": "ElementaryTypeName", "src": "1035:7:31", @@ -838,7 +838,7 @@ "value": { "argumentTypes": null, "hexValue": "307841306238363939316336323138623336633164313944346132653945623063453336303665423438", - "id": 7527, + "id": 7518, "isConstant": false, "isLValue": false, "isPure": true, @@ -857,10 +857,10 @@ }, { "constant": false, - "id": 7531, + "id": 7522, "name": "EthJoinAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1244:74:31", "stateVariable": true, "storageLocation": "default", @@ -869,7 +869,7 @@ "typeString": "address" }, "typeName": { - "id": 7529, + "id": 7520, "name": "address", "nodeType": "ElementaryTypeName", "src": "1244:7:31", @@ -882,7 +882,7 @@ "value": { "argumentTypes": null, "hexValue": "307832463062323366353337333432353242646132323737333537653937653135313764364230343241", - "id": 7530, + "id": 7521, "isConstant": false, "isLValue": false, "isPure": true, @@ -901,10 +901,10 @@ }, { "constant": false, - "id": 7534, + "id": 7525, "name": "UsdcJoinAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1324:75:31", "stateVariable": true, "storageLocation": "default", @@ -913,7 +913,7 @@ "typeString": "address" }, "typeName": { - "id": 7532, + "id": 7523, "name": "address", "nodeType": "ElementaryTypeName", "src": "1324:7:31", @@ -926,7 +926,7 @@ "value": { "argumentTypes": null, "hexValue": "307841313931653537386136373336313637333236643035633131394345306339303834394538344237", - "id": 7533, + "id": 7524, "isConstant": false, "isLValue": false, "isPure": true, @@ -945,10 +945,10 @@ }, { "constant": false, - "id": 7537, + "id": 7528, "name": "BatJoinAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1405:74:31", "stateVariable": true, "storageLocation": "default", @@ -957,7 +957,7 @@ "typeString": "address" }, "typeName": { - "id": 7535, + "id": 7526, "name": "address", "nodeType": "ElementaryTypeName", "src": "1405:7:31", @@ -970,7 +970,7 @@ "value": { "argumentTypes": null, "hexValue": "307833443042313931324236363131346434303936463438413843456533413536433233313737326341", - "id": 7536, + "id": 7527, "isConstant": false, "isLValue": false, "isPure": true, @@ -989,10 +989,10 @@ }, { "constant": false, - "id": 7540, + "id": 7531, "name": "DaiJoinAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1485:74:31", "stateVariable": true, "storageLocation": "default", @@ -1001,7 +1001,7 @@ "typeString": "address" }, "typeName": { - "id": 7538, + "id": 7529, "name": "address", "nodeType": "ElementaryTypeName", "src": "1485:7:31", @@ -1014,7 +1014,7 @@ "value": { "argumentTypes": null, "hexValue": "307839373539413641633930393737623933423538353437623441373163373833313766333931413238", - "id": 7539, + "id": 7530, "isConstant": false, "isLValue": false, "isPure": true, @@ -1033,10 +1033,10 @@ }, { "constant": false, - "id": 7543, + "id": 7534, "name": "JugAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1565:70:31", "stateVariable": true, "storageLocation": "default", @@ -1045,7 +1045,7 @@ "typeString": "address" }, "typeName": { - "id": 7541, + "id": 7532, "name": "address", "nodeType": "ElementaryTypeName", "src": "1565:7:31", @@ -1058,7 +1058,7 @@ "value": { "argumentTypes": null, "hexValue": "307831396330393736663539304436373730374536323339374338373832396438393644633066314631", - "id": 7542, + "id": 7533, "isConstant": false, "isLValue": false, "isPure": true, @@ -1077,10 +1077,10 @@ }, { "constant": false, - "id": 7546, + "id": 7537, "name": "DssProxyActionsAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1641:82:31", "stateVariable": true, "storageLocation": "default", @@ -1089,7 +1089,7 @@ "typeString": "address" }, "typeName": { - "id": 7544, + "id": 7535, "name": "address", "nodeType": "ElementaryTypeName", "src": "1641:7:31", @@ -1102,7 +1102,7 @@ "value": { "argumentTypes": null, "hexValue": "307838326563443133354463653635466263364462644430653432333745304146393346464435303338", - "id": 7545, + "id": 7536, "isConstant": false, "isLValue": false, "isPure": true, @@ -1121,10 +1121,10 @@ }, { "constant": false, - "id": 7549, + "id": 7540, "name": "DssCdpManagerAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1729:80:31", "stateVariable": true, "storageLocation": "default", @@ -1133,7 +1133,7 @@ "typeString": "address" }, "typeName": { - "id": 7547, + "id": 7538, "name": "address", "nodeType": "ElementaryTypeName", "src": "1729:7:31", @@ -1146,7 +1146,7 @@ "value": { "argumentTypes": null, "hexValue": "307835656633306239393836333435323439626333326438393238423765653634444539343335453339", - "id": 7548, + "id": 7539, "isConstant": false, "isLValue": false, "isPure": true, @@ -1164,7 +1164,7 @@ "visibility": "public" } ], - "scope": 7551, + "scope": 7542, "src": "25:1787:31" } ], @@ -1174,14 +1174,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol", "exportedSymbols": { "AddressRegistry": [ - 7550 + 7541 ] }, - "id": 7551, + "id": 7542, "nodeType": "SourceUnit", "nodes": [ { - "id": 7492, + "id": 7483, "literals": [ "solidity", "0.5", @@ -1196,19 +1196,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 7550, + "id": 7541, "linearizedBaseContracts": [ - 7550 + 7541 ], "name": "AddressRegistry", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 7495, + "id": 7486, "name": "AaveLendingPoolAddressProviderAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "68:97:31", "stateVariable": true, "storageLocation": "default", @@ -1217,7 +1217,7 @@ "typeString": "address" }, "typeName": { - "id": 7493, + "id": 7484, "name": "address", "nodeType": "ElementaryTypeName", "src": "68:7:31", @@ -1230,7 +1230,7 @@ "value": { "argumentTypes": null, "hexValue": "307832346134326644323843393736413631446635443030443035393943333463346639303734386338", - "id": 7494, + "id": 7485, "isConstant": false, "isLValue": false, "isPure": true, @@ -1249,10 +1249,10 @@ }, { "constant": false, - "id": 7498, + "id": 7489, "name": "AaveEthAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "171:74:31", "stateVariable": true, "storageLocation": "default", @@ -1261,7 +1261,7 @@ "typeString": "address" }, "typeName": { - "id": 7496, + "id": 7487, "name": "address", "nodeType": "ElementaryTypeName", "src": "171:7:31", @@ -1274,7 +1274,7 @@ "value": { "argumentTypes": null, "hexValue": "307845656565654565656545654565654565456545656545454565656565456565656565656545456545", - "id": 7497, + "id": 7488, "isConstant": false, "isLValue": false, "isPure": true, @@ -1293,10 +1293,10 @@ }, { "constant": false, - "id": 7501, + "id": 7492, "name": "UniswapFactoryAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "267:81:31", "stateVariable": true, "storageLocation": "default", @@ -1305,7 +1305,7 @@ "typeString": "address" }, "typeName": { - "id": 7499, + "id": 7490, "name": "address", "nodeType": "ElementaryTypeName", "src": "267:7:31", @@ -1318,7 +1318,7 @@ "value": { "argumentTypes": null, "hexValue": "307863306134376446653033344234303042343762446144354665634461323632316465366334643935", - "id": 7500, + "id": 7491, "isConstant": false, "isLValue": false, "isPure": true, @@ -1337,10 +1337,10 @@ }, { "constant": false, - "id": 7504, + "id": 7495, "name": "CompoundPriceOracleAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "371:86:31", "stateVariable": true, "storageLocation": "default", @@ -1349,7 +1349,7 @@ "typeString": "address" }, "typeName": { - "id": 7502, + "id": 7493, "name": "address", "nodeType": "ElementaryTypeName", "src": "371:7:31", @@ -1362,7 +1362,7 @@ "value": { "argumentTypes": null, "hexValue": "307831443861456463394539323437333044443366393634314344623444314239324238343862346264", - "id": 7503, + "id": 7494, "isConstant": false, "isLValue": false, "isPure": true, @@ -1381,10 +1381,10 @@ }, { "constant": false, - "id": 7507, + "id": 7498, "name": "CompoundComptrollerAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "463:86:31", "stateVariable": true, "storageLocation": "default", @@ -1393,7 +1393,7 @@ "typeString": "address" }, "typeName": { - "id": 7505, + "id": 7496, "name": "address", "nodeType": "ElementaryTypeName", "src": "463:7:31", @@ -1406,7 +1406,7 @@ "value": { "argumentTypes": null, "hexValue": "307833643938313932313041333162343936316233304546353462453261654437394239633943643342", - "id": 7506, + "id": 7497, "isConstant": false, "isLValue": false, "isPure": true, @@ -1425,10 +1425,10 @@ }, { "constant": false, - "id": 7510, + "id": 7501, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "555:73:31", "stateVariable": true, "storageLocation": "default", @@ -1437,7 +1437,7 @@ "typeString": "address" }, "typeName": { - "id": 7508, + "id": 7499, "name": "address", "nodeType": "ElementaryTypeName", "src": "555:7:31", @@ -1450,7 +1450,7 @@ "value": { "argumentTypes": null, "hexValue": "307834446463324431393339343839323644303266394231664539653164616130373138323730454435", - "id": 7509, + "id": 7500, "isConstant": false, "isLValue": false, "isPure": true, @@ -1469,10 +1469,10 @@ }, { "constant": false, - "id": 7513, + "id": 7504, "name": "CUSDCAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "634:72:31", "stateVariable": true, "storageLocation": "default", @@ -1481,7 +1481,7 @@ "typeString": "address" }, "typeName": { - "id": 7511, + "id": 7502, "name": "address", "nodeType": "ElementaryTypeName", "src": "634:7:31", @@ -1494,7 +1494,7 @@ "value": { "argumentTypes": null, "hexValue": "307833394141333963303231646662614538666143353435393336363933614339313764354537353633", - "id": 7512, + "id": 7503, "isConstant": false, "isLValue": false, "isPure": true, @@ -1513,10 +1513,10 @@ }, { "constant": false, - "id": 7516, + "id": 7507, "name": "CDaiAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "712:71:31", "stateVariable": true, "storageLocation": "default", @@ -1525,7 +1525,7 @@ "typeString": "address" }, "typeName": { - "id": 7514, + "id": 7505, "name": "address", "nodeType": "ElementaryTypeName", "src": "712:7:31", @@ -1538,7 +1538,7 @@ "value": { "argumentTypes": null, "hexValue": "307835643361353336453444364462443631313463633145616433353737376241423934384533363433", - "id": 7515, + "id": 7506, "isConstant": false, "isLValue": false, "isPure": true, @@ -1557,10 +1557,10 @@ }, { "constant": false, - "id": 7519, + "id": 7510, "name": "CSaiAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "789:71:31", "stateVariable": true, "storageLocation": "default", @@ -1569,7 +1569,7 @@ "typeString": "address" }, "typeName": { - "id": 7517, + "id": 7508, "name": "address", "nodeType": "ElementaryTypeName", "src": "789:7:31", @@ -1582,7 +1582,7 @@ "value": { "argumentTypes": null, "hexValue": "307846354443653537323832413538344432373436466146313539336433313231466361633434346443", - "id": 7518, + "id": 7509, "isConstant": false, "isLValue": false, "isPure": true, @@ -1601,10 +1601,10 @@ }, { "constant": false, - "id": 7522, + "id": 7513, "name": "DaiAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "883:70:31", "stateVariable": true, "storageLocation": "default", @@ -1613,7 +1613,7 @@ "typeString": "address" }, "typeName": { - "id": 7520, + "id": 7511, "name": "address", "nodeType": "ElementaryTypeName", "src": "883:7:31", @@ -1626,7 +1626,7 @@ "value": { "argumentTypes": null, "hexValue": "307836423137353437344538393039344334344461393862393534456564654143343935323731643046", - "id": 7521, + "id": 7512, "isConstant": false, "isLValue": false, "isPure": true, @@ -1645,10 +1645,10 @@ }, { "constant": false, - "id": 7525, + "id": 7516, "name": "BatAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "959:70:31", "stateVariable": true, "storageLocation": "default", @@ -1657,7 +1657,7 @@ "typeString": "address" }, "typeName": { - "id": 7523, + "id": 7514, "name": "address", "nodeType": "ElementaryTypeName", "src": "959:7:31", @@ -1670,7 +1670,7 @@ "value": { "argumentTypes": null, "hexValue": "307830443837373546363438343330363739413730394539386432623043623632353064323838374546", - "id": 7524, + "id": 7515, "isConstant": false, "isLValue": false, "isPure": true, @@ -1689,10 +1689,10 @@ }, { "constant": false, - "id": 7528, + "id": 7519, "name": "UsdcAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1035:71:31", "stateVariable": true, "storageLocation": "default", @@ -1701,7 +1701,7 @@ "typeString": "address" }, "typeName": { - "id": 7526, + "id": 7517, "name": "address", "nodeType": "ElementaryTypeName", "src": "1035:7:31", @@ -1714,7 +1714,7 @@ "value": { "argumentTypes": null, "hexValue": "307841306238363939316336323138623336633164313944346132653945623063453336303665423438", - "id": 7527, + "id": 7518, "isConstant": false, "isLValue": false, "isPure": true, @@ -1733,10 +1733,10 @@ }, { "constant": false, - "id": 7531, + "id": 7522, "name": "EthJoinAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1244:74:31", "stateVariable": true, "storageLocation": "default", @@ -1745,7 +1745,7 @@ "typeString": "address" }, "typeName": { - "id": 7529, + "id": 7520, "name": "address", "nodeType": "ElementaryTypeName", "src": "1244:7:31", @@ -1758,7 +1758,7 @@ "value": { "argumentTypes": null, "hexValue": "307832463062323366353337333432353242646132323737333537653937653135313764364230343241", - "id": 7530, + "id": 7521, "isConstant": false, "isLValue": false, "isPure": true, @@ -1777,10 +1777,10 @@ }, { "constant": false, - "id": 7534, + "id": 7525, "name": "UsdcJoinAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1324:75:31", "stateVariable": true, "storageLocation": "default", @@ -1789,7 +1789,7 @@ "typeString": "address" }, "typeName": { - "id": 7532, + "id": 7523, "name": "address", "nodeType": "ElementaryTypeName", "src": "1324:7:31", @@ -1802,7 +1802,7 @@ "value": { "argumentTypes": null, "hexValue": "307841313931653537386136373336313637333236643035633131394345306339303834394538344237", - "id": 7533, + "id": 7524, "isConstant": false, "isLValue": false, "isPure": true, @@ -1821,10 +1821,10 @@ }, { "constant": false, - "id": 7537, + "id": 7528, "name": "BatJoinAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1405:74:31", "stateVariable": true, "storageLocation": "default", @@ -1833,7 +1833,7 @@ "typeString": "address" }, "typeName": { - "id": 7535, + "id": 7526, "name": "address", "nodeType": "ElementaryTypeName", "src": "1405:7:31", @@ -1846,7 +1846,7 @@ "value": { "argumentTypes": null, "hexValue": "307833443042313931324236363131346434303936463438413843456533413536433233313737326341", - "id": 7536, + "id": 7527, "isConstant": false, "isLValue": false, "isPure": true, @@ -1865,10 +1865,10 @@ }, { "constant": false, - "id": 7540, + "id": 7531, "name": "DaiJoinAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1485:74:31", "stateVariable": true, "storageLocation": "default", @@ -1877,7 +1877,7 @@ "typeString": "address" }, "typeName": { - "id": 7538, + "id": 7529, "name": "address", "nodeType": "ElementaryTypeName", "src": "1485:7:31", @@ -1890,7 +1890,7 @@ "value": { "argumentTypes": null, "hexValue": "307839373539413641633930393737623933423538353437623441373163373833313766333931413238", - "id": 7539, + "id": 7530, "isConstant": false, "isLValue": false, "isPure": true, @@ -1909,10 +1909,10 @@ }, { "constant": false, - "id": 7543, + "id": 7534, "name": "JugAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1565:70:31", "stateVariable": true, "storageLocation": "default", @@ -1921,7 +1921,7 @@ "typeString": "address" }, "typeName": { - "id": 7541, + "id": 7532, "name": "address", "nodeType": "ElementaryTypeName", "src": "1565:7:31", @@ -1934,7 +1934,7 @@ "value": { "argumentTypes": null, "hexValue": "307831396330393736663539304436373730374536323339374338373832396438393644633066314631", - "id": 7542, + "id": 7533, "isConstant": false, "isLValue": false, "isPure": true, @@ -1953,10 +1953,10 @@ }, { "constant": false, - "id": 7546, + "id": 7537, "name": "DssProxyActionsAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1641:82:31", "stateVariable": true, "storageLocation": "default", @@ -1965,7 +1965,7 @@ "typeString": "address" }, "typeName": { - "id": 7544, + "id": 7535, "name": "address", "nodeType": "ElementaryTypeName", "src": "1641:7:31", @@ -1978,7 +1978,7 @@ "value": { "argumentTypes": null, "hexValue": "307838326563443133354463653635466263364462644430653432333745304146393346464435303338", - "id": 7545, + "id": 7536, "isConstant": false, "isLValue": false, "isPure": true, @@ -1997,10 +1997,10 @@ }, { "constant": false, - "id": 7549, + "id": 7540, "name": "DssCdpManagerAddress", "nodeType": "VariableDeclaration", - "scope": 7550, + "scope": 7541, "src": "1729:80:31", "stateVariable": true, "storageLocation": "default", @@ -2009,7 +2009,7 @@ "typeString": "address" }, "typeName": { - "id": 7547, + "id": 7538, "name": "address", "nodeType": "ElementaryTypeName", "src": "1729:7:31", @@ -2022,7 +2022,7 @@ "value": { "argumentTypes": null, "hexValue": "307835656633306239393836333435323439626333326438393238423765653634444539343335453339", - "id": 7548, + "id": 7539, "isConstant": false, "isLValue": false, "isPure": true, @@ -2040,7 +2040,7 @@ "visibility": "public" } ], - "scope": 7551, + "scope": 7542, "src": "25:1787:31" } ], @@ -2059,7 +2059,7 @@ } }, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:28:59.355Z", + "updatedAt": "2020-04-08T12:22:38.660Z", "networkType": "ethereum", "devdoc": { "methods": {} diff --git a/packages/smart-contracts/artifacts/BytesLibLite.json b/packages/smart-contracts/artifacts/BytesLibLite.json index 50644aa..3aaedf7 100644 --- a/packages/smart-contracts/artifacts/BytesLibLite.json +++ b/packages/smart-contracts/artifacts/BytesLibLite.json @@ -12,14 +12,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/BytesLib.sol", "exportedSymbols": { "BytesLibLite": [ - 2035 + 2061 ] }, - "id": 2036, + "id": 2062, "nodeType": "SourceUnit", "nodes": [ { - "id": 1951, + "id": 1977, "literals": [ "solidity", "0.5", @@ -34,16 +34,16 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2035, + "id": 2061, "linearizedBaseContracts": [ - 2035 + 2061 ], "name": "BytesLibLite", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 1977, + "id": 2003, "nodeType": "Block", "src": "372:185:14", "statements": [ @@ -57,18 +57,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1964, + "id": 1990, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1961, + "id": 1987, "name": "_start", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1955, + "referencedDeclaration": 1981, "src": "390:6:14", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -81,18 +81,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1962, + "id": 1988, "name": "_bytes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1953, + "referencedDeclaration": 1979, "src": "399:6:14", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "id": 1963, + "id": 1989, "isConstant": false, "isLValue": false, "isPure": false, @@ -115,7 +115,7 @@ { "argumentTypes": null, "hexValue": "62797465732d726561642d6f75742d6f662d626f756e6473", - "id": 1965, + "id": 1991, "isConstant": false, "isLValue": false, "isPure": true, @@ -142,21 +142,21 @@ "typeString": "literal_string \"bytes-read-out-of-bounds\"" } ], - "id": 1960, + "id": 1986, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "382:7:14", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1966, + "id": 1992, "isConstant": false, "isLValue": false, "isPure": false, @@ -170,7 +170,7 @@ "typeString": "tuple()" } }, - "id": 1967, + "id": 1993, "nodeType": "ExpressionStatement", "src": "382:59:14" }, @@ -180,11 +180,11 @@ "arguments": [ { "argumentTypes": null, - "id": 1969, + "id": 1995, "name": "_bytes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1953, + "referencedDeclaration": 1979, "src": "478:6:14", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -193,11 +193,11 @@ }, { "argumentTypes": null, - "id": 1970, + "id": 1996, "name": "_start", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1955, + "referencedDeclaration": 1981, "src": "498:6:14", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -210,7 +210,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1974, + "id": 2000, "isConstant": false, "isLValue": false, "isPure": false, @@ -219,18 +219,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1971, + "id": 1997, "name": "_bytes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1953, + "referencedDeclaration": 1979, "src": "518:6:14", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "id": 1972, + "id": 1998, "isConstant": false, "isLValue": false, "isPure": false, @@ -248,11 +248,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 1973, + "id": 1999, "name": "_start", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1955, + "referencedDeclaration": 1981, "src": "534:6:14", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -281,18 +281,18 @@ "typeString": "uint256" } ], - "id": 1968, + "id": 1994, "name": "slice", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2007, + "referencedDeclaration": 2033, "src": "459:5:14", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$_t_uint256_$_t_uint256_$returns$_t_bytes_memory_ptr_$", "typeString": "function (bytes memory,uint256,uint256) pure returns (bytes memory)" } }, - "id": 1975, + "id": 2001, "isConstant": false, "isLValue": false, "isPure": false, @@ -306,30 +306,30 @@ "typeString": "bytes memory" } }, - "functionReturnParameters": 1959, - "id": 1976, + "functionReturnParameters": 1985, + "id": 2002, "nodeType": "Return", "src": "452:98:14" } ] }, "documentation": null, - "id": 1978, + "id": 2004, "implemented": true, "kind": "function", "modifiers": [], "name": "sliceToEnd", "nodeType": "FunctionDefinition", "parameters": { - "id": 1956, + "id": 1982, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1953, + "id": 1979, "name": "_bytes", "nodeType": "VariableDeclaration", - "scope": 1978, + "scope": 2004, "src": "285:19:14", "stateVariable": false, "storageLocation": "memory", @@ -338,7 +338,7 @@ "typeString": "bytes" }, "typeName": { - "id": 1952, + "id": 1978, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "285:5:14", @@ -352,10 +352,10 @@ }, { "constant": false, - "id": 1955, + "id": 1981, "name": "_start", "nodeType": "VariableDeclaration", - "scope": 1978, + "scope": 2004, "src": "314:14:14", "stateVariable": false, "storageLocation": "default", @@ -364,7 +364,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1954, + "id": 1980, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "314:7:14", @@ -380,15 +380,15 @@ "src": "275:59:14" }, "returnParameters": { - "id": 1959, + "id": 1985, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1958, + "id": 1984, "name": "", "nodeType": "VariableDeclaration", - "scope": 1978, + "scope": 2004, "src": "358:12:14", "stateVariable": false, "storageLocation": "memory", @@ -397,7 +397,7 @@ "typeString": "bytes" }, "typeName": { - "id": 1957, + "id": 1983, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "358:5:14", @@ -412,7 +412,7 @@ ], "src": "357:14:14" }, - "scope": 2035, + "scope": 2061, "src": "256:301:14", "stateMutability": "pure", "superFunction": null, @@ -420,7 +420,7 @@ }, { "body": { - "id": 2006, + "id": 2032, "nodeType": "Block", "src": "731:2406:14", "statements": [ @@ -434,7 +434,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1996, + "id": 2022, "isConstant": false, "isLValue": false, "isPure": false, @@ -443,18 +443,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1990, + "id": 2016, "name": "_bytes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1980, + "referencedDeclaration": 2006, "src": "749:6:14", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "id": 1991, + "id": 2017, "isConstant": false, "isLValue": false, "isPure": false, @@ -479,18 +479,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1994, + "id": 2020, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1992, + "id": 2018, "name": "_start", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1982, + "referencedDeclaration": 2008, "src": "767:6:14", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -501,11 +501,11 @@ "operator": "+", "rightExpression": { "argumentTypes": null, - "id": 1993, + "id": 2019, "name": "_length", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1984, + "referencedDeclaration": 2010, "src": "776:7:14", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -519,7 +519,7 @@ } } ], - "id": 1995, + "id": 2021, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -541,7 +541,7 @@ { "argumentTypes": null, "hexValue": "62797465732d726561642d6f75742d6f662d626f756e6473", - "id": 1997, + "id": 2023, "isConstant": false, "isLValue": false, "isPure": true, @@ -568,21 +568,21 @@ "typeString": "literal_string \"bytes-read-out-of-bounds\"" } ], - "id": 1989, + "id": 2015, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "741:7:14", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1998, + "id": 2024, "isConstant": false, "isLValue": false, "isPure": false, @@ -596,21 +596,21 @@ "typeString": "tuple()" } }, - "id": 1999, + "id": 2025, "nodeType": "ExpressionStatement", "src": "741:72:14" }, { "assignments": [ - 2001 + 2027 ], "declarations": [ { "constant": false, - "id": 2001, + "id": 2027, "name": "tempBytes", "nodeType": "VariableDeclaration", - "scope": 2006, + "scope": 2032, "src": "824:22:14", "stateVariable": false, "storageLocation": "memory", @@ -619,7 +619,7 @@ "typeString": "bytes" }, "typeName": { - "id": 2000, + "id": 2026, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "824:5:14", @@ -632,7 +632,7 @@ "visibility": "internal" } ], - "id": 2002, + "id": 2028, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "824:22:14" @@ -641,7 +641,7 @@ "externalReferences": [ { "_length": { - "declaration": 1984, + "declaration": 2010, "isOffset": false, "isSlot": false, "src": "894:7:14", @@ -650,7 +650,7 @@ }, { "tempBytes": { - "declaration": 2001, + "declaration": 2027, "isOffset": false, "isSlot": false, "src": "1078:9:14", @@ -659,7 +659,7 @@ }, { "_length": { - "declaration": 1984, + "declaration": 2010, "isOffset": false, "isSlot": false, "src": "1747:7:14", @@ -668,7 +668,7 @@ }, { "tempBytes": { - "declaration": 2001, + "declaration": 2027, "isOffset": false, "isSlot": false, "src": "2098:9:14", @@ -677,7 +677,7 @@ }, { "tempBytes": { - "declaration": 2001, + "declaration": 2027, "isOffset": false, "isSlot": false, "src": "2662:9:14", @@ -686,7 +686,7 @@ }, { "_length": { - "declaration": 1984, + "declaration": 2010, "isOffset": false, "isSlot": false, "src": "2673:7:14", @@ -695,7 +695,7 @@ }, { "_length": { - "declaration": 1984, + "declaration": 2010, "isOffset": false, "isSlot": false, "src": "2186:7:14", @@ -704,7 +704,7 @@ }, { "_bytes": { - "declaration": 1980, + "declaration": 2006, "isOffset": false, "isSlot": false, "src": "2387:6:14", @@ -713,7 +713,7 @@ }, { "_start": { - "declaration": 1982, + "declaration": 2008, "isOffset": false, "isSlot": false, "src": "2438:6:14", @@ -722,7 +722,7 @@ }, { "tempBytes": { - "declaration": 2001, + "declaration": 2027, "isOffset": false, "isSlot": false, "src": "3004:9:14", @@ -731,7 +731,7 @@ }, { "tempBytes": { - "declaration": 2001, + "declaration": 2027, "isOffset": false, "isSlot": false, "src": "3063:9:14", @@ -739,7 +739,7 @@ } } ], - "id": 2003, + "id": 2029, "nodeType": "InlineAssembly", "operations": "{\n switch iszero(_length)\n case 0 {\n tempBytes := mload(0x40)\n let lengthmod := and(_length, 31)\n let mc := add(add(tempBytes, lengthmod), mul(0x20, iszero(lengthmod)))\n let end := add(mc, _length)\n for {\n let cc := add(add(add(_bytes, lengthmod), mul(0x20, iszero(lengthmod))), _start)\n }\n lt(mc, end)\n {\n mc := add(mc, 0x20)\n cc := add(cc, 0x20)\n }\n { mstore(mc, mload(cc)) }\n mstore(tempBytes, _length)\n mstore(0x40, and(add(mc, 31), not(31)))\n }\n default {\n tempBytes := mload(0x40)\n mstore(0x40, add(tempBytes, 0x20))\n }\n}", "src": "857:2247:14" @@ -747,41 +747,41 @@ { "expression": { "argumentTypes": null, - "id": 2004, + "id": 2030, "name": "tempBytes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2001, + "referencedDeclaration": 2027, "src": "3121:9:14", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "functionReturnParameters": 1988, - "id": 2005, + "functionReturnParameters": 2014, + "id": 2031, "nodeType": "Return", "src": "3114:16:14" } ] }, "documentation": null, - "id": 2007, + "id": 2033, "implemented": true, "kind": "function", "modifiers": [], "name": "slice", "nodeType": "FunctionDefinition", "parameters": { - "id": 1985, + "id": 2011, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1980, + "id": 2006, "name": "_bytes", "nodeType": "VariableDeclaration", - "scope": 2007, + "scope": 2033, "src": "591:19:14", "stateVariable": false, "storageLocation": "memory", @@ -790,7 +790,7 @@ "typeString": "bytes" }, "typeName": { - "id": 1979, + "id": 2005, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "591:5:14", @@ -804,10 +804,10 @@ }, { "constant": false, - "id": 1982, + "id": 2008, "name": "_start", "nodeType": "VariableDeclaration", - "scope": 2007, + "scope": 2033, "src": "620:14:14", "stateVariable": false, "storageLocation": "default", @@ -816,7 +816,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1981, + "id": 2007, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "620:7:14", @@ -830,10 +830,10 @@ }, { "constant": false, - "id": 1984, + "id": 2010, "name": "_length", "nodeType": "VariableDeclaration", - "scope": 2007, + "scope": 2033, "src": "644:15:14", "stateVariable": false, "storageLocation": "default", @@ -842,7 +842,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1983, + "id": 2009, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "644:7:14", @@ -858,15 +858,15 @@ "src": "581:84:14" }, "returnParameters": { - "id": 1988, + "id": 2014, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1987, + "id": 2013, "name": "", "nodeType": "VariableDeclaration", - "scope": 2007, + "scope": 2033, "src": "713:12:14", "stateVariable": false, "storageLocation": "memory", @@ -875,7 +875,7 @@ "typeString": "bytes" }, "typeName": { - "id": 1986, + "id": 2012, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "713:5:14", @@ -890,7 +890,7 @@ ], "src": "712:14:14" }, - "scope": 2035, + "scope": 2061, "src": "567:2570:14", "stateMutability": "pure", "superFunction": null, @@ -898,7 +898,7 @@ }, { "body": { - "id": 2033, + "id": 2059, "nodeType": "Block", "src": "3236:265:14", "statements": [ @@ -912,7 +912,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2023, + "id": 2049, "isConstant": false, "isLValue": false, "isPure": false, @@ -921,18 +921,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2017, + "id": 2043, "name": "_bytes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2009, + "referencedDeclaration": 2035, "src": "3254:6:14", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "id": 2018, + "id": 2044, "isConstant": false, "isLValue": false, "isPure": false, @@ -957,18 +957,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2021, + "id": 2047, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2019, + "id": 2045, "name": "_start", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2011, + "referencedDeclaration": 2037, "src": "3272:6:14", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -980,7 +980,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3230", - "id": 2020, + "id": 2046, "isConstant": false, "isLValue": false, "isPure": true, @@ -1002,7 +1002,7 @@ } } ], - "id": 2022, + "id": 2048, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -1024,7 +1024,7 @@ { "argumentTypes": null, "hexValue": "52656164206f7574206f6620626f756e6473", - "id": 2024, + "id": 2050, "isConstant": false, "isLValue": false, "isPure": true, @@ -1051,21 +1051,21 @@ "typeString": "literal_string \"Read out of bounds\"" } ], - "id": 2016, + "id": 2042, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3246:7:14", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2025, + "id": 2051, "isConstant": false, "isLValue": false, "isPure": false, @@ -1079,21 +1079,21 @@ "typeString": "tuple()" } }, - "id": 2026, + "id": 2052, "nodeType": "ExpressionStatement", "src": "3246:61:14" }, { "assignments": [ - 2028 + 2054 ], "declarations": [ { "constant": false, - "id": 2028, + "id": 2054, "name": "tempAddress", "nodeType": "VariableDeclaration", - "scope": 2033, + "scope": 2059, "src": "3317:19:14", "stateVariable": false, "storageLocation": "default", @@ -1102,7 +1102,7 @@ "typeString": "address" }, "typeName": { - "id": 2027, + "id": 2053, "name": "address", "nodeType": "ElementaryTypeName", "src": "3317:7:14", @@ -1116,7 +1116,7 @@ "visibility": "internal" } ], - "id": 2029, + "id": 2055, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "3317:19:14" @@ -1125,7 +1125,7 @@ "externalReferences": [ { "tempAddress": { - "declaration": 2028, + "declaration": 2054, "isOffset": false, "isSlot": false, "src": "3370:11:14", @@ -1134,7 +1134,7 @@ }, { "_bytes": { - "declaration": 2009, + "declaration": 2035, "isOffset": false, "isSlot": false, "src": "3403:6:14", @@ -1143,7 +1143,7 @@ }, { "_start": { - "declaration": 2011, + "declaration": 2037, "isOffset": false, "isSlot": false, "src": "3418:6:14", @@ -1151,7 +1151,7 @@ } } ], - "id": 2030, + "id": 2056, "nodeType": "InlineAssembly", "operations": "{\n tempAddress := div(mload(add(add(_bytes, 0x20), _start)), 0x1000000000000000000000000)\n}", "src": "3347:119:14" @@ -1159,41 +1159,41 @@ { "expression": { "argumentTypes": null, - "id": 2031, + "id": 2057, "name": "tempAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2028, + "referencedDeclaration": 2054, "src": "3483:11:14", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "functionReturnParameters": 2015, - "id": 2032, + "functionReturnParameters": 2041, + "id": 2058, "nodeType": "Return", "src": "3476:18:14" } ] }, "documentation": null, - "id": 2034, + "id": 2060, "implemented": true, "kind": "function", "modifiers": [], "name": "bytesToAddress", "nodeType": "FunctionDefinition", "parameters": { - "id": 2012, + "id": 2038, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2009, + "id": 2035, "name": "_bytes", "nodeType": "VariableDeclaration", - "scope": 2034, + "scope": 2060, "src": "3167:19:14", "stateVariable": false, "storageLocation": "memory", @@ -1202,7 +1202,7 @@ "typeString": "bytes" }, "typeName": { - "id": 2008, + "id": 2034, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "3167:5:14", @@ -1216,10 +1216,10 @@ }, { "constant": false, - "id": 2011, + "id": 2037, "name": "_start", "nodeType": "VariableDeclaration", - "scope": 2034, + "scope": 2060, "src": "3188:14:14", "stateVariable": false, "storageLocation": "default", @@ -1228,7 +1228,7 @@ "typeString": "uint256" }, "typeName": { - "id": 2010, + "id": 2036, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3188:7:14", @@ -1244,15 +1244,15 @@ "src": "3166:37:14" }, "returnParameters": { - "id": 2015, + "id": 2041, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2014, + "id": 2040, "name": "", "nodeType": "VariableDeclaration", - "scope": 2034, + "scope": 2060, "src": "3227:7:14", "stateVariable": false, "storageLocation": "default", @@ -1261,7 +1261,7 @@ "typeString": "address" }, "typeName": { - "id": 2013, + "id": 2039, "name": "address", "nodeType": "ElementaryTypeName", "src": "3227:7:14", @@ -1277,14 +1277,14 @@ ], "src": "3226:9:14" }, - "scope": 2035, + "scope": 2061, "src": "3143:358:14", "stateMutability": "pure", "superFunction": null, "visibility": "internal" } ], - "scope": 2036, + "scope": 2062, "src": "144:3359:14" } ], @@ -1294,14 +1294,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/BytesLib.sol", "exportedSymbols": { "BytesLibLite": [ - 2035 + 2061 ] }, - "id": 2036, + "id": 2062, "nodeType": "SourceUnit", "nodes": [ { - "id": 1951, + "id": 1977, "literals": [ "solidity", "0.5", @@ -1316,16 +1316,16 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2035, + "id": 2061, "linearizedBaseContracts": [ - 2035 + 2061 ], "name": "BytesLibLite", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 1977, + "id": 2003, "nodeType": "Block", "src": "372:185:14", "statements": [ @@ -1339,18 +1339,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1964, + "id": 1990, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1961, + "id": 1987, "name": "_start", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1955, + "referencedDeclaration": 1981, "src": "390:6:14", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1363,18 +1363,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1962, + "id": 1988, "name": "_bytes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1953, + "referencedDeclaration": 1979, "src": "399:6:14", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "id": 1963, + "id": 1989, "isConstant": false, "isLValue": false, "isPure": false, @@ -1397,7 +1397,7 @@ { "argumentTypes": null, "hexValue": "62797465732d726561642d6f75742d6f662d626f756e6473", - "id": 1965, + "id": 1991, "isConstant": false, "isLValue": false, "isPure": true, @@ -1424,21 +1424,21 @@ "typeString": "literal_string \"bytes-read-out-of-bounds\"" } ], - "id": 1960, + "id": 1986, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "382:7:14", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1966, + "id": 1992, "isConstant": false, "isLValue": false, "isPure": false, @@ -1452,7 +1452,7 @@ "typeString": "tuple()" } }, - "id": 1967, + "id": 1993, "nodeType": "ExpressionStatement", "src": "382:59:14" }, @@ -1462,11 +1462,11 @@ "arguments": [ { "argumentTypes": null, - "id": 1969, + "id": 1995, "name": "_bytes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1953, + "referencedDeclaration": 1979, "src": "478:6:14", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -1475,11 +1475,11 @@ }, { "argumentTypes": null, - "id": 1970, + "id": 1996, "name": "_start", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1955, + "referencedDeclaration": 1981, "src": "498:6:14", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1492,7 +1492,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1974, + "id": 2000, "isConstant": false, "isLValue": false, "isPure": false, @@ -1501,18 +1501,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1971, + "id": 1997, "name": "_bytes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1953, + "referencedDeclaration": 1979, "src": "518:6:14", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "id": 1972, + "id": 1998, "isConstant": false, "isLValue": false, "isPure": false, @@ -1530,11 +1530,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 1973, + "id": 1999, "name": "_start", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1955, + "referencedDeclaration": 1981, "src": "534:6:14", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1563,18 +1563,18 @@ "typeString": "uint256" } ], - "id": 1968, + "id": 1994, "name": "slice", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2007, + "referencedDeclaration": 2033, "src": "459:5:14", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$_t_uint256_$_t_uint256_$returns$_t_bytes_memory_ptr_$", "typeString": "function (bytes memory,uint256,uint256) pure returns (bytes memory)" } }, - "id": 1975, + "id": 2001, "isConstant": false, "isLValue": false, "isPure": false, @@ -1588,30 +1588,30 @@ "typeString": "bytes memory" } }, - "functionReturnParameters": 1959, - "id": 1976, + "functionReturnParameters": 1985, + "id": 2002, "nodeType": "Return", "src": "452:98:14" } ] }, "documentation": null, - "id": 1978, + "id": 2004, "implemented": true, "kind": "function", "modifiers": [], "name": "sliceToEnd", "nodeType": "FunctionDefinition", "parameters": { - "id": 1956, + "id": 1982, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1953, + "id": 1979, "name": "_bytes", "nodeType": "VariableDeclaration", - "scope": 1978, + "scope": 2004, "src": "285:19:14", "stateVariable": false, "storageLocation": "memory", @@ -1620,7 +1620,7 @@ "typeString": "bytes" }, "typeName": { - "id": 1952, + "id": 1978, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "285:5:14", @@ -1634,10 +1634,10 @@ }, { "constant": false, - "id": 1955, + "id": 1981, "name": "_start", "nodeType": "VariableDeclaration", - "scope": 1978, + "scope": 2004, "src": "314:14:14", "stateVariable": false, "storageLocation": "default", @@ -1646,7 +1646,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1954, + "id": 1980, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "314:7:14", @@ -1662,15 +1662,15 @@ "src": "275:59:14" }, "returnParameters": { - "id": 1959, + "id": 1985, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1958, + "id": 1984, "name": "", "nodeType": "VariableDeclaration", - "scope": 1978, + "scope": 2004, "src": "358:12:14", "stateVariable": false, "storageLocation": "memory", @@ -1679,7 +1679,7 @@ "typeString": "bytes" }, "typeName": { - "id": 1957, + "id": 1983, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "358:5:14", @@ -1694,7 +1694,7 @@ ], "src": "357:14:14" }, - "scope": 2035, + "scope": 2061, "src": "256:301:14", "stateMutability": "pure", "superFunction": null, @@ -1702,7 +1702,7 @@ }, { "body": { - "id": 2006, + "id": 2032, "nodeType": "Block", "src": "731:2406:14", "statements": [ @@ -1716,7 +1716,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1996, + "id": 2022, "isConstant": false, "isLValue": false, "isPure": false, @@ -1725,18 +1725,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1990, + "id": 2016, "name": "_bytes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1980, + "referencedDeclaration": 2006, "src": "749:6:14", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "id": 1991, + "id": 2017, "isConstant": false, "isLValue": false, "isPure": false, @@ -1761,18 +1761,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1994, + "id": 2020, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1992, + "id": 2018, "name": "_start", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1982, + "referencedDeclaration": 2008, "src": "767:6:14", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1783,11 +1783,11 @@ "operator": "+", "rightExpression": { "argumentTypes": null, - "id": 1993, + "id": 2019, "name": "_length", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1984, + "referencedDeclaration": 2010, "src": "776:7:14", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1801,7 +1801,7 @@ } } ], - "id": 1995, + "id": 2021, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -1823,7 +1823,7 @@ { "argumentTypes": null, "hexValue": "62797465732d726561642d6f75742d6f662d626f756e6473", - "id": 1997, + "id": 2023, "isConstant": false, "isLValue": false, "isPure": true, @@ -1850,21 +1850,21 @@ "typeString": "literal_string \"bytes-read-out-of-bounds\"" } ], - "id": 1989, + "id": 2015, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "741:7:14", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1998, + "id": 2024, "isConstant": false, "isLValue": false, "isPure": false, @@ -1878,21 +1878,21 @@ "typeString": "tuple()" } }, - "id": 1999, + "id": 2025, "nodeType": "ExpressionStatement", "src": "741:72:14" }, { "assignments": [ - 2001 + 2027 ], "declarations": [ { "constant": false, - "id": 2001, + "id": 2027, "name": "tempBytes", "nodeType": "VariableDeclaration", - "scope": 2006, + "scope": 2032, "src": "824:22:14", "stateVariable": false, "storageLocation": "memory", @@ -1901,7 +1901,7 @@ "typeString": "bytes" }, "typeName": { - "id": 2000, + "id": 2026, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "824:5:14", @@ -1914,7 +1914,7 @@ "visibility": "internal" } ], - "id": 2002, + "id": 2028, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "824:22:14" @@ -1923,7 +1923,7 @@ "externalReferences": [ { "_length": { - "declaration": 1984, + "declaration": 2010, "isOffset": false, "isSlot": false, "src": "894:7:14", @@ -1932,7 +1932,7 @@ }, { "tempBytes": { - "declaration": 2001, + "declaration": 2027, "isOffset": false, "isSlot": false, "src": "1078:9:14", @@ -1941,7 +1941,7 @@ }, { "_length": { - "declaration": 1984, + "declaration": 2010, "isOffset": false, "isSlot": false, "src": "1747:7:14", @@ -1950,7 +1950,7 @@ }, { "tempBytes": { - "declaration": 2001, + "declaration": 2027, "isOffset": false, "isSlot": false, "src": "2098:9:14", @@ -1959,7 +1959,7 @@ }, { "tempBytes": { - "declaration": 2001, + "declaration": 2027, "isOffset": false, "isSlot": false, "src": "2662:9:14", @@ -1968,7 +1968,7 @@ }, { "_length": { - "declaration": 1984, + "declaration": 2010, "isOffset": false, "isSlot": false, "src": "2673:7:14", @@ -1977,7 +1977,7 @@ }, { "_length": { - "declaration": 1984, + "declaration": 2010, "isOffset": false, "isSlot": false, "src": "2186:7:14", @@ -1986,7 +1986,7 @@ }, { "_bytes": { - "declaration": 1980, + "declaration": 2006, "isOffset": false, "isSlot": false, "src": "2387:6:14", @@ -1995,7 +1995,7 @@ }, { "_start": { - "declaration": 1982, + "declaration": 2008, "isOffset": false, "isSlot": false, "src": "2438:6:14", @@ -2004,7 +2004,7 @@ }, { "tempBytes": { - "declaration": 2001, + "declaration": 2027, "isOffset": false, "isSlot": false, "src": "3004:9:14", @@ -2013,7 +2013,7 @@ }, { "tempBytes": { - "declaration": 2001, + "declaration": 2027, "isOffset": false, "isSlot": false, "src": "3063:9:14", @@ -2021,7 +2021,7 @@ } } ], - "id": 2003, + "id": 2029, "nodeType": "InlineAssembly", "operations": "{\n switch iszero(_length)\n case 0 {\n tempBytes := mload(0x40)\n let lengthmod := and(_length, 31)\n let mc := add(add(tempBytes, lengthmod), mul(0x20, iszero(lengthmod)))\n let end := add(mc, _length)\n for {\n let cc := add(add(add(_bytes, lengthmod), mul(0x20, iszero(lengthmod))), _start)\n }\n lt(mc, end)\n {\n mc := add(mc, 0x20)\n cc := add(cc, 0x20)\n }\n { mstore(mc, mload(cc)) }\n mstore(tempBytes, _length)\n mstore(0x40, and(add(mc, 31), not(31)))\n }\n default {\n tempBytes := mload(0x40)\n mstore(0x40, add(tempBytes, 0x20))\n }\n}", "src": "857:2247:14" @@ -2029,41 +2029,41 @@ { "expression": { "argumentTypes": null, - "id": 2004, + "id": 2030, "name": "tempBytes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2001, + "referencedDeclaration": 2027, "src": "3121:9:14", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "functionReturnParameters": 1988, - "id": 2005, + "functionReturnParameters": 2014, + "id": 2031, "nodeType": "Return", "src": "3114:16:14" } ] }, "documentation": null, - "id": 2007, + "id": 2033, "implemented": true, "kind": "function", "modifiers": [], "name": "slice", "nodeType": "FunctionDefinition", "parameters": { - "id": 1985, + "id": 2011, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1980, + "id": 2006, "name": "_bytes", "nodeType": "VariableDeclaration", - "scope": 2007, + "scope": 2033, "src": "591:19:14", "stateVariable": false, "storageLocation": "memory", @@ -2072,7 +2072,7 @@ "typeString": "bytes" }, "typeName": { - "id": 1979, + "id": 2005, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "591:5:14", @@ -2086,10 +2086,10 @@ }, { "constant": false, - "id": 1982, + "id": 2008, "name": "_start", "nodeType": "VariableDeclaration", - "scope": 2007, + "scope": 2033, "src": "620:14:14", "stateVariable": false, "storageLocation": "default", @@ -2098,7 +2098,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1981, + "id": 2007, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "620:7:14", @@ -2112,10 +2112,10 @@ }, { "constant": false, - "id": 1984, + "id": 2010, "name": "_length", "nodeType": "VariableDeclaration", - "scope": 2007, + "scope": 2033, "src": "644:15:14", "stateVariable": false, "storageLocation": "default", @@ -2124,7 +2124,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1983, + "id": 2009, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "644:7:14", @@ -2140,15 +2140,15 @@ "src": "581:84:14" }, "returnParameters": { - "id": 1988, + "id": 2014, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1987, + "id": 2013, "name": "", "nodeType": "VariableDeclaration", - "scope": 2007, + "scope": 2033, "src": "713:12:14", "stateVariable": false, "storageLocation": "memory", @@ -2157,7 +2157,7 @@ "typeString": "bytes" }, "typeName": { - "id": 1986, + "id": 2012, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "713:5:14", @@ -2172,7 +2172,7 @@ ], "src": "712:14:14" }, - "scope": 2035, + "scope": 2061, "src": "567:2570:14", "stateMutability": "pure", "superFunction": null, @@ -2180,7 +2180,7 @@ }, { "body": { - "id": 2033, + "id": 2059, "nodeType": "Block", "src": "3236:265:14", "statements": [ @@ -2194,7 +2194,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2023, + "id": 2049, "isConstant": false, "isLValue": false, "isPure": false, @@ -2203,18 +2203,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2017, + "id": 2043, "name": "_bytes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2009, + "referencedDeclaration": 2035, "src": "3254:6:14", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "id": 2018, + "id": 2044, "isConstant": false, "isLValue": false, "isPure": false, @@ -2239,18 +2239,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2021, + "id": 2047, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2019, + "id": 2045, "name": "_start", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2011, + "referencedDeclaration": 2037, "src": "3272:6:14", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2262,7 +2262,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3230", - "id": 2020, + "id": 2046, "isConstant": false, "isLValue": false, "isPure": true, @@ -2284,7 +2284,7 @@ } } ], - "id": 2022, + "id": 2048, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -2306,7 +2306,7 @@ { "argumentTypes": null, "hexValue": "52656164206f7574206f6620626f756e6473", - "id": 2024, + "id": 2050, "isConstant": false, "isLValue": false, "isPure": true, @@ -2333,21 +2333,21 @@ "typeString": "literal_string \"Read out of bounds\"" } ], - "id": 2016, + "id": 2042, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3246:7:14", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2025, + "id": 2051, "isConstant": false, "isLValue": false, "isPure": false, @@ -2361,21 +2361,21 @@ "typeString": "tuple()" } }, - "id": 2026, + "id": 2052, "nodeType": "ExpressionStatement", "src": "3246:61:14" }, { "assignments": [ - 2028 + 2054 ], "declarations": [ { "constant": false, - "id": 2028, + "id": 2054, "name": "tempAddress", "nodeType": "VariableDeclaration", - "scope": 2033, + "scope": 2059, "src": "3317:19:14", "stateVariable": false, "storageLocation": "default", @@ -2384,7 +2384,7 @@ "typeString": "address" }, "typeName": { - "id": 2027, + "id": 2053, "name": "address", "nodeType": "ElementaryTypeName", "src": "3317:7:14", @@ -2398,7 +2398,7 @@ "visibility": "internal" } ], - "id": 2029, + "id": 2055, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "3317:19:14" @@ -2407,7 +2407,7 @@ "externalReferences": [ { "tempAddress": { - "declaration": 2028, + "declaration": 2054, "isOffset": false, "isSlot": false, "src": "3370:11:14", @@ -2416,7 +2416,7 @@ }, { "_bytes": { - "declaration": 2009, + "declaration": 2035, "isOffset": false, "isSlot": false, "src": "3403:6:14", @@ -2425,7 +2425,7 @@ }, { "_start": { - "declaration": 2011, + "declaration": 2037, "isOffset": false, "isSlot": false, "src": "3418:6:14", @@ -2433,7 +2433,7 @@ } } ], - "id": 2030, + "id": 2056, "nodeType": "InlineAssembly", "operations": "{\n tempAddress := div(mload(add(add(_bytes, 0x20), _start)), 0x1000000000000000000000000)\n}", "src": "3347:119:14" @@ -2441,41 +2441,41 @@ { "expression": { "argumentTypes": null, - "id": 2031, + "id": 2057, "name": "tempAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2028, + "referencedDeclaration": 2054, "src": "3483:11:14", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "functionReturnParameters": 2015, - "id": 2032, + "functionReturnParameters": 2041, + "id": 2058, "nodeType": "Return", "src": "3476:18:14" } ] }, "documentation": null, - "id": 2034, + "id": 2060, "implemented": true, "kind": "function", "modifiers": [], "name": "bytesToAddress", "nodeType": "FunctionDefinition", "parameters": { - "id": 2012, + "id": 2038, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2009, + "id": 2035, "name": "_bytes", "nodeType": "VariableDeclaration", - "scope": 2034, + "scope": 2060, "src": "3167:19:14", "stateVariable": false, "storageLocation": "memory", @@ -2484,7 +2484,7 @@ "typeString": "bytes" }, "typeName": { - "id": 2008, + "id": 2034, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "3167:5:14", @@ -2498,10 +2498,10 @@ }, { "constant": false, - "id": 2011, + "id": 2037, "name": "_start", "nodeType": "VariableDeclaration", - "scope": 2034, + "scope": 2060, "src": "3188:14:14", "stateVariable": false, "storageLocation": "default", @@ -2510,7 +2510,7 @@ "typeString": "uint256" }, "typeName": { - "id": 2010, + "id": 2036, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3188:7:14", @@ -2526,15 +2526,15 @@ "src": "3166:37:14" }, "returnParameters": { - "id": 2015, + "id": 2041, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2014, + "id": 2040, "name": "", "nodeType": "VariableDeclaration", - "scope": 2034, + "scope": 2060, "src": "3227:7:14", "stateVariable": false, "storageLocation": "default", @@ -2543,7 +2543,7 @@ "typeString": "address" }, "typeName": { - "id": 2013, + "id": 2039, "name": "address", "nodeType": "ElementaryTypeName", "src": "3227:7:14", @@ -2559,14 +2559,14 @@ ], "src": "3226:9:14" }, - "scope": 2035, + "scope": 2061, "src": "3143:358:14", "stateMutability": "pure", "superFunction": null, "visibility": "internal" } ], - "scope": 2036, + "scope": 2062, "src": "144:3359:14" } ], @@ -2578,7 +2578,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.479Z", + "updatedAt": "2020-04-08T12:21:13.699Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/Common.json b/packages/smart-contracts/artifacts/Common.json index 8cbb251..bcea97f 100644 --- a/packages/smart-contracts/artifacts/Common.json +++ b/packages/smart-contracts/artifacts/Common.json @@ -38,35 +38,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -78,9 +78,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -92,9 +92,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -102,22 +102,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -126,7 +126,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -141,10 +141,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -153,7 +153,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -169,12 +169,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -183,22 +183,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -207,7 +207,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -222,10 +222,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -234,7 +234,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -250,12 +250,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -264,22 +264,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -288,7 +288,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -303,10 +303,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -315,7 +315,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -330,10 +330,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -342,7 +342,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -358,12 +358,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -372,25 +372,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -399,22 +399,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -423,7 +423,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -439,19 +439,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -460,9 +460,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -470,22 +470,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -494,7 +494,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -509,10 +509,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -521,7 +521,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -535,10 +535,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -547,7 +547,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -564,15 +564,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -581,7 +581,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -596,7 +596,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -605,22 +605,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -629,7 +629,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -645,15 +645,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -662,7 +662,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -677,7 +677,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -686,22 +686,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -710,7 +710,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -726,15 +726,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -743,7 +743,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -759,7 +759,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -768,22 +768,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -792,7 +792,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -808,15 +808,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -825,7 +825,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -841,7 +841,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -850,28 +850,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -880,7 +880,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -896,7 +896,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -905,22 +905,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -929,7 +929,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -943,10 +943,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -955,7 +955,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -972,15 +972,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -989,7 +989,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -1004,7 +1004,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1013,22 +1013,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -1037,7 +1037,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -1051,10 +1051,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -1063,7 +1063,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -1080,12 +1080,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1094,22 +1094,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -1118,7 +1118,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -1132,10 +1132,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -1144,7 +1144,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -1159,10 +1159,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -1171,7 +1171,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -1187,12 +1187,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1201,22 +1201,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -1225,7 +1225,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -1240,10 +1240,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -1252,7 +1252,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -1268,12 +1268,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1282,22 +1282,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -1306,7 +1306,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -1320,10 +1320,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -1332,7 +1332,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -1346,10 +1346,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -1358,7 +1358,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -1374,12 +1374,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1388,22 +1388,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -1412,7 +1412,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -1426,10 +1426,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -1438,7 +1438,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -1453,10 +1453,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -1465,7 +1465,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -1481,12 +1481,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1495,22 +1495,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -1519,7 +1519,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -1533,10 +1533,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -1545,7 +1545,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -1560,10 +1560,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -1572,7 +1572,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -1588,12 +1588,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1602,22 +1602,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -1626,7 +1626,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -1641,10 +1641,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -1653,7 +1653,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -1667,10 +1667,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -1679,7 +1679,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -1694,10 +1694,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -1706,7 +1706,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -1722,12 +1722,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1736,22 +1736,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -1760,7 +1760,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -1774,10 +1774,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -1786,7 +1786,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -1803,12 +1803,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1817,22 +1817,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -1841,7 +1841,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -1856,10 +1856,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -1868,7 +1868,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -1884,12 +1884,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1898,22 +1898,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -1922,7 +1922,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -1936,10 +1936,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -1948,7 +1948,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -1964,19 +1964,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -1985,9 +1985,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -1995,22 +1995,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -2019,7 +2019,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -2034,10 +2034,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -2046,7 +2046,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -2063,15 +2063,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -2080,7 +2080,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -2095,7 +2095,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -2104,22 +2104,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -2128,7 +2128,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -2144,15 +2144,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -2161,7 +2161,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -2175,10 +2175,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -2187,7 +2187,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -2201,10 +2201,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -2213,7 +2213,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -2227,10 +2227,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -2239,7 +2239,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -2253,10 +2253,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -2265,7 +2265,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -2280,7 +2280,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -2289,22 +2289,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -2313,7 +2313,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -2330,15 +2330,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -2347,7 +2347,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -2362,7 +2362,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -2371,22 +2371,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -2395,7 +2395,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -2409,10 +2409,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -2421,7 +2421,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -2438,15 +2438,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -2455,7 +2455,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -2469,10 +2469,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -2481,7 +2481,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -2496,7 +2496,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -2505,22 +2505,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -2529,7 +2529,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -2543,10 +2543,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -2555,7 +2555,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -2570,10 +2570,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -2582,7 +2582,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -2597,10 +2597,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -2609,7 +2609,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -2624,10 +2624,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -2636,7 +2636,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -2650,10 +2650,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -2662,7 +2662,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -2678,12 +2678,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2692,22 +2692,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -2716,7 +2716,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -2733,12 +2733,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2747,22 +2747,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -2771,7 +2771,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -2786,10 +2786,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -2798,7 +2798,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -2813,10 +2813,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -2825,7 +2825,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -2841,19 +2841,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -2862,9 +2862,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -2872,28 +2872,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -2902,7 +2902,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -2917,7 +2917,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2926,44 +2926,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -2973,7 +2973,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2982,22 +2982,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -3006,7 +3006,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -3021,10 +3021,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -3033,7 +3033,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -3049,12 +3049,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -3063,22 +3063,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -3087,7 +3087,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -3102,10 +3102,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -3114,7 +3114,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -3130,19 +3130,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -3151,9 +3151,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -3161,44 +3161,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -3208,7 +3208,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3217,44 +3217,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3264,7 +3264,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3273,22 +3273,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -3297,7 +3297,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -3312,10 +3312,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -3324,7 +3324,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -3340,12 +3340,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -3354,22 +3354,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -3378,7 +3378,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -3393,10 +3393,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -3405,7 +3405,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -3421,19 +3421,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -3442,9 +3442,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -3452,22 +3452,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -3476,7 +3476,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -3492,15 +3492,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -3509,7 +3509,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -3524,14 +3524,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -3540,19 +3540,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -3561,7 +3561,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -3576,7 +3576,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -3584,7 +3584,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -3604,7 +3604,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -3629,7 +3629,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -3643,7 +3643,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -3654,18 +3654,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3677,7 +3677,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -3706,7 +3706,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -3717,7 +3717,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -3727,18 +3727,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3753,18 +3753,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3775,11 +3775,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3799,7 +3799,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -3816,11 +3816,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3837,11 +3837,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3863,7 +3863,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -3890,21 +3890,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -3918,29 +3918,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -3949,7 +3949,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -3963,10 +3963,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -3975,7 +3975,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -3991,15 +3991,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -4008,7 +4008,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -4023,7 +4023,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -4031,7 +4031,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -4041,11 +4041,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4054,11 +4054,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4087,11 +4087,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4106,18 +4106,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -4127,25 +4127,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -4155,25 +4155,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -4187,7 +4187,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -4197,11 +4197,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4210,11 +4210,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4238,11 +4238,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4257,18 +4257,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -4278,25 +4278,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -4310,29 +4310,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -4341,7 +4341,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -4356,10 +4356,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -4368,7 +4368,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -4383,10 +4383,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -4395,7 +4395,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -4411,19 +4411,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -4432,38 +4432,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -4477,7 +4477,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -4487,18 +4487,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4513,18 +4513,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4535,11 +4535,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4559,7 +4559,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4576,11 +4576,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4596,7 +4596,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -4623,21 +4623,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -4651,29 +4651,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -4682,7 +4682,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -4696,10 +4696,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -4708,7 +4708,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -4724,15 +4724,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -4741,7 +4741,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -4756,7 +4756,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -4764,25 +4764,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -4796,11 +4796,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4815,7 +4815,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -4828,7 +4828,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -4848,7 +4848,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -4862,18 +4862,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -4885,7 +4885,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -4909,7 +4909,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -4936,21 +4936,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -4964,29 +4964,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -4995,7 +4995,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -5011,15 +5011,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -5028,7 +5028,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -5043,7 +5043,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -5051,25 +5051,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5083,11 +5083,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5100,7 +5100,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -5108,7 +5108,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -5128,7 +5128,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -5161,18 +5161,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -5192,29 +5192,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -5223,7 +5223,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -5239,15 +5239,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -5256,7 +5256,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -5271,7 +5271,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -5279,25 +5279,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5311,11 +5311,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5328,7 +5328,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -5336,7 +5336,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -5362,7 +5362,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -5370,7 +5370,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -5397,11 +5397,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5416,18 +5416,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -5437,25 +5437,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -5476,7 +5476,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5507,18 +5507,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -5538,29 +5538,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -5569,7 +5569,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -5584,10 +5584,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -5596,7 +5596,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -5612,15 +5612,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -5629,7 +5629,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -5644,7 +5644,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -5652,25 +5652,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5685,18 +5685,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5714,7 +5714,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -5722,7 +5722,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -5748,7 +5748,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -5756,7 +5756,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -5783,11 +5783,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5802,18 +5802,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -5823,25 +5823,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -5862,7 +5862,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5882,7 +5882,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5907,29 +5907,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -5938,7 +5938,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -5953,10 +5953,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -5965,7 +5965,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -5981,15 +5981,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -5998,7 +5998,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -6013,7 +6013,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -6021,21 +6021,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -6044,7 +6044,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -6057,17 +6057,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6087,11 +6087,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6106,18 +6106,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -6127,25 +6127,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -6164,15 +6164,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -6181,7 +6181,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -6194,17 +6194,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6224,11 +6224,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6243,18 +6243,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -6264,25 +6264,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -6306,18 +6306,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6331,11 +6331,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6344,11 +6344,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6367,18 +6367,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -6399,29 +6399,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6439,7 +6439,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -6452,11 +6452,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6465,11 +6465,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6488,18 +6488,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -6515,11 +6515,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6538,18 +6538,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -6567,11 +6567,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6592,18 +6592,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -6623,25 +6623,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6658,7 +6658,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -6671,11 +6671,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6690,7 +6690,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -6703,7 +6703,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -6719,11 +6719,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6742,18 +6742,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -6774,11 +6774,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6787,11 +6787,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6810,18 +6810,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -6843,18 +6843,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -6867,18 +6867,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6890,7 +6890,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -6922,7 +6922,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -6932,22 +6932,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -6956,7 +6956,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -6971,10 +6971,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -6983,7 +6983,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -6998,10 +6998,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -7010,7 +7010,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -7025,10 +7025,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -7037,7 +7037,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -7051,10 +7051,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -7063,7 +7063,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -7079,15 +7079,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -7096,7 +7096,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -7111,7 +7111,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -7119,14 +7119,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -7135,10 +7135,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -7147,7 +7147,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -7163,17 +7163,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7193,11 +7193,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7212,18 +7212,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -7233,25 +7233,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -7271,16 +7271,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -7289,7 +7289,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -7302,17 +7302,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7321,11 +7321,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7349,11 +7349,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7368,18 +7368,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -7389,25 +7389,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -7426,15 +7426,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -7443,7 +7443,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -7456,17 +7456,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7486,11 +7486,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7505,18 +7505,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -7526,25 +7526,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -7563,15 +7563,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -7580,7 +7580,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -7593,7 +7593,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7602,11 +7602,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7615,11 +7615,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7638,18 +7638,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -7665,11 +7665,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7688,18 +7688,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -7719,18 +7719,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7745,18 +7745,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7767,11 +7767,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7790,25 +7790,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7825,7 +7825,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -7835,11 +7835,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7848,11 +7848,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7871,18 +7871,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -7900,11 +7900,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7919,18 +7919,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -7943,18 +7943,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7966,7 +7966,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -7998,29 +7998,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -8029,7 +8029,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -8044,10 +8044,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -8056,7 +8056,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -8071,10 +8071,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -8083,7 +8083,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -8098,10 +8098,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -8110,7 +8110,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -8126,15 +8126,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -8143,7 +8143,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -8158,7 +8158,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -8166,25 +8166,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8198,11 +8198,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -8211,11 +8211,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8239,11 +8239,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8258,18 +8258,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -8279,25 +8279,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -8317,29 +8317,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -8348,7 +8348,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -8363,10 +8363,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -8375,7 +8375,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -8389,10 +8389,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -8401,7 +8401,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -8418,15 +8418,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -8435,7 +8435,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -8450,7 +8450,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8458,7 +8458,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -8468,11 +8468,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8481,11 +8481,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8509,11 +8509,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8528,18 +8528,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -8549,25 +8549,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -8581,29 +8581,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -8612,7 +8612,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -8627,10 +8627,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -8639,7 +8639,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -8653,10 +8653,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -8665,7 +8665,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -8682,12 +8682,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8695,7 +8695,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -8705,11 +8705,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8718,11 +8718,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8731,11 +8731,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8763,11 +8763,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8782,18 +8782,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -8803,25 +8803,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -8835,29 +8835,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -8866,7 +8866,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -8881,10 +8881,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -8893,7 +8893,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -8907,10 +8907,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -8919,7 +8919,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -8934,10 +8934,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -8946,7 +8946,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -8962,12 +8962,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8975,7 +8975,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -8985,11 +8985,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8998,11 +8998,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9011,11 +9011,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9043,11 +9043,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9062,18 +9062,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -9083,25 +9083,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -9115,29 +9115,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -9146,7 +9146,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -9161,10 +9161,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -9173,7 +9173,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -9187,10 +9187,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -9199,7 +9199,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -9214,10 +9214,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -9226,7 +9226,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -9242,12 +9242,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9255,7 +9255,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -9265,11 +9265,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9278,11 +9278,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9291,11 +9291,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9323,11 +9323,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9342,18 +9342,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -9363,25 +9363,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -9395,29 +9395,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -9426,7 +9426,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -9441,10 +9441,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -9453,7 +9453,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -9467,10 +9467,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -9479,7 +9479,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -9493,10 +9493,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -9505,7 +9505,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -9521,12 +9521,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9534,21 +9534,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -9557,7 +9557,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -9571,7 +9571,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -9582,11 +9582,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9601,18 +9601,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -9622,25 +9622,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -9659,15 +9659,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -9676,7 +9676,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -9690,17 +9690,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9720,11 +9720,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9739,18 +9739,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -9760,25 +9760,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -9797,15 +9797,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -9814,7 +9814,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -9827,17 +9827,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9857,11 +9857,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9876,18 +9876,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -9897,25 +9897,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -9935,16 +9935,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -9953,7 +9953,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -9966,17 +9966,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -9985,11 +9985,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10013,11 +10013,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10032,18 +10032,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -10053,25 +10053,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -10094,11 +10094,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10107,11 +10107,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10123,11 +10123,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10136,11 +10136,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10149,11 +10149,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10162,11 +10162,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10193,18 +10193,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -10234,18 +10234,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -10259,7 +10259,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -10269,11 +10269,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10282,11 +10282,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10295,7 +10295,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -10309,11 +10309,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10328,18 +10328,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -10360,7 +10360,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -10374,11 +10374,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10393,7 +10393,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -10406,7 +10406,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -10445,18 +10445,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -10470,7 +10470,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -10480,11 +10480,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10493,11 +10493,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10509,14 +10509,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10524,11 +10524,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -10541,7 +10541,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -10557,11 +10557,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10588,18 +10588,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -10613,7 +10613,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -10626,14 +10626,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10641,11 +10641,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -10658,7 +10658,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -10674,11 +10674,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10702,11 +10702,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10721,18 +10721,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -10742,25 +10742,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -10774,7 +10774,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -10784,11 +10784,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10813,11 +10813,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10832,18 +10832,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -10853,25 +10853,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -10881,25 +10881,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -10913,29 +10913,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -10944,7 +10944,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -10959,10 +10959,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -10971,7 +10971,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -10986,10 +10986,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -10998,7 +10998,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -11013,10 +11013,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -11025,7 +11025,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -11039,10 +11039,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -11051,7 +11051,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -11067,12 +11067,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -11080,21 +11080,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -11103,7 +11103,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -11117,7 +11117,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -11128,11 +11128,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11147,18 +11147,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -11168,25 +11168,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -11205,15 +11205,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -11222,7 +11222,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -11236,17 +11236,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11266,11 +11266,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11285,18 +11285,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -11306,25 +11306,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -11343,15 +11343,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -11360,7 +11360,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -11373,17 +11373,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11403,11 +11403,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11422,18 +11422,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -11443,25 +11443,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -11481,16 +11481,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -11499,7 +11499,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -11512,17 +11512,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11531,11 +11531,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11559,11 +11559,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11578,18 +11578,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -11599,25 +11599,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -11640,11 +11640,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11653,11 +11653,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11669,11 +11669,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11682,11 +11682,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11695,11 +11695,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11708,11 +11708,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11739,18 +11739,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -11780,18 +11780,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -11805,21 +11805,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -11828,7 +11828,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -11841,17 +11841,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11860,11 +11860,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11883,18 +11883,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -11917,11 +11917,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11930,11 +11930,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11943,7 +11943,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -11957,11 +11957,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11976,18 +11976,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -12008,7 +12008,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -12022,11 +12022,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12041,7 +12041,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -12054,7 +12054,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -12093,18 +12093,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -12118,7 +12118,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -12128,11 +12128,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12141,11 +12141,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12157,14 +12157,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12172,11 +12172,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -12189,7 +12189,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -12205,11 +12205,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12236,18 +12236,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -12261,7 +12261,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -12274,14 +12274,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12289,11 +12289,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -12306,7 +12306,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -12322,11 +12322,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12350,11 +12350,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12369,18 +12369,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -12390,25 +12390,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -12422,29 +12422,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -12453,7 +12453,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -12468,10 +12468,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -12480,7 +12480,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -12495,10 +12495,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -12507,7 +12507,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -12522,10 +12522,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -12534,7 +12534,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -12548,10 +12548,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -12560,7 +12560,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -12576,19 +12576,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -12598,35 +12598,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -12638,9 +12638,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -12652,9 +12652,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -12662,22 +12662,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -12686,7 +12686,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -12701,10 +12701,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -12713,7 +12713,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -12729,12 +12729,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12743,22 +12743,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -12767,7 +12767,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -12782,10 +12782,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -12794,7 +12794,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -12810,12 +12810,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12824,22 +12824,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -12848,7 +12848,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -12863,10 +12863,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -12875,7 +12875,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -12890,10 +12890,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -12902,7 +12902,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -12918,12 +12918,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12932,25 +12932,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -12959,22 +12959,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -12983,7 +12983,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -12999,19 +12999,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -13020,9 +13020,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -13030,22 +13030,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -13054,7 +13054,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -13069,10 +13069,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -13081,7 +13081,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -13095,10 +13095,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -13107,7 +13107,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -13124,15 +13124,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -13141,7 +13141,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -13156,7 +13156,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -13165,22 +13165,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -13189,7 +13189,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -13205,15 +13205,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -13222,7 +13222,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -13237,7 +13237,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -13246,22 +13246,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -13270,7 +13270,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -13286,15 +13286,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -13303,7 +13303,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -13319,7 +13319,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -13328,22 +13328,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -13352,7 +13352,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -13368,15 +13368,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -13385,7 +13385,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -13401,7 +13401,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -13410,28 +13410,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -13440,7 +13440,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -13456,7 +13456,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -13465,22 +13465,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -13489,7 +13489,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -13503,10 +13503,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -13515,7 +13515,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -13532,15 +13532,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -13549,7 +13549,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -13564,7 +13564,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13573,22 +13573,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -13597,7 +13597,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -13611,10 +13611,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -13623,7 +13623,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -13640,12 +13640,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13654,22 +13654,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -13678,7 +13678,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -13692,10 +13692,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -13704,7 +13704,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -13719,10 +13719,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -13731,7 +13731,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -13747,12 +13747,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13761,22 +13761,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -13785,7 +13785,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -13800,10 +13800,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -13812,7 +13812,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -13828,12 +13828,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13842,22 +13842,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -13866,7 +13866,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -13880,10 +13880,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -13892,7 +13892,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -13906,10 +13906,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -13918,7 +13918,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -13934,12 +13934,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13948,22 +13948,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -13972,7 +13972,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -13986,10 +13986,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -13998,7 +13998,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -14013,10 +14013,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -14025,7 +14025,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -14041,12 +14041,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14055,22 +14055,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -14079,7 +14079,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -14093,10 +14093,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -14105,7 +14105,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -14120,10 +14120,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -14132,7 +14132,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -14148,12 +14148,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14162,22 +14162,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -14186,7 +14186,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -14201,10 +14201,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -14213,7 +14213,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -14227,10 +14227,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -14239,7 +14239,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -14254,10 +14254,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -14266,7 +14266,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -14282,12 +14282,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14296,22 +14296,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -14320,7 +14320,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -14334,10 +14334,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -14346,7 +14346,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -14363,12 +14363,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14377,22 +14377,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -14401,7 +14401,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -14416,10 +14416,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -14428,7 +14428,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -14444,12 +14444,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14458,22 +14458,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -14482,7 +14482,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -14496,10 +14496,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -14508,7 +14508,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -14524,19 +14524,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -14545,9 +14545,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -14555,22 +14555,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -14579,7 +14579,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -14594,10 +14594,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -14606,7 +14606,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -14623,15 +14623,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -14640,7 +14640,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -14655,7 +14655,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -14664,22 +14664,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -14688,7 +14688,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -14704,15 +14704,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -14721,7 +14721,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -14735,10 +14735,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -14747,7 +14747,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -14761,10 +14761,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -14773,7 +14773,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -14787,10 +14787,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -14799,7 +14799,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -14813,10 +14813,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -14825,7 +14825,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -14840,7 +14840,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -14849,22 +14849,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -14873,7 +14873,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -14890,15 +14890,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -14907,7 +14907,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -14922,7 +14922,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -14931,22 +14931,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -14955,7 +14955,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -14969,10 +14969,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -14981,7 +14981,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -14998,15 +14998,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -15015,7 +15015,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -15029,10 +15029,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -15041,7 +15041,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -15056,7 +15056,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -15065,22 +15065,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -15089,7 +15089,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -15103,10 +15103,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -15115,7 +15115,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -15130,10 +15130,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -15142,7 +15142,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -15157,10 +15157,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -15169,7 +15169,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -15184,10 +15184,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -15196,7 +15196,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -15210,10 +15210,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -15222,7 +15222,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -15238,12 +15238,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15252,22 +15252,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -15276,7 +15276,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -15293,12 +15293,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15307,22 +15307,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -15331,7 +15331,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -15346,10 +15346,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -15358,7 +15358,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -15373,10 +15373,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -15385,7 +15385,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -15401,19 +15401,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -15422,9 +15422,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -15432,28 +15432,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -15462,7 +15462,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -15477,7 +15477,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15486,44 +15486,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15533,7 +15533,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15542,22 +15542,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -15566,7 +15566,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -15581,10 +15581,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -15593,7 +15593,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -15609,12 +15609,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -15623,22 +15623,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -15647,7 +15647,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -15662,10 +15662,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -15674,7 +15674,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -15690,19 +15690,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -15711,9 +15711,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -15721,44 +15721,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -15768,7 +15768,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15777,44 +15777,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15824,7 +15824,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15833,22 +15833,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -15857,7 +15857,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -15872,10 +15872,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -15884,7 +15884,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -15900,12 +15900,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -15914,22 +15914,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -15938,7 +15938,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -15953,10 +15953,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -15965,7 +15965,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -15981,19 +15981,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -16002,9 +16002,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -16012,22 +16012,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -16036,7 +16036,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -16052,15 +16052,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -16069,7 +16069,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -16084,14 +16084,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -16100,19 +16100,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -16121,7 +16121,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -16136,7 +16136,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -16144,7 +16144,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -16164,7 +16164,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -16189,7 +16189,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -16203,7 +16203,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -16214,18 +16214,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16237,7 +16237,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -16266,7 +16266,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -16277,7 +16277,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -16287,18 +16287,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16313,18 +16313,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16335,11 +16335,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16359,7 +16359,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -16376,11 +16376,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16397,11 +16397,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16423,7 +16423,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -16450,21 +16450,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -16478,29 +16478,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -16509,7 +16509,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -16523,10 +16523,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -16535,7 +16535,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -16551,15 +16551,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -16568,7 +16568,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -16583,7 +16583,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -16591,7 +16591,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -16601,11 +16601,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16614,11 +16614,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16647,11 +16647,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16666,18 +16666,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -16687,25 +16687,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -16715,25 +16715,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -16747,7 +16747,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -16757,11 +16757,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16770,11 +16770,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16798,11 +16798,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16817,18 +16817,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -16838,25 +16838,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -16870,29 +16870,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -16901,7 +16901,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -16916,10 +16916,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -16928,7 +16928,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -16943,10 +16943,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -16955,7 +16955,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -16971,19 +16971,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -16992,38 +16992,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -17037,7 +17037,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -17047,18 +17047,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17073,18 +17073,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17095,11 +17095,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17119,7 +17119,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -17136,11 +17136,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17156,7 +17156,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -17183,21 +17183,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -17211,29 +17211,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -17242,7 +17242,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -17256,10 +17256,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -17268,7 +17268,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -17284,15 +17284,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -17301,7 +17301,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -17316,7 +17316,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -17324,25 +17324,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17356,11 +17356,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17375,7 +17375,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -17388,7 +17388,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -17408,7 +17408,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -17422,18 +17422,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17445,7 +17445,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -17469,7 +17469,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -17496,21 +17496,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -17524,29 +17524,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -17555,7 +17555,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -17571,15 +17571,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -17588,7 +17588,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -17603,7 +17603,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -17611,25 +17611,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17643,11 +17643,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17660,7 +17660,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -17668,7 +17668,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -17688,7 +17688,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -17721,18 +17721,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -17752,29 +17752,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -17783,7 +17783,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -17799,15 +17799,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -17816,7 +17816,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -17831,7 +17831,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -17839,25 +17839,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17871,11 +17871,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17888,7 +17888,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -17896,7 +17896,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -17922,7 +17922,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -17930,7 +17930,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -17957,11 +17957,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -17976,18 +17976,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -17997,25 +17997,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -18036,7 +18036,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18067,18 +18067,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -18098,29 +18098,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -18129,7 +18129,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -18144,10 +18144,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -18156,7 +18156,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -18172,15 +18172,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -18189,7 +18189,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -18204,7 +18204,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18212,25 +18212,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18245,18 +18245,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18274,7 +18274,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -18282,7 +18282,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -18308,7 +18308,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -18316,7 +18316,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -18343,11 +18343,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18362,18 +18362,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -18383,25 +18383,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -18422,7 +18422,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18442,7 +18442,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18467,29 +18467,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -18498,7 +18498,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -18513,10 +18513,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -18525,7 +18525,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -18541,15 +18541,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -18558,7 +18558,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -18573,7 +18573,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18581,21 +18581,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -18604,7 +18604,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -18617,17 +18617,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -18647,11 +18647,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18666,18 +18666,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -18687,25 +18687,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -18724,15 +18724,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -18741,7 +18741,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -18754,17 +18754,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18784,11 +18784,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18803,18 +18803,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -18824,25 +18824,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -18866,18 +18866,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18891,11 +18891,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18904,11 +18904,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18927,18 +18927,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -18959,29 +18959,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -18999,7 +18999,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -19012,11 +19012,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19025,11 +19025,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19048,18 +19048,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -19075,11 +19075,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19098,18 +19098,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -19127,11 +19127,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19152,18 +19152,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -19183,25 +19183,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19218,7 +19218,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -19231,11 +19231,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19250,7 +19250,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -19263,7 +19263,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -19279,11 +19279,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19302,18 +19302,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -19334,11 +19334,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19347,11 +19347,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19370,18 +19370,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -19403,18 +19403,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -19427,18 +19427,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19450,7 +19450,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -19482,7 +19482,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -19492,22 +19492,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -19516,7 +19516,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -19531,10 +19531,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -19543,7 +19543,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -19558,10 +19558,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -19570,7 +19570,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -19585,10 +19585,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -19597,7 +19597,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -19611,10 +19611,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -19623,7 +19623,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -19639,15 +19639,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -19656,7 +19656,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -19671,7 +19671,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -19679,14 +19679,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -19695,10 +19695,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -19707,7 +19707,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -19723,17 +19723,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -19753,11 +19753,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19772,18 +19772,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -19793,25 +19793,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -19831,16 +19831,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -19849,7 +19849,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -19862,17 +19862,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -19881,11 +19881,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19909,11 +19909,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19928,18 +19928,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -19949,25 +19949,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -19986,15 +19986,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -20003,7 +20003,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -20016,17 +20016,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20046,11 +20046,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20065,18 +20065,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -20086,25 +20086,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -20123,15 +20123,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -20140,7 +20140,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -20153,7 +20153,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -20162,11 +20162,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20175,11 +20175,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20198,18 +20198,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -20225,11 +20225,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20248,18 +20248,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -20279,18 +20279,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20305,18 +20305,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20327,11 +20327,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20350,25 +20350,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20385,7 +20385,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -20395,11 +20395,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20408,11 +20408,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20431,18 +20431,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -20460,11 +20460,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20479,18 +20479,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -20503,18 +20503,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20526,7 +20526,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -20558,29 +20558,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -20589,7 +20589,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -20604,10 +20604,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -20616,7 +20616,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -20631,10 +20631,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -20643,7 +20643,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -20658,10 +20658,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -20670,7 +20670,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -20686,15 +20686,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -20703,7 +20703,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -20718,7 +20718,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -20726,25 +20726,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20758,11 +20758,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -20771,11 +20771,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20799,11 +20799,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20818,18 +20818,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -20839,25 +20839,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -20877,29 +20877,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -20908,7 +20908,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -20923,10 +20923,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -20935,7 +20935,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -20949,10 +20949,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -20961,7 +20961,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -20978,15 +20978,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -20995,7 +20995,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -21010,7 +21010,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21018,7 +21018,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -21028,11 +21028,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21041,11 +21041,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21069,11 +21069,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21088,18 +21088,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -21109,25 +21109,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -21141,29 +21141,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -21172,7 +21172,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -21187,10 +21187,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -21199,7 +21199,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -21213,10 +21213,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -21225,7 +21225,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -21242,12 +21242,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21255,7 +21255,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -21265,11 +21265,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21278,11 +21278,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21291,11 +21291,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21323,11 +21323,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21342,18 +21342,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -21363,25 +21363,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -21395,29 +21395,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -21426,7 +21426,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -21441,10 +21441,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -21453,7 +21453,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -21467,10 +21467,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -21479,7 +21479,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -21494,10 +21494,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -21506,7 +21506,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -21522,12 +21522,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21535,7 +21535,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -21545,11 +21545,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21558,11 +21558,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21571,11 +21571,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21603,11 +21603,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21622,18 +21622,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -21643,25 +21643,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -21675,29 +21675,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -21706,7 +21706,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -21721,10 +21721,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -21733,7 +21733,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -21747,10 +21747,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -21759,7 +21759,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -21774,10 +21774,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -21786,7 +21786,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -21802,12 +21802,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21815,7 +21815,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -21825,11 +21825,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21838,11 +21838,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -21851,11 +21851,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -21883,11 +21883,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21902,18 +21902,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -21923,25 +21923,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -21955,29 +21955,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -21986,7 +21986,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -22001,10 +22001,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -22013,7 +22013,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -22027,10 +22027,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -22039,7 +22039,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -22053,10 +22053,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -22065,7 +22065,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -22081,12 +22081,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -22094,21 +22094,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -22117,7 +22117,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -22131,7 +22131,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -22142,11 +22142,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22161,18 +22161,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -22182,25 +22182,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -22219,15 +22219,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -22236,7 +22236,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -22250,17 +22250,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22280,11 +22280,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22299,18 +22299,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -22320,25 +22320,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -22357,15 +22357,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -22374,7 +22374,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -22387,17 +22387,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22417,11 +22417,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22436,18 +22436,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -22457,25 +22457,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -22495,16 +22495,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -22513,7 +22513,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -22526,17 +22526,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22545,11 +22545,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22573,11 +22573,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22592,18 +22592,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -22613,25 +22613,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -22654,11 +22654,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22667,11 +22667,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22683,11 +22683,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22696,11 +22696,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22709,11 +22709,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22722,11 +22722,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22753,18 +22753,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -22794,18 +22794,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -22819,7 +22819,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -22829,11 +22829,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22842,11 +22842,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22855,7 +22855,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -22869,11 +22869,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22888,18 +22888,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -22920,7 +22920,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -22934,11 +22934,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22953,7 +22953,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -22966,7 +22966,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -23005,18 +23005,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -23030,7 +23030,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -23040,11 +23040,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23053,11 +23053,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23069,14 +23069,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23084,11 +23084,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -23101,7 +23101,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -23117,11 +23117,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23148,18 +23148,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -23173,7 +23173,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -23186,14 +23186,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23201,11 +23201,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -23218,7 +23218,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -23234,11 +23234,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23262,11 +23262,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23281,18 +23281,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -23302,25 +23302,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -23334,7 +23334,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -23344,11 +23344,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23373,11 +23373,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23392,18 +23392,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -23413,25 +23413,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -23441,25 +23441,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -23473,29 +23473,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -23504,7 +23504,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -23519,10 +23519,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -23531,7 +23531,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -23546,10 +23546,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -23558,7 +23558,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -23573,10 +23573,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -23585,7 +23585,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -23599,10 +23599,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -23611,7 +23611,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -23627,12 +23627,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -23640,21 +23640,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -23663,7 +23663,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -23677,7 +23677,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -23688,11 +23688,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23707,18 +23707,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -23728,25 +23728,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -23765,15 +23765,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -23782,7 +23782,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -23796,17 +23796,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23826,11 +23826,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23845,18 +23845,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -23866,25 +23866,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -23903,15 +23903,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -23920,7 +23920,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -23933,17 +23933,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23963,11 +23963,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23982,18 +23982,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -24003,25 +24003,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -24041,16 +24041,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -24059,7 +24059,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -24072,17 +24072,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24091,11 +24091,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24119,11 +24119,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24138,18 +24138,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -24159,25 +24159,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -24200,11 +24200,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24213,11 +24213,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24229,11 +24229,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24242,11 +24242,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24255,11 +24255,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24268,11 +24268,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24299,18 +24299,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -24340,18 +24340,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -24365,21 +24365,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -24388,7 +24388,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -24401,17 +24401,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24420,11 +24420,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24443,18 +24443,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -24477,11 +24477,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24490,11 +24490,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24503,7 +24503,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -24517,11 +24517,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24536,18 +24536,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -24568,7 +24568,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -24582,11 +24582,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24601,7 +24601,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -24614,7 +24614,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -24653,18 +24653,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -24678,7 +24678,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -24688,11 +24688,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24701,11 +24701,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24717,14 +24717,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -24732,11 +24732,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -24749,7 +24749,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -24765,11 +24765,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24796,18 +24796,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -24821,7 +24821,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -24834,14 +24834,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -24849,11 +24849,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -24866,7 +24866,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -24882,11 +24882,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24910,11 +24910,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24929,18 +24929,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -24950,25 +24950,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -24982,29 +24982,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -25013,7 +25013,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -25028,10 +25028,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -25040,7 +25040,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -25055,10 +25055,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -25067,7 +25067,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -25082,10 +25082,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -25094,7 +25094,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -25108,10 +25108,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -25120,7 +25120,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -25136,19 +25136,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -25160,7 +25160,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.529Z", + "updatedAt": "2020-04-08T12:21:13.768Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/CompoundBase.json b/packages/smart-contracts/artifacts/CompoundBase.json index 35b20a7..0f4bb71 100644 --- a/packages/smart-contracts/artifacts/CompoundBase.json +++ b/packages/smart-contracts/artifacts/CompoundBase.json @@ -1,6 +1,32 @@ { "contractName": "CompoundBase", "abi": [ + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "cToken", + "type": "address" + }, + { + "internalType": "address", + "name": "owner", + "type": "address" + } + ], + "name": "getBorrowBalanceUnderlying", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, { "constant": false, "inputs": [ @@ -376,25 +402,25 @@ "type": "function" } ], - "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"approveCToken\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"cTokens\",\"type\":\"address[]\"}],\"name\":\"approveCTokens\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"borrow\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"borrowThroughProxy\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"cTokens\",\"type\":\"address[]\"}],\"name\":\"enterMarkets\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"cTokens\",\"type\":\"address[]\"}],\"name\":\"enterMarketsAndApproveCTokens\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"redeemTokens\",\"type\":\"uint256\"}],\"name\":\"redeem\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"redeemThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"redeemTokens\",\"type\":\"uint256\"}],\"name\":\"redeemUnderlying\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"redeemUnderlyingThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowBehalf\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowBehalfThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"supply\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"supplyCToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"supplyAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"borrowCToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"supplyAndBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"supplyETH\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"supplyETHAndBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"supplyThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/compound/CompoundBase.sol\":\"CompoundBase\"},\"evmVersion\":\"constantinople\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol\":{\"keccak256\":\"0xe3762e63e74657a066e6fe281ec694e366ca86f6378470304c646b4e785e09f3\",\"urls\":[\"bzz-raw://67607850cbce7ffa66356dd28412e64ff58f62fa7c709f5fa28306b8be9050a7\",\"dweb:/ipfs/QmUaFhH5a6rQ8yJG2A6zJJ1ds9txqxr8ytxd2s7bhiNX35\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol\":{\"keccak256\":\"0xa65d6eb1f4bae0350a65a2148fc83c6cab8952d11b19c39e4ab5c27d1d48773e\",\"urls\":[\"bzz-raw://84d98fe4bf18381ad57769601c6b53135c0e5ff5f191a62cd129cb5a815efc79\",\"dweb:/ipfs/QmaoXTSmkuT5u2HkEkggYzEE4mBA1MZp5yDrDKWU6Y8jgm\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol\":{\"keccak256\":\"0xd07da3ef9345ec40b090ea93df6d5a9ff7a03996a3c55f51aabee4d50ccdc201\",\"urls\":[\"bzz-raw://21c88532f770e244133c240d448092d8ea0e5a47dcf951522aa66106e15758e3\",\"dweb:/ipfs/QmXFkrbfpgcCFvoziSR3FnptBPf79og2tSR8deQGmViAkg\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol\":{\"keccak256\":\"0xc69ade89655263aaffac1183c0e842ea95294171280f2c5ab755286a66de3ff9\",\"urls\":[\"bzz-raw://742ca904eaf238a83270e315410b35e83048ee0c6529190be2ae9f9bc20e6187\",\"dweb:/ipfs/QmPW3WFbHZjsGQ6vMgPRPWHCNJLNxyEbR4w1DAvd466N51\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/compound/CompoundBase.sol\":{\"keccak256\":\"0xfe69c2a9adaca0cdcfb06df5a2a2d99b5fd2d507e85379d7e412e218c523583a\",\"urls\":[\"bzz-raw://525284cba89cdd1c6b146ec5774e284b6b0af8639cfad96c059e700a9e727ca2\",\"dweb:/ipfs/QmSBBvdmCWkfFscFKWK6oMYL7F4HQ2aZPxJhEX5p3W4ivp\"]}},\"version\":1}", - "bytecode": "0x608060405234801561001057600080fd5b5061161e806100206000396000f3fe6080604052600436106101145760003560e01c806375d40945116100a0578063ba59154f11610064578063ba59154f1461049f578063c2998238146104cb578063d2f70c4014610579578063d882dc6c146105b2578063f2b9fdb8146105de57610114565b806375d409451461039e5780637720cc87146103d8578063962941781461040e5780639a22a1b91461043a578063abdb5ea81461047357610114565b806341ec5cc4116100e757806341ec5cc4146102cf5780634907b8fc146102fb5780634b8a35291461030357806359086a5e1461033c57806367600cc21461037257610114565b80630b4e0630146101195780631e9a6950146101475780632d8af543146101735780633dc4d99a14610221575b600080fd5b6101456004803603604081101561012f57600080fd5b506001600160a01b03813516906020013561060a565b005b6101456004803603604081101561015d57600080fd5b506001600160a01b03813516906020013561074e565b34801561017f57600080fd5b506101456004803603602081101561019657600080fd5b810190602081018135600160201b8111156101b057600080fd5b8201836020820111156101c257600080fd5b803590602001918460208302840111600160201b831117156101e357600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610816945050505050565b34801561022d57600080fd5b506101456004803603602081101561024457600080fd5b810190602081018135600160201b81111561025e57600080fd5b82018360208201111561027057600080fd5b803590602001918460208302840111600160201b8311171561029157600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955061082b945050505050565b610145600480360360408110156102e557600080fd5b506001600160a01b03813516906020013561089e565b6101456108b0565b34801561030f57600080fd5b506101456004803603604081101561032657600080fd5b506001600160a01b03813516906020013561091a565b6101456004803603606081101561035257600080fd5b506001600160a01b038135811691602081013590911690604001356109de565b6101456004803603604081101561038857600080fd5b506001600160a01b038135169060200135610b50565b610145600480360360808110156103b457600080fd5b506001600160a01b0381358116916020810135916040820135169060600135610b65565b610145600480360360608110156103ee57600080fd5b506001600160a01b03813581169160208101359091169060400135610b79565b6101456004803603604081101561042457600080fd5b506001600160a01b038135169060200135610bb4565b34801561044657600080fd5b506101456004803603604081101561045d57600080fd5b506001600160a01b038135169060200135610c62565b6101456004803603604081101561048957600080fd5b506001600160a01b038135169060200135610c6c565b610145600480360360408110156104b557600080fd5b506001600160a01b038135169060200135610db8565b3480156104d757600080fd5b50610145600480360360208110156104ee57600080fd5b810190602081018135600160201b81111561050857600080fd5b82018360208201111561051a57600080fd5b803590602001918460208302840111600160201b8311171561053b57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610df2945050505050565b34801561058557600080fd5b506101456004803603604081101561059c57600080fd5b506001600160a01b038135169060200135610fcc565b610145600480360360408110156105c857600080fd5b506001600160a01b03813516906020013561110b565b610145600480360360408110156105f457600080fd5b506001600160a01b038135169060200135611115565b604080516370a0823160e01b815230600482015290516000916001600160a01b038516916370a0823191602480820192602092909190829003018186803b15801561065457600080fd5b505afa158015610668573d6000803e3d6000fd5b505050506040513d602081101561067e57600080fd5b505190506001600160a01b038316734ddc2d193948926d02f9b1fe9e1daa0718270ed5146106b2576106b233308585611257565b6106bc8383611115565b604080516370a0823160e01b815230600482015290516000916001600160a01b038616916370a0823191602480820192602092909190829003018186803b15801561070657600080fd5b505afa15801561071a573d6000803e3d6000fd5b505050506040513d602081101561073057600080fd5b5051905061074884336107438486611399565b6113ed565b50505050565b816001600160a01b031663db006a75826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b15801561079457600080fd5b505af11580156107a8573d6000803e3d6000fd5b505050506040513d60208110156107be57600080fd5b505115610812576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d63746f6b656e2d72656465656d2d6661696c65640000604482015290519081900360640190fd5b5050565b61081f81610df2565b6108288161082b565b50565b60005b815181101561081257734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b031682828151811061086157fe5b60200260200101516001600160a01b0316146108965761089682828151811061088657fe5b6020026020010151600019610fcc565b60010161082e565b6108a66108b0565b610812828261091a565b734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b346040518263ffffffff1660e01b81526004016000604051808303818588803b1580156108ff57600080fd5b505af1158015610913573d6000803e3d6000fd5b5050505050565b816001600160a01b031663c5ebeaec826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b15801561096057600080fd5b505af1158015610974573d6000803e3d6000fd5b505050506040513d602081101561098a57600080fd5b505115610812576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d63746f6b656e2d626f72726f772d6661696c65640000604482015290519081900360640190fd5b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed51415610a7957816001600160a01b031663e597461982856040518363ffffffff1660e01b815260040180826001600160a01b03166001600160a01b031681526020019150506000604051808303818588803b158015610a5b57600080fd5b505af1158015610a6f573d6000803e3d6000fd5b5050505050610b4b565b610a838282610fcc565b816001600160a01b0316632608f81884836040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b0316815260200182815260200192505050602060405180830381600087803b158015610ae357600080fd5b505af1158015610af7573d6000803e3d6000fd5b505050506040513d6020811015610b0d57600080fd5b505115610b4b5760405162461bcd60e51b81526004018080602001828103825260238152602001806115c76023913960400191505060405180910390fd5b505050565b610b5a8282610bb4565b6108128233836113ed565b610b6f8484611115565b610748828261091a565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514610ba957610ba933308484611257565b610b4b8383836109de565b816001600160a01b031663852a12e3826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b158015610bfa57600080fd5b505af1158015610c0e573d6000803e3d6000fd5b505050506040513d6020811015610c2457600080fd5b5051156108125760405162461bcd60e51b815260040180806020018281038252602981526020018061159e6029913960400191505060405180910390fd5b610b5a828261091a565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed51415610cea57816001600160a01b0316634e4d9fea826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610ccc57600080fd5b505af1158015610ce0573d6000803e3d6000fd5b5050505050610812565b610cf48282610fcc565b816001600160a01b0316630e752702826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b158015610d3a57600080fd5b505af1158015610d4e573d6000803e3d6000fd5b505050506040513d6020811015610d6457600080fd5b505115610812576040805162461bcd60e51b815260206004820152601d60248201527f636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564000000604482015290519081900360640190fd5b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514610de857610de833308484611257565b6108128282610c6c565b604051631853304760e31b8152602060048201818152835160248401528351606093733d9819210a31b4961b30ef54be2aed79b9c9cd3b9363c299823893879390928392604490910191818601910280838360005b83811015610e5f578181015183820152602001610e47565b5050505090500192505050600060405180830381600087803b158015610e8457600080fd5b505af1158015610e98573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526020811015610ec157600080fd5b8101908080516040519392919084600160201b821115610ee057600080fd5b908301906020820185811115610ef557600080fd5b82518660208202830111600160201b82111715610f1157600080fd5b82525081516020918201928201910280838360005b83811015610f3e578181015183820152602001610f26565b50505050905001604052505050905060008090505b8151811015610b4b57818181518110610f6857fe5b6020026020010151600014610fc4576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d656e7465722d6d61726b6574732d6661696c65640000604482015290519081900360640190fd5b600101610f53565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561100757600080fd5b505afa15801561101b573d6000803e3d6000fd5b505050506040513d602081101561103157600080fd5b50516040805163095ea7b360e01b81526001600160a01b0386811660048301526024820186905291519293509083169163095ea7b3916044808201926020929091908290030181600087803b15801561108957600080fd5b505af115801561109d573d6000803e3d6000fd5b505050506040513d60208110156110b357600080fd5b50511515600114610b4b576040805162461bcd60e51b815260206004820181905260248201527f636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564604482015290519081900360640190fd5b610b5a828261074e565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed5141561118957734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610ccc57600080fd5b6111938282610fcc565b816001600160a01b031663a0712d68826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b1580156111d957600080fd5b505af11580156111ed573d6000803e3d6000fd5b505050506040513d602081101561120357600080fd5b505115610812576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d63746f6b656e2d737570706c792d6661696c65640000604482015290519081900360640190fd5b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561129257600080fd5b505afa1580156112a6573d6000803e3d6000fd5b505050506040513d60208110156112bc57600080fd5b5051604080516323b872dd60e01b81526001600160a01b0388811660048301528781166024830152604482018690529151929350908316916323b872dd916064808201926020929091908290030181600087803b15801561131c57600080fd5b505af1158015611330573d6000803e3d6000fd5b505050506040513d602081101561134657600080fd5b5051610913576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d7472616e736665722d66726f6d2d6661696c65640000604482015290519081900360640190fd5b6000828211156113e7576040805162461bcd60e51b81526020600482015260146024820152731cd859994b5b585d1a0b5cdd588b59985a5b195960621b604482015290519081900360640190fd5b50900390565b6001600160a01b038316734ddc2d193948926d02f9b1fe9e1daa0718270ed51415611468576040516001600160a01b038316908290600081818185875af1925050503d806000811461145b576040519150601f19603f3d011682016040523d82523d6000602084013e611460565b606091505b505050610b4b565b826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156114a157600080fd5b505afa1580156114b5573d6000803e3d6000fd5b505050506040513d60208110156114cb57600080fd5b50516040805163a9059cbb60e01b81526001600160a01b038581166004830152602482018590529151919092169163a9059cbb9160448083019260209291908290030181600087803b15801561152057600080fd5b505af1158015611534573d6000803e3d6000fd5b505050506040513d602081101561154a57600080fd5b5051610b4b576040805162461bcd60e51b815260206004820152601960248201527f636d706e642d6d67722d7472616e736665722d6661696c656400000000000000604482015290519081900360640190fdfe636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79696e672d6661696c6564636d706e642d6d67722d63746f6b656e2d7265706179626568616c662d6661696c6564a265627a7a723158203217e4f53f5e7c7d8d094eeccc556c9eb1c0e5f63f3de1d1294da92934e4467b64736f6c63430005100032", - "deployedBytecode": "0x6080604052600436106101145760003560e01c806375d40945116100a0578063ba59154f11610064578063ba59154f1461049f578063c2998238146104cb578063d2f70c4014610579578063d882dc6c146105b2578063f2b9fdb8146105de57610114565b806375d409451461039e5780637720cc87146103d8578063962941781461040e5780639a22a1b91461043a578063abdb5ea81461047357610114565b806341ec5cc4116100e757806341ec5cc4146102cf5780634907b8fc146102fb5780634b8a35291461030357806359086a5e1461033c57806367600cc21461037257610114565b80630b4e0630146101195780631e9a6950146101475780632d8af543146101735780633dc4d99a14610221575b600080fd5b6101456004803603604081101561012f57600080fd5b506001600160a01b03813516906020013561060a565b005b6101456004803603604081101561015d57600080fd5b506001600160a01b03813516906020013561074e565b34801561017f57600080fd5b506101456004803603602081101561019657600080fd5b810190602081018135600160201b8111156101b057600080fd5b8201836020820111156101c257600080fd5b803590602001918460208302840111600160201b831117156101e357600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610816945050505050565b34801561022d57600080fd5b506101456004803603602081101561024457600080fd5b810190602081018135600160201b81111561025e57600080fd5b82018360208201111561027057600080fd5b803590602001918460208302840111600160201b8311171561029157600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092955061082b945050505050565b610145600480360360408110156102e557600080fd5b506001600160a01b03813516906020013561089e565b6101456108b0565b34801561030f57600080fd5b506101456004803603604081101561032657600080fd5b506001600160a01b03813516906020013561091a565b6101456004803603606081101561035257600080fd5b506001600160a01b038135811691602081013590911690604001356109de565b6101456004803603604081101561038857600080fd5b506001600160a01b038135169060200135610b50565b610145600480360360808110156103b457600080fd5b506001600160a01b0381358116916020810135916040820135169060600135610b65565b610145600480360360608110156103ee57600080fd5b506001600160a01b03813581169160208101359091169060400135610b79565b6101456004803603604081101561042457600080fd5b506001600160a01b038135169060200135610bb4565b34801561044657600080fd5b506101456004803603604081101561045d57600080fd5b506001600160a01b038135169060200135610c62565b6101456004803603604081101561048957600080fd5b506001600160a01b038135169060200135610c6c565b610145600480360360408110156104b557600080fd5b506001600160a01b038135169060200135610db8565b3480156104d757600080fd5b50610145600480360360208110156104ee57600080fd5b810190602081018135600160201b81111561050857600080fd5b82018360208201111561051a57600080fd5b803590602001918460208302840111600160201b8311171561053b57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610df2945050505050565b34801561058557600080fd5b506101456004803603604081101561059c57600080fd5b506001600160a01b038135169060200135610fcc565b610145600480360360408110156105c857600080fd5b506001600160a01b03813516906020013561110b565b610145600480360360408110156105f457600080fd5b506001600160a01b038135169060200135611115565b604080516370a0823160e01b815230600482015290516000916001600160a01b038516916370a0823191602480820192602092909190829003018186803b15801561065457600080fd5b505afa158015610668573d6000803e3d6000fd5b505050506040513d602081101561067e57600080fd5b505190506001600160a01b038316734ddc2d193948926d02f9b1fe9e1daa0718270ed5146106b2576106b233308585611257565b6106bc8383611115565b604080516370a0823160e01b815230600482015290516000916001600160a01b038616916370a0823191602480820192602092909190829003018186803b15801561070657600080fd5b505afa15801561071a573d6000803e3d6000fd5b505050506040513d602081101561073057600080fd5b5051905061074884336107438486611399565b6113ed565b50505050565b816001600160a01b031663db006a75826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b15801561079457600080fd5b505af11580156107a8573d6000803e3d6000fd5b505050506040513d60208110156107be57600080fd5b505115610812576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d63746f6b656e2d72656465656d2d6661696c65640000604482015290519081900360640190fd5b5050565b61081f81610df2565b6108288161082b565b50565b60005b815181101561081257734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b031682828151811061086157fe5b60200260200101516001600160a01b0316146108965761089682828151811061088657fe5b6020026020010151600019610fcc565b60010161082e565b6108a66108b0565b610812828261091a565b734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b346040518263ffffffff1660e01b81526004016000604051808303818588803b1580156108ff57600080fd5b505af1158015610913573d6000803e3d6000fd5b5050505050565b816001600160a01b031663c5ebeaec826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b15801561096057600080fd5b505af1158015610974573d6000803e3d6000fd5b505050506040513d602081101561098a57600080fd5b505115610812576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d63746f6b656e2d626f72726f772d6661696c65640000604482015290519081900360640190fd5b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed51415610a7957816001600160a01b031663e597461982856040518363ffffffff1660e01b815260040180826001600160a01b03166001600160a01b031681526020019150506000604051808303818588803b158015610a5b57600080fd5b505af1158015610a6f573d6000803e3d6000fd5b5050505050610b4b565b610a838282610fcc565b816001600160a01b0316632608f81884836040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b0316815260200182815260200192505050602060405180830381600087803b158015610ae357600080fd5b505af1158015610af7573d6000803e3d6000fd5b505050506040513d6020811015610b0d57600080fd5b505115610b4b5760405162461bcd60e51b81526004018080602001828103825260238152602001806115c76023913960400191505060405180910390fd5b505050565b610b5a8282610bb4565b6108128233836113ed565b610b6f8484611115565b610748828261091a565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514610ba957610ba933308484611257565b610b4b8383836109de565b816001600160a01b031663852a12e3826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b158015610bfa57600080fd5b505af1158015610c0e573d6000803e3d6000fd5b505050506040513d6020811015610c2457600080fd5b5051156108125760405162461bcd60e51b815260040180806020018281038252602981526020018061159e6029913960400191505060405180910390fd5b610b5a828261091a565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed51415610cea57816001600160a01b0316634e4d9fea826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610ccc57600080fd5b505af1158015610ce0573d6000803e3d6000fd5b5050505050610812565b610cf48282610fcc565b816001600160a01b0316630e752702826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b158015610d3a57600080fd5b505af1158015610d4e573d6000803e3d6000fd5b505050506040513d6020811015610d6457600080fd5b505115610812576040805162461bcd60e51b815260206004820152601d60248201527f636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564000000604482015290519081900360640190fd5b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514610de857610de833308484611257565b6108128282610c6c565b604051631853304760e31b8152602060048201818152835160248401528351606093733d9819210a31b4961b30ef54be2aed79b9c9cd3b9363c299823893879390928392604490910191818601910280838360005b83811015610e5f578181015183820152602001610e47565b5050505090500192505050600060405180830381600087803b158015610e8457600080fd5b505af1158015610e98573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526020811015610ec157600080fd5b8101908080516040519392919084600160201b821115610ee057600080fd5b908301906020820185811115610ef557600080fd5b82518660208202830111600160201b82111715610f1157600080fd5b82525081516020918201928201910280838360005b83811015610f3e578181015183820152602001610f26565b50505050905001604052505050905060008090505b8151811015610b4b57818181518110610f6857fe5b6020026020010151600014610fc4576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d656e7465722d6d61726b6574732d6661696c65640000604482015290519081900360640190fd5b600101610f53565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561100757600080fd5b505afa15801561101b573d6000803e3d6000fd5b505050506040513d602081101561103157600080fd5b50516040805163095ea7b360e01b81526001600160a01b0386811660048301526024820186905291519293509083169163095ea7b3916044808201926020929091908290030181600087803b15801561108957600080fd5b505af115801561109d573d6000803e3d6000fd5b505050506040513d60208110156110b357600080fd5b50511515600114610b4b576040805162461bcd60e51b815260206004820181905260248201527f636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564604482015290519081900360640190fd5b610b5a828261074e565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed5141561118957734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610ccc57600080fd5b6111938282610fcc565b816001600160a01b031663a0712d68826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b1580156111d957600080fd5b505af11580156111ed573d6000803e3d6000fd5b505050506040513d602081101561120357600080fd5b505115610812576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d63746f6b656e2d737570706c792d6661696c65640000604482015290519081900360640190fd5b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561129257600080fd5b505afa1580156112a6573d6000803e3d6000fd5b505050506040513d60208110156112bc57600080fd5b5051604080516323b872dd60e01b81526001600160a01b0388811660048301528781166024830152604482018690529151929350908316916323b872dd916064808201926020929091908290030181600087803b15801561131c57600080fd5b505af1158015611330573d6000803e3d6000fd5b505050506040513d602081101561134657600080fd5b5051610913576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d7472616e736665722d66726f6d2d6661696c65640000604482015290519081900360640190fd5b6000828211156113e7576040805162461bcd60e51b81526020600482015260146024820152731cd859994b5b585d1a0b5cdd588b59985a5b195960621b604482015290519081900360640190fd5b50900390565b6001600160a01b038316734ddc2d193948926d02f9b1fe9e1daa0718270ed51415611468576040516001600160a01b038316908290600081818185875af1925050503d806000811461145b576040519150601f19603f3d011682016040523d82523d6000602084013e611460565b606091505b505050610b4b565b826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156114a157600080fd5b505afa1580156114b5573d6000803e3d6000fd5b505050506040513d60208110156114cb57600080fd5b50516040805163a9059cbb60e01b81526001600160a01b038581166004830152602482018590529151919092169163a9059cbb9160448083019260209291908290030181600087803b15801561152057600080fd5b505af1158015611534573d6000803e3d6000fd5b505050506040513d602081101561154a57600080fd5b5051610b4b576040805162461bcd60e51b815260206004820152601960248201527f636d706e642d6d67722d7472616e736665722d6661696c656400000000000000604482015290519081900360640190fdfe636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79696e672d6661696c6564636d706e642d6d67722d63746f6b656e2d7265706179626568616c662d6661696c6564a265627a7a723158203217e4f53f5e7c7d8d094eeccc556c9eb1c0e5f63f3de1d1294da92934e4467b64736f6c63430005100032", - "sourceMap": "343:6695:16:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;343:6695:16;;;;;;;", - "deployedSourceMap": "343:6695:16:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5264:690;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;5264:690:16;;;;;;;;:::i;:::-;;4686:167;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;4686:167:16;;;;;;;;:::i;2581:157::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2581:157:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;2581:157:16;;;;;;;;-1:-1:-1;;;5:28;;2:2;;;46:1;43;36:12;2:2;2581:157:16;;35:9:-1;28:4;12:14;8:25;5:40;2:2;;;58:1;55;48:12;2:2;2581:157:16;;;;;;101:9:-1;95:2;81:12;77:21;67:8;63:36;60:51;-1:-1;;;25:12;22:29;11:108;8:2;;;132:1;129;122:12;8:2;2581:157:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;30:3:-1;22:6;14;1:33;99:1;81:16;;74:27;;;;-1:-1;2581:157:16;;-1:-1:-1;2581:157:16;;-1:-1:-1;;;;;2581:157:16:i;2252:323::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2252:323:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;2252:323:16;;;;;;;;-1:-1:-1;;;5:28;;2:2;;;46:1;43;36:12;2:2;2252:323:16;;35:9:-1;28:4;12:14;8:25;5:40;2:2;;;58:1;55;48:12;2:2;2252:323:16;;;;;;101:9:-1;95:2;81:12;77:21;67:8;63:36;60:51;-1:-1;;;25:12;22:29;11:108;8:2;;;132:1;129;122:12;8:2;2252:323:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;30:3:-1;22:6;14;1:33;99:1;81:16;;74:27;;;;-1:-1;2252:323:16;;-1:-1:-1;2252:323:16;;-1:-1:-1;;;;;2252:323:16:i;3710:227::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;3710:227:16;;;;;;;;:::i;2744:99::-;;;:::i;3284:159::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3284:159:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;3284:159:16;;;;;;;;:::i;4283:397::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;4283:397:16;;;;;;;;;;;;;;;;;:::i;6836:200::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;6836:200:16;;;;;;;;:::i;3449:255::-;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;-1:-1;;;;;;3449:255:16;;;;;;;;;;;;;;;;;;;;:::i;6206:282::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;6206:282:16;;;;;;;;;;;;;;;;;:::i;4859:198::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;4859:198:16;;;;;;;;:::i;6494:150::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6494:150:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;6494:150:16;;;;;;;;:::i;3943:334::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;3943:334:16;;;;;;;;:::i;5960:240::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;5960:240:16;;;;;;;;:::i;1466:429::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1466:429:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;1466:429:16;;;;;;;;-1:-1:-1;;;5:28;;2:2;;;46:1;43;36:12;2:2;1466:429:16;;35:9:-1;28:4;12:14;8:25;5:40;2:2;;;58:1;55;48:12;2:2;1466:429:16;;;;;;101:9:-1;95:2;81:12;77:21;67:8;63:36;60:51;-1:-1;;;25:12;22:29;11:108;8:2;;;132:1;129;122:12;8:2;1466:429:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;30:3:-1;22:6;14;1:33;99:1;81:16;;74:27;;;;-1:-1;1466:429:16;;-1:-1:-1;1466:429:16;;-1:-1:-1;;;;;1466:429:16:i;1901:345::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1901:345:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;1901:345:16;;;;;;;;:::i;6650:180::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;6650:180:16;;;;;;;;:::i;2849:429::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;2849:429:16;;;;;;;;:::i;5264:690::-;5425:40;;;-1:-1:-1;;;5425:40:16;;5459:4;5425:40;;;;;;5407:15;;-1:-1:-1;;;;;5425:25:16;;;;;:40;;;;;;;;;;;;;;;:25;:40;;;5:2:-1;;;;30:1;27;20:12;5:2;5425:40:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5425:40:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5425:40:16;;-1:-1:-1;;;;;;5639:23:16;;498:42;5639:23;5635:110;;5678:56;5692:10;5712:4;5719:6;5727;5678:13;:56::i;:::-;5754:22;5761:6;5769;5754;:22::i;:::-;5840:40;;;-1:-1:-1;;;5840:40:16;;5874:4;5840:40;;;;;;5824:13;;-1:-1:-1;;;;;5840:25:16;;;;;:40;;;;;;;;;;;;;;;:25;:40;;;5:2:-1;;;;30:1;27;20:12;5:2;5840:40:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5840:40:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5840:40:16;;-1:-1:-1;5891:56:16;5901:6;5909:10;5921:25;5840:40;5935:10;5921:3;:25::i;:::-;5891:9;:56::i;:::-;5264:690;;;;:::o;4686:167::-;4778:6;-1:-1:-1;;;;;4770:22:16;;4793:12;4770:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4770:36:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4770:36:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4770:36:16;:41;4762:84;;;;;-1:-1:-1;;;4762:84:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;4686:167;;:::o;2581:157::-;2677:21;2690:7;2677:12;:21::i;:::-;2708:23;2723:7;2708:14;:23::i;:::-;2581:157;:::o;2252:323::-;2362:6;2357:212;2378:7;:14;2374:1;:18;2357:212;;;498:42;-1:-1:-1;;;;;2462:27:16;:7;2470:1;2462:10;;;;;;;;;;;;;;-1:-1:-1;;;;;2462:27:16;;2458:101;;2509:35;2523:7;2531:1;2523:10;;;;;;;;;;;;;;-1:-1:-1;;2509:13:16;:35::i;:::-;2394:3;;2357:212;;3710:227;3849:11;:9;:11::i;:::-;3902:28;3909:6;3917:12;3902:6;:28::i;2744:99::-;498:42;-1:-1:-1;;;;;2790:27:16;;2824:9;2790:46;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2790:46:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2790:46:16;;;;;2744:99::o;3284:159::-;3368:6;-1:-1:-1;;;;;3360:22:16;;3383:12;3360:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3360:36:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3360:36:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;3360:36:16;:41;3352:84;;;;;-1:-1:-1;;;3352:84:16;;;;;;;;;;;;;;;;;;;;;;;;;;;4283:397;-1:-1:-1;;;;;4387:23:16;;498:42;4387:23;4383:291;;;4434:6;-1:-1:-1;;;;;4426:33:16;;4466:6;4474:9;4426:58;;;;;;;;;;;;;-1:-1:-1;;;;;4426:58:16;-1:-1:-1;;;;;4426:58:16;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4426:58:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4426:58:16;;;;;4383:291;;;4515:29;4529:6;4537;4515:13;:29::i;:::-;4574:6;-1:-1:-1;;;;;4566:33:16;;4600:9;4611:6;4566:52;;;;;;;;;;;;;-1:-1:-1;;;;;4566:52:16;-1:-1:-1;;;;;4566:52:16;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4566:52:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4566:52:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4566:52:16;:57;4558:105;;;;-1:-1:-1;;;4558:105:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4283:397;;;:::o;6836:200::-;6950:32;6967:6;6975;6950:16;:32::i;:::-;6992:37;7002:6;7010:10;7022:6;6992:9;:37::i;3449:255::-;3619:34;3626:12;3640;3619:6;:34::i;:::-;3663;3670:12;3684;3663:6;:34::i;6206:282::-;-1:-1:-1;;;;;6322:23:16;;498:42;6322:23;6318:110;;6361:56;6375:10;6395:4;6402:6;6410;6361:13;:56::i;:::-;6437:44;6455:9;6466:6;6474;6437:17;:44::i;4859:198::-;4961:6;-1:-1:-1;;;;;4953:32:16;;4986:12;4953:46;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4953:46:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4953:46:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4953:46:16;:51;4945:105;;;;-1:-1:-1;;;4945:105:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6494:150;6568:22;6575:6;6583;6568;:22::i;3943:334::-;-1:-1:-1;;;;;4022:23:16;;498:42;4022:23;4018:253;;;4069:6;-1:-1:-1;;;;;4061:27:16;;4095:6;4061:43;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4061:43:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4061:43:16;;;;;4018:253;;;4135:29;4149:6;4157;4135:13;:29::i;:::-;4194:6;-1:-1:-1;;;;;4186:27:16;;4214:6;4186:35;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4186:35:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4186:35:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4186:35:16;:40;4178:82;;;;;-1:-1:-1;;;4178:82:16;;;;;;;;;;;;;;;;;;;;;;;;;;;5960:240;-1:-1:-1;;;;;6051:23:16;;498:42;6051:23;6047:110;;6090:56;6104:10;6124:4;6131:6;6139;6090:13;:56::i;:::-;6166:27;6178:6;6186;6166:11;:27::i;1466:429::-;1693:62;;-1:-1:-1;;;1693:62:16;;;;;;;;;;;;;;;;;1670:20;;417:42;;1693:53;;1747:7;;1693:62;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;1693:62:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1693:62:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1693:62:16;;;;;;39:16:-1;36:1;17:17;2:54;101:4;1693:62:16;80:15:-1;;;-1:-1;;76:31;65:43;;120:4;113:20;13:2;5:11;;2:2;;;29:1;26;19:12;2:2;1693:62:16;;;;;;;;;;;;;-1:-1:-1;;;14:3;11:20;8:2;;;44:1;41;34:12;8:2;62:21;;;;123:4;114:14;;138:31;;;135:2;;;182:1;179;172:12;135:2;219:3;213:10;331:9;325:2;311:12;307:21;289:16;285:44;282:59;-1:-1;;;247:12;244:29;233:116;230:2;;;362:1;359;352:12;230:2;373:25;;-1:-1;1693:62:16;;421:4:-1;412:14;;;;1693:62:16;;;;;412:14:-1;1693:62:16;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;1693:62:16;;;;;;;;;;;1670:85;;1771:6;1780:1;1771:10;;1766:123;1787:6;:13;1783:1;:17;1766:123;;;1829:6;1836:1;1829:9;;;;;;;;;;;;;;1842:1;1829:14;1821:57;;;;;-1:-1:-1;;;1821:57:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;1802:3;;1766:123;;1901:345;2051:18;2080:6;-1:-1:-1;;;;;2072:26:16;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2072:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2072:28:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2072:28:16;2131:42;;;-1:-1:-1;;;2131:42:16;;-1:-1:-1;;;;;2131:42:16;;;;;;;;;;;;;;;2072:28;;-1:-1:-1;2131:26:16;;;;;;:42;;;;;2072:28;;2131:42;;;;;;;;-1:-1:-1;2131:26:16;:42;;;5:2:-1;;;;30:1;27;20:12;5:2;2131:42:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2131:42:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2131:42:16;:50;;2177:4;2131:50;2110:129;;;;;-1:-1:-1;;;2110:129:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;6650:180;6754:22;6761:6;6769;6754;:22::i;2849:429::-;-1:-1:-1;;;;;2923:23:16;;498:42;2923:23;2919:353;;;498:42;-1:-1:-1;;;;;2962:27:16;;2996:6;2962:43;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;2919:353:16;3099:29;3113:6;3121;3099:13;:29::i;:::-;3174:6;-1:-1:-1;;;;;3166:20:16;;3187:6;3166:28;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3166:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3166:28:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;3166:28:16;:33;3143:118;;;;;-1:-1:-1;;;3143:118:16;;;;;;;;;;;;;;;;;;;;;;;;;;;722:345;866:18;895:6;-1:-1:-1;;;;;887:26:16;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;887:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;887:28:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;887:28:16;946:58;;;-1:-1:-1;;;946:58:16;;-1:-1:-1;;;;;946:58:16;;;;;;;;;;;;;;;;;;;;;;887:28;;-1:-1:-1;946:31:16;;;;;;:58;;;;;887:28;;946:58;;;;;;;;-1:-1:-1;946:31:16;:58;;;5:2:-1;;;;30:1;27;20:12;5:2;946:58:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;946:58:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;946:58:16;925:135;;;;;-1:-1:-1;;;925:135:16;;;;;;;;;;;;;;;;;;;;;;;;;;;547:169;605:7;637:1;632;:6;;624:39;;;;;-1:-1:-1;;;624:39:16;;;;;;;;;;;;-1:-1:-1;;;624:39:16;;;;;;;;;;;;;;;-1:-1:-1;685:5:16;;;547:169::o;1073:387::-;-1:-1:-1;;;;;1193:23:16;;498:42;1193:23;1189:265;;;1232:32;;-1:-1:-1;;;;;1232:14:16;;;1253:6;;1232:32;;;;1253:6;1232:14;:32;;;;;;;14:1:-1;21;16:31;;;;75:4;69:11;64:16;;144:4;140:9;133:4;115:16;111:27;107:43;104:1;100:51;94:4;87:65;169:16;166:1;159:27;225:16;222:1;215:4;212:1;208:12;193:49;7:242;;16:31;36:4;31:9;;7:242;;1232:32:16;;1189:265;;;1335:6;-1:-1:-1;;;;;1327:26:16;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1327:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1327:28:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1327:28:16;1320:64;;;-1:-1:-1;;;1320:64:16;;-1:-1:-1;;;;;1320:64:16;;;;;;;;;;;;;;;:45;;;;;;;:64;;;;;1327:28;;1320:64;;;;;;;-1:-1:-1;1320:45:16;:64;;;5:2:-1;;;;30:1;27;20:12;5:2;1320:64:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1320:64:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1320:64:16;1295:148;;;;;-1:-1:-1;;;1295:148:16;;;;;;;;;;;;;;;;;;;;;;;;;;", - "source": "/* Mostly functions from https://compound.finance/developers/ctokens\n and https://compound.finance/developers/comptroller\n*/\npragma solidity 0.5.16;\n\nimport \"../../interfaces/compound/IComptroller.sol\";\nimport \"../../interfaces/compound/ICEther.sol\";\nimport \"../../interfaces/compound/ICToken.sol\";\n\nimport \"../../interfaces/IERC20.sol\";\n\ncontract CompoundBase {\n address constant CompoundComptrollerAddress = 0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B;\n address constant CEtherAddress = 0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5;\n\n function sub(uint256 a, uint256 b) internal pure returns (uint256) {\n require(b <= a, \"safe-math-sub-failed\");\n uint256 c = a - b;\n\n return c;\n }\n\n function _transferFrom(\n address sender,\n address recipient,\n address cToken,\n uint amount\n ) internal {\n address underlying = ICToken(cToken).underlying();\n require(\n IERC20(underlying).transferFrom(sender, recipient, amount),\n \"cmpnd-mgr-transfer-from-failed\"\n );\n }\n\n function _transfer(\n address cToken,\n address recipient,\n uint amount\n ) internal {\n if (cToken == CEtherAddress) {\n recipient.call.value(amount)(\"\");\n } else {\n require(\n IERC20(ICToken(cToken).underlying()).transfer(recipient, amount),\n \"cmpnd-mgr-transfer-failed\"\n );\n }\n }\n\n function enterMarkets(\n address[] memory cTokens // Address of the Compound derivation token (e.g. cDAI)\n ) public {\n // Enter the compound markets for all the specified tokens\n uint[] memory errors = IComptroller(CompoundComptrollerAddress).enterMarkets(cTokens);\n\n for (uint i = 0; i < errors.length; i++) {\n require(errors[i] == 0, \"cmpnd-mgr-enter-markets-failed\");\n }\n }\n\n function approveCToken(\n address cToken,\n uint amount\n ) public {\n // Approves CToken contract to call `transferFrom`\n address underlying = ICToken(cToken).underlying();\n require(\n IERC20(underlying).approve(cToken, amount) == true,\n \"cmpnd-mgr-ctoken-approved-failed\"\n );\n }\n\n function approveCTokens(\n address[] memory cTokens // Tokens to approve\n ) public {\n for (uint i = 0; i < cTokens.length; i++) {\n // Don't need to approve ICEther\n if (cTokens[i] != CEtherAddress) {\n approveCToken(cTokens[i], uint(-1));\n }\n }\n }\n\n function enterMarketsAndApproveCTokens(\n address[] memory cTokens\n ) public {\n enterMarkets(cTokens);\n approveCTokens(cTokens);\n }\n\n function supplyETH() public payable {\n ICEther(CEtherAddress).mint.value(msg.value)();\n }\n\n function supply(address cToken, uint amount) public payable {\n if (cToken == CEtherAddress) {\n ICEther(CEtherAddress).mint.value(amount)();\n } else {\n // Approves CToken contract to call `transferFrom`\n approveCToken(cToken, amount);\n\n require(\n ICToken(cToken).mint(amount) == 0,\n \"cmpnd-mgr-ctoken-supply-failed\"\n );\n }\n }\n\n function borrow(address cToken, uint borrowAmount) public {\n require(ICToken(cToken).borrow(borrowAmount) == 0, \"cmpnd-mgr-ctoken-borrow-failed\");\n }\n\n function supplyAndBorrow(\n address supplyCToken,\n uint supplyAmount,\n address borrowCToken,\n uint borrowAmount\n ) public payable {\n supply(supplyCToken, supplyAmount);\n borrow(borrowCToken, borrowAmount);\n }\n\n function supplyETHAndBorrow(\n address cToken,\n uint borrowAmount\n ) public payable {\n // Supply some Ether\n supplyETH();\n\n // Borrow some CTokens\n borrow(cToken, borrowAmount);\n }\n\n function repayBorrow(address cToken, uint amount) public payable {\n if (cToken == CEtherAddress) {\n ICEther(cToken).repayBorrow.value(amount)();\n } else {\n approveCToken(cToken, amount);\n require(ICToken(cToken).repayBorrow(amount) == 0, \"cmpnd-mgr-ctoken-repay-failed\");\n }\n }\n\n function repayBorrowBehalf(address recipient, address cToken, uint amount) public payable {\n if (cToken == CEtherAddress) {\n ICEther(cToken).repayBorrowBehalf.value(amount)(recipient);\n } else {\n approveCToken(cToken, amount);\n require(ICToken(cToken).repayBorrowBehalf(recipient, amount) == 0, \"cmpnd-mgr-ctoken-repaybehalf-failed\");\n }\n }\n\n function redeem(address cToken, uint redeemTokens) public payable {\n require(ICToken(cToken).redeem(redeemTokens) == 0, \"cmpnd-mgr-ctoken-redeem-failed\");\n }\n\n function redeemUnderlying(address cToken, uint redeemTokens) public payable {\n require(ICToken(cToken).redeemUnderlying(redeemTokens) == 0, \"cmpnd-mgr-ctoken-redeem-underlying-failed\");\n }\n\n // -- Helper functions so proxy doesn't hold any funds, all funds borrowed\n // or redeemed gets sent to user\n // User needs to `approve(spender, amount)` before through proxy functions work\n\n function supplyThroughProxy(\n address cToken,\n uint amount\n ) public payable {\n // Gets initial CToken balance\n uint initialBal = ICToken(cToken).balanceOf(address(this));\n\n // If cToken isn't an ether address, we need to transferFrom\n // If this fails, users needs to execute `approve(spender, amount)` to this proxy\n if (cToken != CEtherAddress) {\n _transferFrom(msg.sender, address(this), cToken, amount);\n }\n supply(cToken, amount);\n\n // Sends CToken back to user\n uint finalBal = ICToken(cToken).balanceOf(address(this));\n\n _transfer(cToken, msg.sender, sub(finalBal, initialBal));\n }\n\n function repayBorrowThroughProxy(address cToken, uint amount) public payable {\n if (cToken != CEtherAddress) {\n _transferFrom(msg.sender, address(this), cToken, amount);\n }\n repayBorrow(cToken, amount);\n }\n\n function repayBorrowBehalfThroughProxy(address recipient, address cToken, uint amount) public payable {\n if (cToken != CEtherAddress) {\n _transferFrom(msg.sender, address(this), cToken, amount);\n }\n repayBorrowBehalf(recipient, cToken, amount);\n }\n\n function borrowThroughProxy(address cToken, uint amount) public {\n borrow(cToken, amount);\n _transfer(cToken, msg.sender, amount);\n }\n\n function redeemThroughProxy(\n address cToken,\n uint amount\n ) public payable {\n redeem(cToken, amount);\n _transfer(cToken, msg.sender, amount);\n }\n\n function redeemUnderlyingThroughProxy(\n address cToken,\n uint amount\n ) public payable {\n redeemUnderlying(cToken, amount);\n _transfer(cToken, msg.sender, amount);\n }\n}\n", + "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"approveCToken\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"cTokens\",\"type\":\"address[]\"}],\"name\":\"approveCTokens\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"borrow\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"borrowThroughProxy\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"cTokens\",\"type\":\"address[]\"}],\"name\":\"enterMarkets\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"cTokens\",\"type\":\"address[]\"}],\"name\":\"enterMarketsAndApproveCTokens\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"}],\"name\":\"getBorrowBalanceUnderlying\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"redeemTokens\",\"type\":\"uint256\"}],\"name\":\"redeem\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"redeemThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"redeemTokens\",\"type\":\"uint256\"}],\"name\":\"redeemUnderlying\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"redeemUnderlyingThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowBehalf\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowBehalfThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"supply\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"supplyCToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"supplyAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"borrowCToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"supplyAndBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"supplyETH\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"supplyETHAndBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"supplyThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/compound/CompoundBase.sol\":\"CompoundBase\"},\"evmVersion\":\"constantinople\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol\":{\"keccak256\":\"0xe3762e63e74657a066e6fe281ec694e366ca86f6378470304c646b4e785e09f3\",\"urls\":[\"bzz-raw://67607850cbce7ffa66356dd28412e64ff58f62fa7c709f5fa28306b8be9050a7\",\"dweb:/ipfs/QmUaFhH5a6rQ8yJG2A6zJJ1ds9txqxr8ytxd2s7bhiNX35\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol\":{\"keccak256\":\"0x309afa791633faf166083968588cc12d10b511fea04522d9645cbd6469a6bcbe\",\"urls\":[\"bzz-raw://6ae438b67af64e89c742848ede981932ebc2b7238e2f147c8620d4048fd75885\",\"dweb:/ipfs/QmYZmAKfjvY3hS27hn1qcPBtegrQPELgc5YMXwybm5vBra\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol\":{\"keccak256\":\"0xf2fc635f3c28b641fa8dc95be41b6d7ab7f7d2bacfe9c2c37c1c0d22aac0afad\",\"urls\":[\"bzz-raw://767766022c3d3e172a71bd781eff9d92e938efc3e2d5708a90929491f2e0af15\",\"dweb:/ipfs/QmSkT4Jy2X54hYvDJG6PrX2tzdPvbK6WYtpBSJF7PDyVdp\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol\":{\"keccak256\":\"0xc69ade89655263aaffac1183c0e842ea95294171280f2c5ab755286a66de3ff9\",\"urls\":[\"bzz-raw://742ca904eaf238a83270e315410b35e83048ee0c6529190be2ae9f9bc20e6187\",\"dweb:/ipfs/QmPW3WFbHZjsGQ6vMgPRPWHCNJLNxyEbR4w1DAvd466N51\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/compound/CompoundBase.sol\":{\"keccak256\":\"0x162469a515591e97cc23fc40f18d3fa339e0c7e6fa0eb58f23795280047f54d6\",\"urls\":[\"bzz-raw://d7ce11b588c634ca71e0bdbd142394a2ffc7563dfd438e7d5402f4907ea8a845\",\"dweb:/ipfs/QmYkYqBFbNx8H8p4CUmeTHj8ehBb5oEaec2trR4HZyb3RK\"]},\"@openzeppelin/contracts/math/SafeMath.sol\":{\"keccak256\":\"0x640b6dee7a4b830bdfd52b5031a07fc2b12209f5b2e29e5d364a7d37f69d8076\",\"urls\":[\"bzz-raw://31113152e1ddb78fe7a4197f247591ca894e93f916867beb708d8e747b6cc74f\",\"dweb:/ipfs/QmbZaJyXdpsYGykVhHH9qpVGQg9DGCxE2QufbCUy3daTgq\"]}},\"version\":1}", + "bytecode": "0x608060405234801561001057600080fd5b50611778806100206000396000f3fe60806040526004361061011f5760003560e01c80637720cc87116100a0578063c299823811610064578063c2998238146104d6578063d2f70c4014610584578063d882dc6c146105bd578063dc08fa9d146105e9578063f2b9fdb8146106365761011f565b80637720cc87146103e357806396294178146104195780639a22a1b914610445578063abdb5ea81461047e578063ba59154f146104aa5761011f565b80634907b8fc116100e75780634907b8fc146103065780634b8a35291461030e57806359086a5e1461034757806367600cc21461037d57806375d40945146103a95761011f565b80630b4e0630146101245780631e9a6950146101525780632d8af5431461017e5780633dc4d99a1461022c57806341ec5cc4146102da575b600080fd5b6101506004803603604081101561013a57600080fd5b506001600160a01b038135169060200135610662565b005b6101506004803603604081101561016857600080fd5b506001600160a01b0381351690602001356106a0565b34801561018a57600080fd5b50610150600480360360208110156101a157600080fd5b810190602081018135600160201b8111156101bb57600080fd5b8201836020820111156101cd57600080fd5b803590602001918460208302840111600160201b831117156101ee57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610764945050505050565b34801561023857600080fd5b506101506004803603602081101561024f57600080fd5b810190602081018135600160201b81111561026957600080fd5b82018360208201111561027b57600080fd5b803590602001918460208302840111600160201b8311171561029c57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610779945050505050565b610150600480360360408110156102f057600080fd5b506001600160a01b0381351690602001356107ec565b6101506107fe565b34801561031a57600080fd5b506101506004803603604081101561033157600080fd5b506001600160a01b038135169060200135610868565b6101506004803603606081101561035d57600080fd5b506001600160a01b0381358116916020810135909116906040013561092c565b6101506004803603604081101561039357600080fd5b506001600160a01b038135169060200135610a9e565b610150600480360360808110156103bf57600080fd5b506001600160a01b0381358116916020810135916040820135169060600135610ab3565b610150600480360360608110156103f957600080fd5b506001600160a01b03813581169160208101359091169060400135610acd565b6101506004803603604081101561042f57600080fd5b506001600160a01b038135169060200135610b08565b34801561045157600080fd5b506101506004803603604081101561046857600080fd5b506001600160a01b038135169060200135610bb6565b6101506004803603604081101561049457600080fd5b506001600160a01b038135169060200135610bc0565b610150600480360360408110156104c057600080fd5b506001600160a01b038135169060200135610d0c565b3480156104e257600080fd5b50610150600480360360208110156104f957600080fd5b810190602081018135600160201b81111561051357600080fd5b82018360208201111561052557600080fd5b803590602001918460208302840111600160201b8311171561054657600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610d46945050505050565b34801561059057600080fd5b50610150600480360360408110156105a757600080fd5b506001600160a01b038135169060200135610f20565b610150600480360360408110156105d357600080fd5b506001600160a01b03813516906020013561105f565b3480156105f557600080fd5b506106246004803603604081101561060c57600080fd5b506001600160a01b0381358116916020013516611069565b60408051918252519081900360200190f35b6101506004803603604081101561064c57600080fd5b506001600160a01b038135169060200135611143565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed5146106925761069233308484611285565b61069c8282611143565b5050565b816001600160a01b031663db006a75826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b1580156106e657600080fd5b505af11580156106fa573d6000803e3d6000fd5b505050506040513d602081101561071057600080fd5b50511561069c576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d63746f6b656e2d72656465656d2d6661696c65640000604482015290519081900360640190fd5b61076d81610d46565b61077681610779565b50565b60005b815181101561069c57734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b03168282815181106107af57fe5b60200260200101516001600160a01b0316146107e4576107e48282815181106107d457fe5b6020026020010151600019610f20565b60010161077c565b6107f46107fe565b61069c8282610868565b734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b346040518263ffffffff1660e01b81526004016000604051808303818588803b15801561084d57600080fd5b505af1158015610861573d6000803e3d6000fd5b5050505050565b816001600160a01b031663c5ebeaec826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b1580156108ae57600080fd5b505af11580156108c2573d6000803e3d6000fd5b505050506040513d60208110156108d857600080fd5b50511561069c576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d63746f6b656e2d626f72726f772d6661696c65640000604482015290519081900360640190fd5b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514156109c757816001600160a01b031663e597461982856040518363ffffffff1660e01b815260040180826001600160a01b03166001600160a01b031681526020019150506000604051808303818588803b1580156109a957600080fd5b505af11580156109bd573d6000803e3d6000fd5b5050505050610a99565b6109d18282610f20565b816001600160a01b0316632608f81884836040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b0316815260200182815260200192505050602060405180830381600087803b158015610a3157600080fd5b505af1158015610a45573d6000803e3d6000fd5b505050506040513d6020811015610a5b57600080fd5b505115610a995760405162461bcd60e51b81526004018080602001828103825260238152602001806116fd6023913960400191505060405180910390fd5b505050565b610aa88282610b08565b61069c8233836113b1565b610abd8484611143565b610ac78282610868565b50505050565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514610afd57610afd33308484611285565b610a9983838361092c565b816001600160a01b031663852a12e3826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b158015610b4e57600080fd5b505af1158015610b62573d6000803e3d6000fd5b505050506040513d6020811015610b7857600080fd5b50511561069c5760405162461bcd60e51b815260040180806020018281038252602981526020018061168b6029913960400191505060405180910390fd5b610aa88282610868565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed51415610c3e57816001600160a01b0316634e4d9fea826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610c2057600080fd5b505af1158015610c34573d6000803e3d6000fd5b505050505061069c565b610c488282610f20565b816001600160a01b0316630e752702826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b158015610c8e57600080fd5b505af1158015610ca2573d6000803e3d6000fd5b505050506040513d6020811015610cb857600080fd5b50511561069c576040805162461bcd60e51b815260206004820152601d60248201527f636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564000000604482015290519081900360640190fd5b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514610d3c57610d3c33308484611285565b61069c8282610bc0565b604051631853304760e31b8152602060048201818152835160248401528351606093733d9819210a31b4961b30ef54be2aed79b9c9cd3b9363c299823893879390928392604490910191818601910280838360005b83811015610db3578181015183820152602001610d9b565b5050505090500192505050600060405180830381600087803b158015610dd857600080fd5b505af1158015610dec573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526020811015610e1557600080fd5b8101908080516040519392919084600160201b821115610e3457600080fd5b908301906020820185811115610e4957600080fd5b82518660208202830111600160201b82111715610e6557600080fd5b82525081516020918201928201910280838360005b83811015610e92578181015183820152602001610e7a565b50505050905001604052505050905060008090505b8151811015610a9957818181518110610ebc57fe5b6020026020010151600014610f18576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d656e7465722d6d61726b6574732d6661696c65640000604482015290519081900360640190fd5b600101610ea7565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015610f5b57600080fd5b505afa158015610f6f573d6000803e3d6000fd5b505050506040513d6020811015610f8557600080fd5b50516040805163095ea7b360e01b81526001600160a01b0386811660048301526024820186905291519293509083169163095ea7b3916044808201926020929091908290030181600087803b158015610fdd57600080fd5b505af1158015610ff1573d6000803e3d6000fd5b505050506040513d602081101561100757600080fd5b50511515600114610a99576040805162461bcd60e51b815260206004820181905260248201527f636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564604482015290519081900360640190fd5b610aa882826106a0565b6000806000806000866001600160a01b031663c37f68e2876040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060806040518083038186803b1580156110c757600080fd5b505afa1580156110db573d6000803e3d6000fd5b505050506040513d60808110156110f157600080fd5b5080516020820151604083015160609093015191965094509092509050611136670de0b6b3a764000061112a858463ffffffff61154b16565b9063ffffffff6115ab16565b9450505050505b92915050565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514156111b757734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610c2057600080fd5b6111c18282610f20565b816001600160a01b031663a0712d68826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b15801561120757600080fd5b505af115801561121b573d6000803e3d6000fd5b505050506040513d602081101561123157600080fd5b50511561069c576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d63746f6b656e2d737570706c792d6661696c65640000604482015290519081900360640190fd5b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156112c057600080fd5b505afa1580156112d4573d6000803e3d6000fd5b505050506040513d60208110156112ea57600080fd5b5051604080516323b872dd60e01b81526001600160a01b0388811660048301528781166024830152604482018690529151929350908316916323b872dd916064808201926020929091908290030181600087803b15801561134a57600080fd5b505af115801561135e573d6000803e3d6000fd5b505050506040513d602081101561137457600080fd5b50516108615760405162461bcd60e51b81526004018080602001828103825260288152602001806116b46028913960400191505060405180910390fd5b6001600160a01b038316734ddc2d193948926d02f9b1fe9e1daa0718270ed5141561142c576040516001600160a01b038316908290600081818185875af1925050503d806000811461141f576040519150601f19603f3d011682016040523d82523d6000602084013e611424565b606091505b505050610a99565b826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561146557600080fd5b505afa158015611479573d6000803e3d6000fd5b505050506040513d602081101561148f57600080fd5b50516040805163a9059cbb60e01b81526001600160a01b038581166004830152602482018590529151919092169163a9059cbb9160448083019260209291908290030181600087803b1580156114e457600080fd5b505af11580156114f8573d6000803e3d6000fd5b505050506040513d602081101561150e57600080fd5b5051610a995760405162461bcd60e51b81526004018080602001828103825260248152602001806117206024913960400191505060405180910390fd5b60008261155a5750600061113d565b8282028284828161156757fe5b04146115a45760405162461bcd60e51b81526004018080602001828103825260218152602001806116dc6021913960400191505060405180910390fd5b9392505050565b60006115a483836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250600081836116745760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015611639578181015183820152602001611621565b50505050905090810190601f1680156116665780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b50600083858161168057fe5b049594505050505056fe636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79696e672d6661696c6564636d706e642d6d67722d7472616e7366657246726f6d2d756e6465726c79696e672d6661696c6564536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77636d706e642d6d67722d63746f6b656e2d7265706179626568616c662d6661696c6564636d706e642d6d67722d7472616e736665722d756e6465726c79696e672d6661696c6564a265627a7a72315820f5a751b7469e1a0a83dbb6bb565ab1b010bcb49751469d05eaf2dc1688ad523664736f6c63430005100032", + "deployedBytecode": "0x60806040526004361061011f5760003560e01c80637720cc87116100a0578063c299823811610064578063c2998238146104d6578063d2f70c4014610584578063d882dc6c146105bd578063dc08fa9d146105e9578063f2b9fdb8146106365761011f565b80637720cc87146103e357806396294178146104195780639a22a1b914610445578063abdb5ea81461047e578063ba59154f146104aa5761011f565b80634907b8fc116100e75780634907b8fc146103065780634b8a35291461030e57806359086a5e1461034757806367600cc21461037d57806375d40945146103a95761011f565b80630b4e0630146101245780631e9a6950146101525780632d8af5431461017e5780633dc4d99a1461022c57806341ec5cc4146102da575b600080fd5b6101506004803603604081101561013a57600080fd5b506001600160a01b038135169060200135610662565b005b6101506004803603604081101561016857600080fd5b506001600160a01b0381351690602001356106a0565b34801561018a57600080fd5b50610150600480360360208110156101a157600080fd5b810190602081018135600160201b8111156101bb57600080fd5b8201836020820111156101cd57600080fd5b803590602001918460208302840111600160201b831117156101ee57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610764945050505050565b34801561023857600080fd5b506101506004803603602081101561024f57600080fd5b810190602081018135600160201b81111561026957600080fd5b82018360208201111561027b57600080fd5b803590602001918460208302840111600160201b8311171561029c57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610779945050505050565b610150600480360360408110156102f057600080fd5b506001600160a01b0381351690602001356107ec565b6101506107fe565b34801561031a57600080fd5b506101506004803603604081101561033157600080fd5b506001600160a01b038135169060200135610868565b6101506004803603606081101561035d57600080fd5b506001600160a01b0381358116916020810135909116906040013561092c565b6101506004803603604081101561039357600080fd5b506001600160a01b038135169060200135610a9e565b610150600480360360808110156103bf57600080fd5b506001600160a01b0381358116916020810135916040820135169060600135610ab3565b610150600480360360608110156103f957600080fd5b506001600160a01b03813581169160208101359091169060400135610acd565b6101506004803603604081101561042f57600080fd5b506001600160a01b038135169060200135610b08565b34801561045157600080fd5b506101506004803603604081101561046857600080fd5b506001600160a01b038135169060200135610bb6565b6101506004803603604081101561049457600080fd5b506001600160a01b038135169060200135610bc0565b610150600480360360408110156104c057600080fd5b506001600160a01b038135169060200135610d0c565b3480156104e257600080fd5b50610150600480360360208110156104f957600080fd5b810190602081018135600160201b81111561051357600080fd5b82018360208201111561052557600080fd5b803590602001918460208302840111600160201b8311171561054657600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610d46945050505050565b34801561059057600080fd5b50610150600480360360408110156105a757600080fd5b506001600160a01b038135169060200135610f20565b610150600480360360408110156105d357600080fd5b506001600160a01b03813516906020013561105f565b3480156105f557600080fd5b506106246004803603604081101561060c57600080fd5b506001600160a01b0381358116916020013516611069565b60408051918252519081900360200190f35b6101506004803603604081101561064c57600080fd5b506001600160a01b038135169060200135611143565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed5146106925761069233308484611285565b61069c8282611143565b5050565b816001600160a01b031663db006a75826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b1580156106e657600080fd5b505af11580156106fa573d6000803e3d6000fd5b505050506040513d602081101561071057600080fd5b50511561069c576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d63746f6b656e2d72656465656d2d6661696c65640000604482015290519081900360640190fd5b61076d81610d46565b61077681610779565b50565b60005b815181101561069c57734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b03168282815181106107af57fe5b60200260200101516001600160a01b0316146107e4576107e48282815181106107d457fe5b6020026020010151600019610f20565b60010161077c565b6107f46107fe565b61069c8282610868565b734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b346040518263ffffffff1660e01b81526004016000604051808303818588803b15801561084d57600080fd5b505af1158015610861573d6000803e3d6000fd5b5050505050565b816001600160a01b031663c5ebeaec826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b1580156108ae57600080fd5b505af11580156108c2573d6000803e3d6000fd5b505050506040513d60208110156108d857600080fd5b50511561069c576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d63746f6b656e2d626f72726f772d6661696c65640000604482015290519081900360640190fd5b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514156109c757816001600160a01b031663e597461982856040518363ffffffff1660e01b815260040180826001600160a01b03166001600160a01b031681526020019150506000604051808303818588803b1580156109a957600080fd5b505af11580156109bd573d6000803e3d6000fd5b5050505050610a99565b6109d18282610f20565b816001600160a01b0316632608f81884836040518363ffffffff1660e01b815260040180836001600160a01b03166001600160a01b0316815260200182815260200192505050602060405180830381600087803b158015610a3157600080fd5b505af1158015610a45573d6000803e3d6000fd5b505050506040513d6020811015610a5b57600080fd5b505115610a995760405162461bcd60e51b81526004018080602001828103825260238152602001806116fd6023913960400191505060405180910390fd5b505050565b610aa88282610b08565b61069c8233836113b1565b610abd8484611143565b610ac78282610868565b50505050565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514610afd57610afd33308484611285565b610a9983838361092c565b816001600160a01b031663852a12e3826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b158015610b4e57600080fd5b505af1158015610b62573d6000803e3d6000fd5b505050506040513d6020811015610b7857600080fd5b50511561069c5760405162461bcd60e51b815260040180806020018281038252602981526020018061168b6029913960400191505060405180910390fd5b610aa88282610868565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed51415610c3e57816001600160a01b0316634e4d9fea826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610c2057600080fd5b505af1158015610c34573d6000803e3d6000fd5b505050505061069c565b610c488282610f20565b816001600160a01b0316630e752702826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b158015610c8e57600080fd5b505af1158015610ca2573d6000803e3d6000fd5b505050506040513d6020811015610cb857600080fd5b50511561069c576040805162461bcd60e51b815260206004820152601d60248201527f636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564000000604482015290519081900360640190fd5b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514610d3c57610d3c33308484611285565b61069c8282610bc0565b604051631853304760e31b8152602060048201818152835160248401528351606093733d9819210a31b4961b30ef54be2aed79b9c9cd3b9363c299823893879390928392604490910191818601910280838360005b83811015610db3578181015183820152602001610d9b565b5050505090500192505050600060405180830381600087803b158015610dd857600080fd5b505af1158015610dec573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526020811015610e1557600080fd5b8101908080516040519392919084600160201b821115610e3457600080fd5b908301906020820185811115610e4957600080fd5b82518660208202830111600160201b82111715610e6557600080fd5b82525081516020918201928201910280838360005b83811015610e92578181015183820152602001610e7a565b50505050905001604052505050905060008090505b8151811015610a9957818181518110610ebc57fe5b6020026020010151600014610f18576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d656e7465722d6d61726b6574732d6661696c65640000604482015290519081900360640190fd5b600101610ea7565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015610f5b57600080fd5b505afa158015610f6f573d6000803e3d6000fd5b505050506040513d6020811015610f8557600080fd5b50516040805163095ea7b360e01b81526001600160a01b0386811660048301526024820186905291519293509083169163095ea7b3916044808201926020929091908290030181600087803b158015610fdd57600080fd5b505af1158015610ff1573d6000803e3d6000fd5b505050506040513d602081101561100757600080fd5b50511515600114610a99576040805162461bcd60e51b815260206004820181905260248201527f636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564604482015290519081900360640190fd5b610aa882826106a0565b6000806000806000866001600160a01b031663c37f68e2876040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060806040518083038186803b1580156110c757600080fd5b505afa1580156110db573d6000803e3d6000fd5b505050506040513d60808110156110f157600080fd5b5080516020820151604083015160609093015191965094509092509050611136670de0b6b3a764000061112a858463ffffffff61154b16565b9063ffffffff6115ab16565b9450505050505b92915050565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514156111b757734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610c2057600080fd5b6111c18282610f20565b816001600160a01b031663a0712d68826040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b15801561120757600080fd5b505af115801561121b573d6000803e3d6000fd5b505050506040513d602081101561123157600080fd5b50511561069c576040805162461bcd60e51b815260206004820152601e60248201527f636d706e642d6d67722d63746f6b656e2d737570706c792d6661696c65640000604482015290519081900360640190fd5b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156112c057600080fd5b505afa1580156112d4573d6000803e3d6000fd5b505050506040513d60208110156112ea57600080fd5b5051604080516323b872dd60e01b81526001600160a01b0388811660048301528781166024830152604482018690529151929350908316916323b872dd916064808201926020929091908290030181600087803b15801561134a57600080fd5b505af115801561135e573d6000803e3d6000fd5b505050506040513d602081101561137457600080fd5b50516108615760405162461bcd60e51b81526004018080602001828103825260288152602001806116b46028913960400191505060405180910390fd5b6001600160a01b038316734ddc2d193948926d02f9b1fe9e1daa0718270ed5141561142c576040516001600160a01b038316908290600081818185875af1925050503d806000811461141f576040519150601f19603f3d011682016040523d82523d6000602084013e611424565b606091505b505050610a99565b826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561146557600080fd5b505afa158015611479573d6000803e3d6000fd5b505050506040513d602081101561148f57600080fd5b50516040805163a9059cbb60e01b81526001600160a01b038581166004830152602482018590529151919092169163a9059cbb9160448083019260209291908290030181600087803b1580156114e457600080fd5b505af11580156114f8573d6000803e3d6000fd5b505050506040513d602081101561150e57600080fd5b5051610a995760405162461bcd60e51b81526004018080602001828103825260248152602001806117206024913960400191505060405180910390fd5b60008261155a5750600061113d565b8282028284828161156757fe5b04146115a45760405162461bcd60e51b81526004018080602001828103825260218152602001806116dc6021913960400191505060405180910390fd5b9392505050565b60006115a483836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250600081836116745760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015611639578181015183820152602001611621565b50505050905090810190601f1680156116665780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b50600083858161168057fe5b049594505050505056fe636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79696e672d6661696c6564636d706e642d6d67722d7472616e7366657246726f6d2d756e6465726c79696e672d6661696c6564536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77636d706e642d6d67722d63746f6b656e2d7265706179626568616c662d6661696c6564636d706e642d6d67722d7472616e736665722d756e6465726c79696e672d6661696c6564a265627a7a72315820f5a751b7469e1a0a83dbb6bb565ab1b010bcb49751469d05eaf2dc1688ad523664736f6c63430005100032", + "sourceMap": "396:7446:16:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;396:7446:16;;;;;;;", + "deployedSourceMap": "396:7446:16:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6424:243;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;6424:243:16;;;;;;;;:::i;:::-;;5752:204;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;5752:204:16;;;;;;;;:::i;3482:143::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3482:143:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;3482:143:16;;;;;;;;-1:-1:-1;;;5:28;;2:2;;;46:1;43;36:12;2:2;3482:143:16;;35:9:-1;28:4;12:14;8:25;5:40;2:2;;;58:1;55;48:12;2:2;3482:143:16;;;;;;101:9:-1;95:2;81:12;77:21;67:8;63:36;60:51;-1:-1;;;25:12;22:29;11:108;8:2;;;132:1;129;122:12;8:2;3482:143:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;30:3:-1;22:6;14;1:33;99:1;81:16;;74:27;;;;-1:-1;3482:143:16;;-1:-1:-1;3482:143:16;;-1:-1:-1;;;;;3482:143:16:i;3150:326::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3150:326:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;3150:326:16;;;;;;;;-1:-1:-1;;;5:28;;2:2;;;46:1;43;36:12;2:2;3150:326:16;;35:9:-1;28:4;12:14;8:25;5:40;2:2;;;58:1;55;48:12;2:2;3150:326:16;;;;;;101:9:-1;95:2;81:12;77:21;67:8;63:36;60:51;-1:-1;;;25:12;22:29;11:108;8:2;;;132:1;129;122:12;8:2;3150:326:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;30:3:-1;22:6;14;1:33;99:1;81:16;;74:27;;;;-1:-1;3150:326:16;;-1:-1:-1;3150:326:16;;-1:-1:-1;;;;;3150:326:16:i;4647:228::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;4647:228:16;;;;;;;;:::i;3631:99::-;;;:::i;4178:196::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4178:196:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;4178:196:16;;;;;;;;:::i;5270:476::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;5270:476:16;;;;;;;;;;;;;;;;;:::i;7629:211::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;7629:211:16;;;;;;;;:::i;4380:261::-;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;-1:-1;;;;;;4380:261:16;;;;;;;;;;;;;;;;;;;;:::i;6952:325::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;6952:325:16;;;;;;;;;;;;;;;;;:::i;5962:255::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;5962:255:16;;;;;;;;:::i;7283:163::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7283:163:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;7283:163:16;;;;;;;;:::i;4881:383::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;4881:383:16;;;;;;;;:::i;6673:273::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;6673:273:16;;;;;;;;:::i;2366:446::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2366:446:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;2366:446:16;;;;;;;;-1:-1:-1;;;5:28;;2:2;;;46:1;43;36:12;2:2;2366:446:16;;35:9:-1;28:4;12:14;8:25;5:40;2:2;;;58:1;55;48:12;2:2;2366:446:16;;;;;;101:9:-1;95:2;81:12;77:21;67:8;63:36;60:51;-1:-1;;;25:12;22:29;11:108;8:2;;;132:1;129;122:12;8:2;2366:446:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;30:3:-1;22:6;14;1:33;99:1;81:16;;74:27;;;;-1:-1;2366:446:16;;-1:-1:-1;2366:446:16;;-1:-1:-1;;;;;2366:446:16:i;2818:326::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2818:326:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;2818:326:16;;;;;;;;:::i;7452:171::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;7452:171:16;;;;;;;;:::i;808:477::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;808:477:16;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;808:477:16;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;3736:436;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;;;;;;3736:436:16;;;;;;;;:::i;6424:243::-;-1:-1:-1;;;;;6513:23:16;;584:42;6513:23;6509:120;;6552:66;6576:10;6596:4;6603:6;6611;6552:23;:66::i;:::-;6638:22;6645:6;6653;6638;:22::i;:::-;6424:243;;:::o;5752:204::-;5860:6;-1:-1:-1;;;;;5852:22:16;;5875:12;5852:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5852:36:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5852:36:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5852:36:16;:41;5831:118;;;;;-1:-1:-1;;;5831:118:16;;;;;;;;;;;;;;;;;;;;;;;;;;;3482:143;3564:21;3577:7;3564:12;:21::i;:::-;3595:23;3610:7;3595:14;:23::i;:::-;3482:143;:::o;3150:326::-;3257:9;3252:218;3276:7;:14;3272:1;:18;3252:218;;;584:42;-1:-1:-1;;;;;3360:27:16;:7;3368:1;3360:10;;;;;;;;;;;;;;-1:-1:-1;;;;;3360:27:16;;3356:104;;3407:38;3421:7;3429:1;3421:10;;;;;;;;;;;;;;-1:-1:-1;;3407:13:16;:38::i;:::-;3292:3;;3252:218;;4647:228;4787:11;:9;:11::i;:::-;4840:28;4847:6;4855:12;4840:6;:28::i;3631:99::-;584:42;-1:-1:-1;;;;;3677:27:16;;3711:9;3677:46;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3677:46:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3677:46:16;;;;;3631:99::o;4178:196::-;4278:6;-1:-1:-1;;;;;4270:22:16;;4293:12;4270:36;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4270:36:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4270:36:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4270:36:16;:41;4249:118;;;;;-1:-1:-1;;;4249:118:16;;;;;;;;;;;;;;;;;;;;;;;;;;;5270:476;-1:-1:-1;;;;;5407:23:16;;584:42;5407:23;5403:337;;;5454:6;-1:-1:-1;;;;;5446:33:16;;5486:6;5494:9;5446:58;;;;;;;;;;;;;-1:-1:-1;;;;;5446:58:16;-1:-1:-1;;;;;5446:58:16;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5446:58:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5446:58:16;;;;;5403:337;;;5535:29;5549:6;5557;5535:13;:29::i;:::-;5611:6;-1:-1:-1;;;;;5603:33:16;;5637:9;5648:6;5603:52;;;;;;;;;;;;;-1:-1:-1;;;;;5603:52:16;-1:-1:-1;;;;;5603:52:16;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5603:52:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5603:52:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5603:52:16;:57;5578:151;;;;-1:-1:-1;;;5578:151:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5270:476;;;:::o;7629:211::-;7744:32;7761:6;7769;7744:16;:32::i;:::-;7786:47;7806:6;7814:10;7826:6;7786:19;:47::i;4380:261::-;4556:34;4563:12;4577;4556:6;:34::i;:::-;4600;4607:12;4621;4600:6;:34::i;:::-;4380:261;;;;:::o;6952:325::-;-1:-1:-1;;;;;7101:23:16;;584:42;7101:23;7097:120;;7140:66;7164:10;7184:4;7191:6;7199;7140:23;:66::i;:::-;7226:44;7244:9;7255:6;7263;7226:17;:44::i;5962:255::-;6100:6;-1:-1:-1;;;;;6092:32:16;;6125:12;6092:46;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6092:46:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6092:46:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;6092:46:16;:51;6071:139;;;;-1:-1:-1;;;6071:139:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7283:163;7360:22;7367:6;7375;7360;:22::i;4881:383::-;-1:-1:-1;;;;;4963:23:16;;584:42;4963:23;4959:299;;;5010:6;-1:-1:-1;;;;;5002:27:16;;5036:6;5002:43;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5002:43:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5002:43:16;;;;;4959:299;;;5076:29;5090:6;5098;5076:13;:29::i;:::-;5152:6;-1:-1:-1;;;;;5144:27:16;;5172:6;5144:35;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5144:35:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5144:35:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5144:35:16;:40;5119:128;;;;;-1:-1:-1;;;5119:128:16;;;;;;;;;;;;;;;;;;;;;;;;;;;6673:273;-1:-1:-1;;;;;6787:23:16;;584:42;6787:23;6783:120;;6826:66;6850:10;6870:4;6877:6;6885;6826:23;:66::i;:::-;6912:27;6924:6;6932;6912:11;:27::i;2366:446::-;2594:75;;-1:-1:-1;;;2594:75:16;;;;;;;;;;;;;;;;;2568:23;;503:42;;2594:66;;2661:7;;2594:75;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;2594:75:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2594:75:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2594:75:16;;;;;;39:16:-1;36:1;17:17;2:54;101:4;2594:75:16;80:15:-1;;;-1:-1;;76:31;65:43;;120:4;113:20;13:2;5:11;;2:2;;;29:1;26;19:12;2:2;2594:75:16;;;;;;;;;;;;;-1:-1:-1;;;14:3;11:20;8:2;;;44:1;41;34:12;8:2;62:21;;;;123:4;114:14;;138:31;;;135:2;;;182:1;179;172:12;135:2;219:3;213:10;331:9;325:2;311:12;307:21;289:16;285:44;282:59;-1:-1;;;247:12;244:29;233:116;230:2;;;362:1;359;352:12;230:2;373:25;;-1:-1;2594:75:16;;421:4:-1;412:14;;;;2594:75:16;;;;;412:14:-1;2594:75:16;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;2594:75:16;;;;;;;;;;;2568:101;;2685:9;2697:1;2685:13;;2680:126;2704:6;:13;2700:1;:17;2680:126;;;2746:6;2753:1;2746:9;;;;;;;;;;;;;;2759:1;2746:14;2738:57;;;;;-1:-1:-1;;;2738:57:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;2719:3;;2680:126;;2818:326;2949:18;2978:6;-1:-1:-1;;;;;2970:26:16;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2970:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2970:28:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2970:28:16;3029:42;;;-1:-1:-1;;;3029:42:16;;-1:-1:-1;;;;;3029:42:16;;;;;;;;;;;;;;;2970:28;;-1:-1:-1;3029:26:16;;;;;;:42;;;;;2970:28;;3029:42;;;;;;;;-1:-1:-1;3029:26:16;:42;;;5:2:-1;;;;30:1;27;20:12;5:2;3029:42:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3029:42:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;3029:42:16;:50;;3075:4;3029:50;3008:129;;;;;-1:-1:-1;;;3008:129:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;7452:171;7537:22;7544:6;7552;7537;:22::i;808:477::-;942:7;979:11;1004:21;1039;1074:28;1123:6;-1:-1:-1;;;;;1115:34:16;;1150:5;1115:41;;;;;;;;;;;;;-1:-1:-1;;;;;1115:41:16;-1:-1:-1;;;;;1115:41:16;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1115:41:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1115:41:16;;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;-1:-1;1115:41:16;;;;;;;;;;;;;;;;;-1:-1:-1;1115:41:16;-1:-1:-1;1115:41:16;;-1:-1:-1;1115:41:16;-1:-1:-1;1229:49:16;1273:4;1229:39;1115:41;;1229:39;:17;:39;:::i;:::-;:43;:49;:43;:49;:::i;:::-;1222:56;;;;;;808:477;;;;;:::o;3736:436::-;-1:-1:-1;;;;;3813:23:16;;584:42;3813:23;3809:357;;;584:42;-1:-1:-1;;;;;3852:27:16;;3886:6;3852:43;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;3809:357:16;3989:29;4003:6;4011;3989:13;:29::i;:::-;4066:6;-1:-1:-1;;;;;4058:20:16;;4079:6;4058:28;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4058:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4058:28:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4058:28:16;:33;4033:122;;;;;-1:-1:-1;;;4033:122:16;;;;;;;;;;;;;;;;;;;;;;;;;;;1291:368;1448:18;1477:6;-1:-1:-1;;;;;1469:26:16;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1469:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1469:28:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1469:28:16;1528:58;;;-1:-1:-1;;;1528:58:16;;-1:-1:-1;;;;;1528:58:16;;;;;;;;;;;;;;;;;;;;;;1469:28;;-1:-1:-1;1528:31:16;;;;;;:58;;;;;1469:28;;1528:58;;;;;;;;-1:-1:-1;1528:31:16;:58;;;5:2:-1;;;;30:1;27;20:12;5:2;1528:58:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1528:58:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1528:58:16;1507:145;;;;-1:-1:-1;;;1507:145:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1665:469;-1:-1:-1;;;;;1798:23:16;;584:42;1798:23;1794:334;;;1837:32;;-1:-1:-1;;;;;1837:14:16;;;1858:6;;1837:32;;;;1858:6;1837:14;:32;;;;;;;14:1:-1;21;16:31;;;;75:4;69:11;64:16;;144:4;140:9;133:4;115:16;111:27;107:43;104:1;100:51;94:4;87:65;169:16;166:1;159:27;225:16;222:1;215:4;212:1;208:12;193:49;7:242;;16:31;36:4;31:9;;7:242;;1837:32:16;;1794:334;;;1940:6;-1:-1:-1;;;;;1932:26:16;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1932:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1932:28:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1932:28:16;1925:122;;;-1:-1:-1;;;1925:122:16;;-1:-1:-1;;;;;1925:122:16;;;;;;;;;;;;;;;:45;;;;;;;:122;;;;;1932:28;;1925:122;;;;;;;-1:-1:-1;1925:45:16;:122;;;5:2:-1;;;;30:1;27;20:12;5:2;1925:122:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1925:122:16;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1925:122:16;1900:217;;;;-1:-1:-1;;;1900:217:16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2159:459:32;2217:7;2458:6;2454:45;;-1:-1:-1;2487:1:32;2480:8;;2454:45;2521:5;;;2525:1;2521;:5;:1;2544:5;;;;;:10;2536:56;;;;-1:-1:-1;;;2536:56:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2610:1;2159:459;-1:-1:-1;;;2159:459:32:o;3073:130::-;3131:7;3157:39;3161:1;3164;3157:39;;;;;;;;;;;;;;;;;3804:7;3904:12;3897:5;3889:28;;;;-1:-1:-1;;;3889:28:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;3889:28:32;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3927:9;3943:1;3939;:5;;;;;;;3718:338;-1:-1:-1;;;;;3718:338:32:o", + "source": "/* Mostly functions from https://compound.finance/developers/ctokens\n and https://compound.finance/developers/comptroller\n*/\npragma solidity 0.5.16;\n\nimport \"../../interfaces/compound/IComptroller.sol\";\nimport \"../../interfaces/compound/ICEther.sol\";\nimport \"../../interfaces/compound/ICToken.sol\";\n\nimport \"../../interfaces/IERC20.sol\";\n\nimport \"@openzeppelin/contracts/math/SafeMath.sol\";\n\ncontract CompoundBase {\n using SafeMath for uint256;\n\n address constant CompoundComptrollerAddress = 0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B;\n address constant CEtherAddress = 0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5;\n\n function sub(uint256 a, uint256 b) internal pure returns (uint256) {\n require(b <= a, \"safe-math-sub-failed\");\n uint256 c = a - b;\n\n return c;\n }\n\n function getBorrowBalanceUnderlying(\n address cToken,\n address owner\n )\n public\n view\n returns (uint256)\n {\n (\n uint256 err,\n uint256 cTokenBalance,\n uint256 borrowBalance,\n uint256 exchangeRateMantissa\n ) = ICToken(cToken).getAccountSnapshot(owner);\n\n // Source: balanceOfUnderlying from any ctoken\n return cTokenBalance.mul(exchangeRateMantissa).div(1e18);\n }\n\n function _transferFromUnderlying(\n address sender,\n address recipient,\n address cToken,\n uint256 amount\n ) internal {\n address underlying = ICToken(cToken).underlying();\n require(\n IERC20(underlying).transferFrom(sender, recipient, amount),\n \"cmpnd-mgr-transferFrom-underlying-failed\"\n );\n }\n\n function _transferUnderlying(\n address cToken,\n address recipient,\n uint256 amount\n ) internal {\n if (cToken == CEtherAddress) {\n recipient.call.value(amount)(\"\");\n } else {\n require(\n IERC20(ICToken(cToken).underlying()).transfer(\n recipient,\n amount\n ),\n \"cmpnd-mgr-transfer-underlying-failed\"\n );\n }\n }\n\n function _transfer(address token, address recipient, uint256 amount)\n internal\n {\n require(\n IERC20(token).transfer(recipient, amount),\n \"cmpnd-mgr-transfer-failed\"\n );\n }\n\n function enterMarkets(\n address[] memory cTokens // Address of the Compound derivation token (e.g. cDAI)\n ) public {\n // Enter the compound markets for all the specified tokens\n uint256[] memory errors = IComptroller(CompoundComptrollerAddress)\n .enterMarkets(cTokens);\n\n for (uint256 i = 0; i < errors.length; i++) {\n require(errors[i] == 0, \"cmpnd-mgr-enter-markets-failed\");\n }\n }\n\n function approveCToken(address cToken, uint256 amount) public {\n // Approves CToken contract to call `transferFrom`\n address underlying = ICToken(cToken).underlying();\n require(\n IERC20(underlying).approve(cToken, amount) == true,\n \"cmpnd-mgr-ctoken-approved-failed\"\n );\n }\n\n function approveCTokens(\n address[] memory cTokens // Tokens to approve\n ) public {\n for (uint256 i = 0; i < cTokens.length; i++) {\n // Don't need to approve ICEther\n if (cTokens[i] != CEtherAddress) {\n approveCToken(cTokens[i], uint256(-1));\n }\n }\n }\n\n function enterMarketsAndApproveCTokens(address[] memory cTokens) public {\n enterMarkets(cTokens);\n approveCTokens(cTokens);\n }\n\n function supplyETH() public payable {\n ICEther(CEtherAddress).mint.value(msg.value)();\n }\n\n function supply(address cToken, uint256 amount) public payable {\n if (cToken == CEtherAddress) {\n ICEther(CEtherAddress).mint.value(amount)();\n } else {\n // Approves CToken contract to call `transferFrom`\n approveCToken(cToken, amount);\n\n require(\n ICToken(cToken).mint(amount) == 0,\n \"cmpnd-mgr-ctoken-supply-failed\"\n );\n }\n }\n\n function borrow(address cToken, uint256 borrowAmount) public {\n require(\n ICToken(cToken).borrow(borrowAmount) == 0,\n \"cmpnd-mgr-ctoken-borrow-failed\"\n );\n }\n\n function supplyAndBorrow(\n address supplyCToken,\n uint256 supplyAmount,\n address borrowCToken,\n uint256 borrowAmount\n ) public payable {\n supply(supplyCToken, supplyAmount);\n borrow(borrowCToken, borrowAmount);\n }\n\n function supplyETHAndBorrow(address cToken, uint256 borrowAmount)\n public\n payable\n {\n // Supply some Ether\n supplyETH();\n\n // Borrow some CTokens\n borrow(cToken, borrowAmount);\n }\n\n function repayBorrow(address cToken, uint256 amount) public payable {\n if (cToken == CEtherAddress) {\n ICEther(cToken).repayBorrow.value(amount)();\n } else {\n approveCToken(cToken, amount);\n require(\n ICToken(cToken).repayBorrow(amount) == 0,\n \"cmpnd-mgr-ctoken-repay-failed\"\n );\n }\n }\n\n function repayBorrowBehalf(\n address recipient,\n address cToken,\n uint256 amount\n ) public payable {\n if (cToken == CEtherAddress) {\n ICEther(cToken).repayBorrowBehalf.value(amount)(recipient);\n } else {\n approveCToken(cToken, amount);\n require(\n ICToken(cToken).repayBorrowBehalf(recipient, amount) == 0,\n \"cmpnd-mgr-ctoken-repaybehalf-failed\"\n );\n }\n }\n\n function redeem(address cToken, uint256 redeemTokens) public payable {\n require(\n ICToken(cToken).redeem(redeemTokens) == 0,\n \"cmpnd-mgr-ctoken-redeem-failed\"\n );\n }\n\n function redeemUnderlying(address cToken, uint256 redeemTokens)\n public\n payable\n {\n require(\n ICToken(cToken).redeemUnderlying(redeemTokens) == 0,\n \"cmpnd-mgr-ctoken-redeem-underlying-failed\"\n );\n }\n\n // -- Helper functions so proxy doesn't hold any funds, all funds borrowed\n // or redeemed gets sent to user\n // User needs to `approve(spender, amount)` before through proxy functions work\n\n function supplyThroughProxy(address cToken, uint256 amount) public payable {\n if (cToken != CEtherAddress) {\n _transferFromUnderlying(msg.sender, address(this), cToken, amount);\n }\n supply(cToken, amount);\n }\n\n function repayBorrowThroughProxy(address cToken, uint256 amount)\n public\n payable\n {\n if (cToken != CEtherAddress) {\n _transferFromUnderlying(msg.sender, address(this), cToken, amount);\n }\n repayBorrow(cToken, amount);\n }\n\n function repayBorrowBehalfThroughProxy(\n address recipient,\n address cToken,\n uint256 amount\n ) public payable {\n if (cToken != CEtherAddress) {\n _transferFromUnderlying(msg.sender, address(this), cToken, amount);\n }\n repayBorrowBehalf(recipient, cToken, amount);\n }\n\n function borrowThroughProxy(address cToken, uint256 amount) public {\n borrow(cToken, amount);\n _transferUnderlying(cToken, msg.sender, amount);\n }\n\n function redeemThroughProxy(address cToken, uint256 amount) public payable {\n redeem(cToken, amount);\n _transferUnderlying(cToken, msg.sender, amount);\n }\n\n function redeemUnderlyingThroughProxy(address cToken, uint256 amount)\n public\n payable\n {\n redeemUnderlying(cToken, amount);\n _transferUnderlying(cToken, msg.sender, amount);\n }\n}\n", "sourcePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/compound/CompoundBase.sol", "ast": { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/compound/CompoundBase.sol", "exportedSymbols": { "CompoundBase": [ - 2785 + 2837 ] }, - "id": 2786, + "id": 2838, "nodeType": "SourceUnit", "nodes": [ { - "id": 2140, + "id": 2166, "literals": [ "solidity", "0.5", @@ -406,10 +432,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", "file": "../../interfaces/compound/IComptroller.sol", - "id": 2141, + "id": 2167, "nodeType": "ImportDirective", - "scope": 2786, - "sourceUnit": 1097, + "scope": 2838, + "sourceUnit": 1123, "src": "154:52:16", "symbolAliases": [], "unitAlias": "" @@ -417,10 +443,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol", "file": "../../interfaces/compound/ICEther.sol", - "id": 2142, + "id": 2168, "nodeType": "ImportDirective", - "scope": 2786, - "sourceUnit": 733, + "scope": 2838, + "sourceUnit": 746, "src": "207:47:16", "symbolAliases": [], "unitAlias": "" @@ -428,10 +454,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol", "file": "../../interfaces/compound/ICToken.sol", - "id": 2143, + "id": 2169, "nodeType": "ImportDirective", - "scope": 2786, - "sourceUnit": 859, + "scope": 2838, + "sourceUnit": 885, "src": "255:47:16", "symbolAliases": [], "unitAlias": "" @@ -439,34 +465,72 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 2144, + "id": 2170, "nodeType": "ImportDirective", - "scope": 2786, + "scope": 2838, "sourceUnit": 121, "src": "304:37:16", "symbolAliases": [], "unitAlias": "" }, + { + "absolutePath": "@openzeppelin/contracts/math/SafeMath.sol", + "file": "@openzeppelin/contracts/math/SafeMath.sol", + "id": 2171, + "nodeType": "ImportDirective", + "scope": 2838, + "sourceUnit": 7729, + "src": "343:51:16", + "symbolAliases": [], + "unitAlias": "" + }, { "baseContracts": [], "contractDependencies": [], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2785, + "id": 2837, "linearizedBaseContracts": [ - 2785 + 2837 ], "name": "CompoundBase", "nodeType": "ContractDefinition", "nodes": [ + { + "id": 2174, + "libraryName": { + "contractScope": null, + "id": 2172, + "name": "SafeMath", + "nodeType": "UserDefinedTypeName", + "referencedDeclaration": 7728, + "src": "430:8:16", + "typeDescriptions": { + "typeIdentifier": "t_contract$_SafeMath_$7728", + "typeString": "library SafeMath" + } + }, + "nodeType": "UsingForDirective", + "src": "424:27:16", + "typeName": { + "id": 2173, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "443:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + }, { "constant": true, - "id": 2147, + "id": 2177, "name": "CompoundComptrollerAddress", "nodeType": "VariableDeclaration", - "scope": 2785, - "src": "371:88:16", + "scope": 2837, + "src": "457:88:16", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -474,10 +538,10 @@ "typeString": "address" }, "typeName": { - "id": 2145, + "id": 2175, "name": "address", "nodeType": "ElementaryTypeName", - "src": "371:7:16", + "src": "457:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -487,14 +551,14 @@ "value": { "argumentTypes": null, "hexValue": "307833643938313932313041333162343936316233304546353462453261654437394239633943643342", - "id": 2146, + "id": 2176, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "417:42:16", + "src": "503:42:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -506,11 +570,11 @@ }, { "constant": true, - "id": 2150, + "id": 2180, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 2785, - "src": "465:75:16", + "scope": 2837, + "src": "551:75:16", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -518,10 +582,10 @@ "typeString": "address" }, "typeName": { - "id": 2148, + "id": 2178, "name": "address", "nodeType": "ElementaryTypeName", - "src": "465:7:16", + "src": "551:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -531,14 +595,14 @@ "value": { "argumentTypes": null, "hexValue": "307834446463324431393339343839323644303266394231664539653164616130373138323730454435", - "id": 2149, + "id": 2179, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "498:42:16", + "src": "584:42:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -550,9 +614,9 @@ }, { "body": { - "id": 2174, + "id": 2204, "nodeType": "Block", - "src": "614:102:16", + "src": "700:102:16", "statements": [ { "expression": { @@ -564,19 +628,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2162, + "id": 2192, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2160, + "id": 2190, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2154, - "src": "632:1:16", + "referencedDeclaration": 2184, + "src": "718:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -586,18 +650,18 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 2161, + "id": 2191, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2152, - "src": "637:1:16", + "referencedDeclaration": 2182, + "src": "723:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "632:6:16", + "src": "718:6:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -606,14 +670,14 @@ { "argumentTypes": null, "hexValue": "736166652d6d6174682d7375622d6661696c6564", - "id": 2163, + "id": 2193, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "640:22:16", + "src": "726:22:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_7f8c7307a443d266921963bec94cdc3284a5bd12537c4fb2de8d3f3d9315cda6", @@ -633,21 +697,21 @@ "typeString": "literal_string \"safe-math-sub-failed\"" } ], - "id": 2159, + "id": 2189, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "624:7:16", + "referencedDeclaration": 7822, + "src": "710:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2164, + "id": 2194, "isConstant": false, "isLValue": false, "isPure": false, @@ -655,28 +719,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "624:39:16", + "src": "710:39:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2165, + "id": 2195, "nodeType": "ExpressionStatement", - "src": "624:39:16" + "src": "710:39:16" }, { "assignments": [ - 2167 + 2197 ], "declarations": [ { "constant": false, - "id": 2167, + "id": 2197, "name": "c", "nodeType": "VariableDeclaration", - "scope": 2174, - "src": "673:9:16", + "scope": 2204, + "src": "759:9:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -684,10 +748,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2166, + "id": 2196, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "673:7:16", + "src": "759:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -697,26 +761,26 @@ "visibility": "internal" } ], - "id": 2171, + "id": 2201, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2170, + "id": 2200, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2168, + "id": 2198, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2152, - "src": "685:1:16", + "referencedDeclaration": 2182, + "src": "771:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -726,65 +790,65 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 2169, + "id": 2199, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2154, - "src": "689:1:16", + "referencedDeclaration": 2184, + "src": "775:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "685:5:16", + "src": "771:5:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "673:17:16" + "src": "759:17:16" }, { "expression": { "argumentTypes": null, - "id": 2172, + "id": 2202, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2167, - "src": "708:1:16", + "referencedDeclaration": 2197, + "src": "794:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2158, - "id": 2173, + "functionReturnParameters": 2188, + "id": 2203, "nodeType": "Return", - "src": "701:8:16" + "src": "787:8:16" } ] }, "documentation": null, - "id": 2175, + "id": 2205, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 2155, + "id": 2185, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2152, + "id": 2182, "name": "a", "nodeType": "VariableDeclaration", - "scope": 2175, - "src": "560:9:16", + "scope": 2205, + "src": "646:9:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -792,10 +856,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2151, + "id": 2181, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "560:7:16", + "src": "646:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -806,11 +870,11 @@ }, { "constant": false, - "id": 2154, + "id": 2184, "name": "b", "nodeType": "VariableDeclaration", - "scope": 2175, - "src": "571:9:16", + "scope": 2205, + "src": "657:9:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -818,10 +882,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2153, + "id": 2183, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "571:7:16", + "src": "657:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -831,19 +895,19 @@ "visibility": "internal" } ], - "src": "559:22:16" + "src": "645:22:16" }, "returnParameters": { - "id": 2158, + "id": 2188, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2157, + "id": 2187, "name": "", "nodeType": "VariableDeclaration", - "scope": 2175, - "src": "605:7:16", + "scope": 2205, + "src": "691:7:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -851,10 +915,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2156, + "id": 2186, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "605:7:16", + "src": "691:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -864,70 +928,169 @@ "visibility": "internal" } ], - "src": "604:9:16" + "src": "690:9:16" }, - "scope": 2785, - "src": "547:169:16", + "scope": 2837, + "src": "633:169:16", "stateMutability": "pure", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 2206, + "id": 2237, "nodeType": "Block", - "src": "856:211:16", + "src": "955:330:16", "statements": [ { "assignments": [ - 2187 + 2215, + 2217, + 2219, + 2221 ], "declarations": [ { "constant": false, - "id": 2187, - "name": "underlying", + "id": 2215, + "name": "err", "nodeType": "VariableDeclaration", - "scope": 2206, - "src": "866:18:16", + "scope": 2237, + "src": "979:11:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" }, "typeName": { - "id": 2186, - "name": "address", + "id": 2214, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "866:7:16", - "stateMutability": "nonpayable", + "src": "979:7:16", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2217, + "name": "cTokenBalance", + "nodeType": "VariableDeclaration", + "scope": 2237, + "src": "1004:21:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2216, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "1004:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2219, + "name": "borrowBalance", + "nodeType": "VariableDeclaration", + "scope": 2237, + "src": "1039:21:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2218, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "1039:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2221, + "name": "exchangeRateMantissa", + "nodeType": "VariableDeclaration", + "scope": 2237, + "src": "1074:28:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2220, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "1074:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, "value": null, "visibility": "internal" } ], - "id": 2193, + "id": 2228, "initialValue": { "argumentTypes": null, - "arguments": [], + "arguments": [ + { + "argumentTypes": null, + "id": 2226, + "name": "owner", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2209, + "src": "1150:5:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], "expression": { - "argumentTypes": [], + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], "expression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2189, + "id": 2223, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2181, - "src": "895:6:16", + "referencedDeclaration": 2207, + "src": "1123:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -941,18 +1104,18 @@ "typeString": "address" } ], - "id": 2188, + "id": 2222, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "887:7:16", + "referencedDeclaration": 884, + "src": "1115:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2190, + "id": 2224, "isConstant": false, "isLValue": false, "isPure": false, @@ -960,27 +1123,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "887:15:16", + "src": "1115:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2191, + "id": 2225, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "underlying", + "memberName": "getAccountSnapshot", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "887:26:16", + "referencedDeclaration": 830, + "src": "1115:34:16", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" + "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", + "typeString": "function (address) view external returns (uint256,uint256,uint256,uint256)" } }, - "id": 2192, + "id": 2227, "isConstant": false, "isLValue": false, "isPure": false, @@ -988,56 +1151,56 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "887:28:16", + "src": "1115:41:16", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", + "typeString": "tuple(uint256,uint256,uint256,uint256)" } }, "nodeType": "VariableDeclarationStatement", - "src": "866:49:16" + "src": "965:191:16" }, { "expression": { "argumentTypes": null, "arguments": [ { + "argumentTypes": null, + "hexValue": "31653138", + "id": 2234, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "1273:4:16", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_1000000000000000000_by_1", + "typeString": "int_const 1000000000000000000" + }, + "value": "1e18" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_1000000000000000000_by_1", + "typeString": "int_const 1000000000000000000" + } + ], + "expression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2199, - "name": "sender", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2177, - "src": "978:6:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 2200, - "name": "recipient", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2179, - "src": "986:9:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 2201, - "name": "amount", + "id": 2231, + "name": "exchangeRateMantissa", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2183, - "src": "997:6:16", + "referencedDeclaration": 2221, + "src": "1247:20:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1046,14 +1209,6 @@ ], "expression": { "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_address", - "typeString": "address" - }, { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1061,68 +1216,32 @@ ], "expression": { "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2196, - "name": "underlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2187, - "src": "953:10:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 2195, - "name": "IERC20", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 120, - "src": "946:6:16", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IERC20_$120_$", - "typeString": "type(contract IERC20)" - } - }, - "id": 2197, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "946:18:16", + "id": 2229, + "name": "cTokenBalance", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2217, + "src": "1229:13:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_IERC20_$120", - "typeString": "contract IERC20" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 2198, + "id": 2230, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "transferFrom", + "memberName": "mul", "nodeType": "MemberAccess", - "referencedDeclaration": 88, - "src": "946:31:16", + "referencedDeclaration": 7645, + "src": "1229:17:16", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", - "typeString": "function (address,address,uint256) external returns (bool)" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2202, + "id": 2232, "isConstant": false, "isLValue": false, "isPure": false, @@ -1130,57 +1249,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "946:58:16", + "src": "1229:39:16", "typeDescriptions": { - "typeIdentifier": "t_bool", - "typeString": "bool" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - { - "argumentTypes": null, - "hexValue": "636d706e642d6d67722d7472616e736665722d66726f6d2d6661696c6564", - "id": 2203, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "string", - "lValueRequested": false, - "nodeType": "Literal", - "src": "1018:32:16", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_stringliteral_988f4b216d59d8ffb8b0197685cfb8e661f26f50842dcde245fb338bad4bf3c7", - "typeString": "literal_string \"cmpnd-mgr-transfer-from-failed\"" - }, - "value": "cmpnd-mgr-transfer-from-failed" - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_bool", - "typeString": "bool" - }, - { - "typeIdentifier": "t_stringliteral_988f4b216d59d8ffb8b0197685cfb8e661f26f50842dcde245fb338bad4bf3c7", - "typeString": "literal_string \"cmpnd-mgr-transfer-from-failed\"" - } - ], - "id": 2194, - "name": "require", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 7830, - 7831 - ], - "referencedDeclaration": 7831, - "src": "925:7:16", - "typeDescriptions": { - "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", - "typeString": "function (bool,string memory) pure" + "id": 2233, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "div", + "nodeType": "MemberAccess", + "referencedDeclaration": 7661, + "src": "1229:43:16", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 2204, + "id": 2235, "isConstant": false, "isLValue": false, "isPure": false, @@ -1188,63 +1277,37 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "925:135:16", + "src": "1229:49:16", "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 2205, - "nodeType": "ExpressionStatement", - "src": "925:135:16" + "functionReturnParameters": 2213, + "id": 2236, + "nodeType": "Return", + "src": "1222:56:16" } ] }, "documentation": null, - "id": 2207, + "id": 2238, "implemented": true, "kind": "function", "modifiers": [], - "name": "_transferFrom", + "name": "getBorrowBalanceUnderlying", "nodeType": "FunctionDefinition", "parameters": { - "id": 2184, + "id": 2210, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2177, - "name": "sender", - "nodeType": "VariableDeclaration", - "scope": 2207, - "src": "754:14:16", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 2176, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "754:7:16", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 2179, - "name": "recipient", + "id": 2207, + "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2207, - "src": "778:17:16", + "scope": 2238, + "src": "853:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1252,10 +1315,10 @@ "typeString": "address" }, "typeName": { - "id": 2178, + "id": 2206, "name": "address", "nodeType": "ElementaryTypeName", - "src": "778:7:16", + "src": "853:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1267,11 +1330,11 @@ }, { "constant": false, - "id": 2181, - "name": "cToken", + "id": 2209, + "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2207, - "src": "805:14:16", + "scope": 2238, + "src": "877:13:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1279,10 +1342,10 @@ "typeString": "address" }, "typeName": { - "id": 2180, + "id": 2208, "name": "address", "nodeType": "ElementaryTypeName", - "src": "805:7:16", + "src": "877:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1291,14 +1354,21 @@ }, "value": null, "visibility": "internal" - }, + } + ], + "src": "843:53:16" + }, + "returnParameters": { + "id": 2213, + "nodeType": "ParameterList", + "parameters": [ { "constant": false, - "id": 2183, - "name": "amount", + "id": 2212, + "name": "", "nodeType": "VariableDeclaration", - "scope": 2207, - "src": "829:11:16", + "scope": 2238, + "src": "942:7:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1306,10 +1376,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2182, - "name": "uint", + "id": 2211, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "829:4:16", + "src": "942:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1319,105 +1389,560 @@ "visibility": "internal" } ], - "src": "744:102:16" - }, - "returnParameters": { - "id": 2185, - "nodeType": "ParameterList", - "parameters": [], - "src": "856:0:16" + "src": "941:9:16" }, - "scope": 2785, - "src": "722:345:16", - "stateMutability": "nonpayable", + "scope": 2837, + "src": "808:477:16", + "stateMutability": "view", "superFunction": null, - "visibility": "internal" + "visibility": "public" }, { "body": { - "id": 2247, + "id": 2269, "nodeType": "Block", - "src": "1179:281:16", + "src": "1438:221:16", "statements": [ { - "condition": { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "id": 2218, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 2216, - "name": "cToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2209, - "src": "1193:6:16", + "assignments": [ + 2250 + ], + "declarations": [ + { + "constant": false, + "id": 2250, + "name": "underlying", + "nodeType": "VariableDeclaration", + "scope": 2269, + "src": "1448:18:16", + "stateVariable": false, + "storageLocation": "default", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" - } - }, - "nodeType": "BinaryOperation", - "operator": "==", - "rightExpression": { - "argumentTypes": null, - "id": 2217, - "name": "CEtherAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "1203:13:16", + }, + "typeName": { + "id": 2249, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1448:7:16", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 2256, + "initialValue": { + "argumentTypes": null, + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2252, + "name": "cToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2244, + "src": "1477:6:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 2251, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "1469:7:16", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" + } + }, + "id": 2253, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1469:15:16", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" + } + }, + "id": 2254, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "underlying", + "nodeType": "MemberAccess", + "referencedDeclaration": 835, + "src": "1469:26:16", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" } }, - "src": "1193:23:16", + "id": 2255, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1469:28:16", "typeDescriptions": { - "typeIdentifier": "t_bool", - "typeString": "bool" + "typeIdentifier": "t_address", + "typeString": "address" } }, - "falseBody": { - "id": 2245, - "nodeType": "Block", - "src": "1281:173:16", - "statements": [ + "nodeType": "VariableDeclarationStatement", + "src": "1448:49:16" + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2262, + "name": "sender", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2240, + "src": "1560:6:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 2263, + "name": "recipient", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2242, + "src": "1568:9:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 2264, + "name": "amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2246, + "src": "1579:6:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], "expression": { - "argumentTypes": null, - "arguments": [ + "argumentTypes": [ { - "argumentTypes": null, - "arguments": [ + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2259, + "name": "underlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2250, + "src": "1535:10:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ { - "argumentTypes": null, - "id": 2239, - "name": "recipient", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2211, - "src": "1366:9:16", - "typeDescriptions": { - "typeIdentifier": "t_address", + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 2258, + "name": "IERC20", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 120, + "src": "1528:6:16", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_IERC20_$120_$", + "typeString": "type(contract IERC20)" + } + }, + "id": 2260, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1528:18:16", + "typeDescriptions": { + "typeIdentifier": "t_contract$_IERC20_$120", + "typeString": "contract IERC20" + } + }, + "id": 2261, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "transferFrom", + "nodeType": "MemberAccess", + "referencedDeclaration": 88, + "src": "1528:31:16", + "typeDescriptions": { + "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", + "typeString": "function (address,address,uint256) external returns (bool)" + } + }, + "id": 2265, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1528:58:16", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + { + "argumentTypes": null, + "hexValue": "636d706e642d6d67722d7472616e7366657246726f6d2d756e6465726c79696e672d6661696c6564", + "id": 2266, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "1600:42:16", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_846e5515f3943b69728da09b85525376521c6f329758b130b66130c1fe9752fc", + "typeString": "literal_string \"cmpnd-mgr-transferFrom-underlying-failed\"" + }, + "value": "cmpnd-mgr-transferFrom-underlying-failed" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_846e5515f3943b69728da09b85525376521c6f329758b130b66130c1fe9752fc", + "typeString": "literal_string \"cmpnd-mgr-transferFrom-underlying-failed\"" + } + ], + "id": 2257, + "name": "require", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 7821, + 7822 + ], + "referencedDeclaration": 7822, + "src": "1507:7:16", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 2267, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1507:145:16", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 2268, + "nodeType": "ExpressionStatement", + "src": "1507:145:16" + } + ] + }, + "documentation": null, + "id": 2270, + "implemented": true, + "kind": "function", + "modifiers": [], + "name": "_transferFromUnderlying", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 2247, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 2240, + "name": "sender", + "nodeType": "VariableDeclaration", + "scope": 2270, + "src": "1333:14:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 2239, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1333:7:16", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2242, + "name": "recipient", + "nodeType": "VariableDeclaration", + "scope": 2270, + "src": "1357:17:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 2241, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1357:7:16", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2244, + "name": "cToken", + "nodeType": "VariableDeclaration", + "scope": 2270, + "src": "1384:14:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 2243, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1384:7:16", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2246, + "name": "amount", + "nodeType": "VariableDeclaration", + "scope": 2270, + "src": "1408:14:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2245, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "1408:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "1323:105:16" + }, + "returnParameters": { + "id": 2248, + "nodeType": "ParameterList", + "parameters": [], + "src": "1438:0:16" + }, + "scope": 2837, + "src": "1291:368:16", + "stateMutability": "nonpayable", + "superFunction": null, + "visibility": "internal" + }, + { + "body": { + "id": 2310, + "nodeType": "Block", + "src": "1784:350:16", + "statements": [ + { + "condition": { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "id": 2281, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "id": 2279, + "name": "cToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2272, + "src": "1798:6:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "BinaryOperation", + "operator": "==", + "rightExpression": { + "argumentTypes": null, + "id": 2280, + "name": "CEtherAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2180, + "src": "1808:13:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "src": "1798:23:16", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + "falseBody": { + "id": 2308, + "nodeType": "Block", + "src": "1886:242:16", + "statements": [ + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2302, + "name": "recipient", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2274, + "src": "1992:9:16", + "typeDescriptions": { + "typeIdentifier": "t_address", "typeString": "address" } }, { "argumentTypes": null, - "id": 2240, + "id": 2303, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2213, - "src": "1377:6:16", + "referencedDeclaration": 2276, + "src": "2023:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1448,12 +1973,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2233, + "id": 2296, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2209, - "src": "1335:6:16", + "referencedDeclaration": 2272, + "src": "1940:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1467,18 +1992,18 @@ "typeString": "address" } ], - "id": 2232, + "id": 2295, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "1327:7:16", + "referencedDeclaration": 884, + "src": "1932:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2234, + "id": 2297, "isConstant": false, "isLValue": false, "isPure": false, @@ -1486,27 +2011,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1327:15:16", + "src": "1932:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2235, + "id": 2298, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "1327:26:16", + "referencedDeclaration": 835, + "src": "1932:26:16", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 2236, + "id": 2299, "isConstant": false, "isLValue": false, "isPure": false, @@ -1514,7 +2039,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1327:28:16", + "src": "1932:28:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1528,18 +2053,18 @@ "typeString": "address" } ], - "id": 2231, + "id": 2294, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 120, - "src": "1320:6:16", + "src": "1925:6:16", "typeDescriptions": { "typeIdentifier": "t_type$_t_contract$_IERC20_$120_$", "typeString": "type(contract IERC20)" } }, - "id": 2237, + "id": 2300, "isConstant": false, "isLValue": false, "isPure": false, @@ -1547,13 +2072,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1320:36:16", + "src": "1925:36:16", "typeDescriptions": { "typeIdentifier": "t_contract$_IERC20_$120", "typeString": "contract IERC20" } }, - "id": 2238, + "id": 2301, "isConstant": false, "isLValue": false, "isPure": false, @@ -1561,13 +2086,13 @@ "memberName": "transfer", "nodeType": "MemberAccess", "referencedDeclaration": 59, - "src": "1320:45:16", + "src": "1925:45:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2241, + "id": 2304, "isConstant": false, "isLValue": false, "isPure": false, @@ -1575,7 +2100,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1320:64:16", + "src": "1925:122:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1583,21 +2108,21 @@ }, { "argumentTypes": null, - "hexValue": "636d706e642d6d67722d7472616e736665722d6661696c6564", - "id": 2242, + "hexValue": "636d706e642d6d67722d7472616e736665722d756e6465726c79696e672d6661696c6564", + "id": 2305, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "1402:27:16", + "src": "2065:38:16", "subdenomination": null, "typeDescriptions": { - "typeIdentifier": "t_stringliteral_a0b492c6552587e508e318f471f5c8125b6edf0db99286af9f7919fd44bd2148", - "typeString": "literal_string \"cmpnd-mgr-transfer-failed\"" + "typeIdentifier": "t_stringliteral_eb556e8ac6248652710a553e310393750ebf619ce763819fd0e93bcd4cf6350f", + "typeString": "literal_string \"cmpnd-mgr-transfer-underlying-failed\"" }, - "value": "cmpnd-mgr-transfer-failed" + "value": "cmpnd-mgr-transfer-underlying-failed" } ], "expression": { @@ -1607,202 +2132,500 @@ "typeString": "bool" }, { - "typeIdentifier": "t_stringliteral_a0b492c6552587e508e318f471f5c8125b6edf0db99286af9f7919fd44bd2148", - "typeString": "literal_string \"cmpnd-mgr-transfer-failed\"" + "typeIdentifier": "t_stringliteral_eb556e8ac6248652710a553e310393750ebf619ce763819fd0e93bcd4cf6350f", + "typeString": "literal_string \"cmpnd-mgr-transfer-underlying-failed\"" } ], - "id": 2230, + "id": 2293, "name": "require", "nodeType": "Identifier", - "overloadedDeclarations": [ - 7830, - 7831 - ], - "referencedDeclaration": 7831, - "src": "1295:7:16", + "overloadedDeclarations": [ + 7821, + 7822 + ], + "referencedDeclaration": 7822, + "src": "1900:7:16", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 2306, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1900:217:16", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 2307, + "nodeType": "ExpressionStatement", + "src": "1900:217:16" + } + ] + }, + "id": 2309, + "nodeType": "IfStatement", + "src": "1794:334:16", + "trueBody": { + "id": 2292, + "nodeType": "Block", + "src": "1823:57:16", + "statements": [ + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "", + "id": 2289, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "1866:2:16", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", + "typeString": "literal_string \"\"" + }, + "value": "" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", + "typeString": "literal_string \"\"" + } + ], + "arguments": [ + { + "argumentTypes": null, + "id": 2287, + "name": "amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2276, + "src": "1858:6:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 2282, + "name": "recipient", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2274, + "src": "1837:9:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "id": 2285, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "call", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "1837:14:16", + "typeDescriptions": { + "typeIdentifier": "t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$", + "typeString": "function (bytes memory) payable returns (bool,bytes memory)" + } + }, + "id": 2286, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "value", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "1837:20:16", + "typeDescriptions": { + "typeIdentifier": "t_function_setvalue_pure$_t_uint256_$returns$_t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$value_$", + "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" + } + }, + "id": 2288, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1837:28:16", + "typeDescriptions": { + "typeIdentifier": "t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$value", + "typeString": "function (bytes memory) payable returns (bool,bytes memory)" + } + }, + "id": 2290, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1837:32:16", + "typeDescriptions": { + "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$", + "typeString": "tuple(bool,bytes memory)" + } + }, + "id": 2291, + "nodeType": "ExpressionStatement", + "src": "1837:32:16" + } + ] + } + } + ] + }, + "documentation": null, + "id": 2311, + "implemented": true, + "kind": "function", + "modifiers": [], + "name": "_transferUnderlying", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 2277, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 2272, + "name": "cToken", + "nodeType": "VariableDeclaration", + "scope": 2311, + "src": "1703:14:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 2271, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1703:7:16", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2274, + "name": "recipient", + "nodeType": "VariableDeclaration", + "scope": 2311, + "src": "1727:17:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 2273, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1727:7:16", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2276, + "name": "amount", + "nodeType": "VariableDeclaration", + "scope": 2311, + "src": "1754:14:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2275, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "1754:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "1693:81:16" + }, + "returnParameters": { + "id": 2278, + "nodeType": "ParameterList", + "parameters": [], + "src": "1784:0:16" + }, + "scope": 2837, + "src": "1665:469:16", + "stateMutability": "nonpayable", + "superFunction": null, + "visibility": "internal" + }, + { + "body": { + "id": 2331, + "nodeType": "Block", + "src": "2230:130:16", + "statements": [ + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2325, + "name": "recipient", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2315, + "src": "2284:9:16", "typeDescriptions": { - "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", - "typeString": "function (bool,string memory) pure" + "typeIdentifier": "t_address", + "typeString": "address" } }, - "id": 2243, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1295:148:16", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" + { + "argumentTypes": null, + "id": 2326, + "name": "amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2317, + "src": "2295:6:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } } - }, - "id": 2244, - "nodeType": "ExpressionStatement", - "src": "1295:148:16" - } - ] - }, - "id": 2246, - "nodeType": "IfStatement", - "src": "1189:265:16", - "trueBody": { - "id": 2229, - "nodeType": "Block", - "src": "1218:57:16", - "statements": [ - { + ], "expression": { - "argumentTypes": null, - "arguments": [ + "argumentTypes": [ { - "argumentTypes": null, - "hexValue": "", - "id": 2226, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "string", - "lValueRequested": false, - "nodeType": "Literal", - "src": "1261:2:16", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", - "typeString": "literal_string \"\"" - }, - "value": "" + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } ], "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", - "typeString": "literal_string \"\"" - } - ], + "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2224, - "name": "amount", + "id": 2322, + "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2213, - "src": "1253:6:16", + "referencedDeclaration": 2313, + "src": "2268:5:16", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } } ], "expression": { "argumentTypes": [ { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } ], - "expression": { - "argumentTypes": null, - "expression": { - "argumentTypes": null, - "id": 2219, - "name": "recipient", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2211, - "src": "1232:9:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "id": 2222, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "call", - "nodeType": "MemberAccess", - "referencedDeclaration": null, - "src": "1232:14:16", - "typeDescriptions": { - "typeIdentifier": "t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$", - "typeString": "function (bytes memory) payable returns (bool,bytes memory)" - } - }, - "id": 2223, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "value", - "nodeType": "MemberAccess", - "referencedDeclaration": null, - "src": "1232:20:16", + "id": 2321, + "name": "IERC20", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 120, + "src": "2261:6:16", "typeDescriptions": { - "typeIdentifier": "t_function_setvalue_pure$_t_uint256_$returns$_t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$value_$", - "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" + "typeIdentifier": "t_type$_t_contract$_IERC20_$120_$", + "typeString": "type(contract IERC20)" } }, - "id": 2225, + "id": 2323, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", + "kind": "typeConversion", "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1232:28:16", + "src": "2261:13:16", "typeDescriptions": { - "typeIdentifier": "t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$value", - "typeString": "function (bytes memory) payable returns (bool,bytes memory)" + "typeIdentifier": "t_contract$_IERC20_$120", + "typeString": "contract IERC20" } }, - "id": 2227, + "id": 2324, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1232:32:16", + "memberName": "transfer", + "nodeType": "MemberAccess", + "referencedDeclaration": 59, + "src": "2261:22:16", "typeDescriptions": { - "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$", - "typeString": "tuple(bool,bytes memory)" + "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", + "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2228, - "nodeType": "ExpressionStatement", - "src": "1232:32:16" + "id": 2327, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2261:41:16", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + { + "argumentTypes": null, + "hexValue": "636d706e642d6d67722d7472616e736665722d6661696c6564", + "id": 2328, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "2316:27:16", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_a0b492c6552587e508e318f471f5c8125b6edf0db99286af9f7919fd44bd2148", + "typeString": "literal_string \"cmpnd-mgr-transfer-failed\"" + }, + "value": "cmpnd-mgr-transfer-failed" } - ] - } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_a0b492c6552587e508e318f471f5c8125b6edf0db99286af9f7919fd44bd2148", + "typeString": "literal_string \"cmpnd-mgr-transfer-failed\"" + } + ], + "id": 2320, + "name": "require", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 7821, + 7822 + ], + "referencedDeclaration": 7822, + "src": "2240:7:16", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 2329, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2240:113:16", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 2330, + "nodeType": "ExpressionStatement", + "src": "2240:113:16" } ] }, "documentation": null, - "id": 2248, + "id": 2332, "implemented": true, "kind": "function", "modifiers": [], "name": "_transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 2214, + "id": 2318, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2209, - "name": "cToken", + "id": 2313, + "name": "token", "nodeType": "VariableDeclaration", - "scope": 2248, - "src": "1101:14:16", + "scope": 2332, + "src": "2159:13:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1810,10 +2633,10 @@ "typeString": "address" }, "typeName": { - "id": 2208, + "id": 2312, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1101:7:16", + "src": "2159:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1825,11 +2648,11 @@ }, { "constant": false, - "id": 2211, + "id": 2315, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 2248, - "src": "1125:17:16", + "scope": 2332, + "src": "2174:17:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1837,10 +2660,10 @@ "typeString": "address" }, "typeName": { - "id": 2210, + "id": 2314, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1125:7:16", + "src": "2174:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1852,11 +2675,11 @@ }, { "constant": false, - "id": 2213, + "id": 2317, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2248, - "src": "1152:11:16", + "scope": 2332, + "src": "2193:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1864,10 +2687,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2212, - "name": "uint", + "id": 2316, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1152:4:16", + "src": "2193:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1877,38 +2700,38 @@ "visibility": "internal" } ], - "src": "1091:78:16" + "src": "2158:50:16" }, "returnParameters": { - "id": 2215, + "id": 2319, "nodeType": "ParameterList", "parameters": [], - "src": "1179:0:16" + "src": "2230:0:16" }, - "scope": 2785, - "src": "1073:387:16", + "scope": 2837, + "src": "2140:220:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 2287, + "id": 2371, "nodeType": "Block", - "src": "1593:302:16", + "src": "2491:321:16", "statements": [ { "assignments": [ - 2257 + 2341 ], "declarations": [ { "constant": false, - "id": 2257, + "id": 2341, "name": "errors", "nodeType": "VariableDeclaration", - "scope": 2287, - "src": "1670:20:16", + "scope": 2371, + "src": "2568:23:16", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -1917,19 +2740,19 @@ }, "typeName": { "baseType": { - "id": 2255, - "name": "uint", + "id": 2339, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1670:4:16", + "src": "2568:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2256, + "id": 2340, "length": null, "nodeType": "ArrayTypeName", - "src": "1670:6:16", + "src": "2568:9:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -1939,18 +2762,18 @@ "visibility": "internal" } ], - "id": 2264, + "id": 2348, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2262, + "id": 2346, "name": "cTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2251, - "src": "1747:7:16", + "referencedDeclaration": 2335, + "src": "2661:7:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -1969,12 +2792,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2259, + "id": 2343, "name": "CompoundComptrollerAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2147, - "src": "1706:26:16", + "referencedDeclaration": 2177, + "src": "2607:26:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1988,18 +2811,18 @@ "typeString": "address" } ], - "id": 2258, + "id": 2342, "name": "IComptroller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1096, - "src": "1693:12:16", + "referencedDeclaration": 1122, + "src": "2594:12:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IComptroller_$1096_$", + "typeIdentifier": "t_type$_t_contract$_IComptroller_$1122_$", "typeString": "type(contract IComptroller)" } }, - "id": 2260, + "id": 2344, "isConstant": false, "isLValue": false, "isPure": true, @@ -2007,27 +2830,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1693:40:16", + "src": "2594:40:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_IComptroller_$1096", + "typeIdentifier": "t_contract$_IComptroller_$1122", "typeString": "contract IComptroller" } }, - "id": 2261, + "id": 2345, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "enterMarkets", "nodeType": "MemberAccess", - "referencedDeclaration": 884, - "src": "1693:53:16", + "referencedDeclaration": 910, + "src": "2594:66:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_array$_t_address_$dyn_memory_ptr_$returns$_t_array$_t_uint256_$dyn_memory_ptr_$", "typeString": "function (address[] memory) external returns (uint256[] memory)" } }, - "id": 2263, + "id": 2347, "isConstant": false, "isLValue": false, "isPure": false, @@ -2035,20 +2858,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1693:62:16", + "src": "2594:75:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, "nodeType": "VariableDeclarationStatement", - "src": "1670:85:16" + "src": "2568:101:16" }, { "body": { - "id": 2285, + "id": 2369, "nodeType": "Block", - "src": "1807:82:16", + "src": "2724:82:16", "statements": [ { "expression": { @@ -2060,7 +2883,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2281, + "id": 2365, "isConstant": false, "isLValue": false, "isPure": false, @@ -2069,26 +2892,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2277, + "id": 2361, "name": "errors", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2257, - "src": "1829:6:16", + "referencedDeclaration": 2341, + "src": "2746:6:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 2279, + "id": 2363, "indexExpression": { "argumentTypes": null, - "id": 2278, + "id": 2362, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2266, - "src": "1836:1:16", + "referencedDeclaration": 2350, + "src": "2753:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2099,7 +2922,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "1829:9:16", + "src": "2746:9:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2110,14 +2933,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2280, + "id": 2364, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1842:1:16", + "src": "2759:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -2125,7 +2948,7 @@ }, "value": "0" }, - "src": "1829:14:16", + "src": "2746:14:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2134,14 +2957,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d656e7465722d6d61726b6574732d6661696c6564", - "id": 2282, + "id": 2366, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "1845:32:16", + "src": "2762:32:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_85cee76b557302ef3f4a648369ff7a7022c2205f14450535d6d8fab4f8b0677e", @@ -2161,21 +2984,21 @@ "typeString": "literal_string \"cmpnd-mgr-enter-markets-failed\"" } ], - "id": 2276, + "id": 2360, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "1821:7:16", + "referencedDeclaration": 7822, + "src": "2738:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2283, + "id": 2367, "isConstant": false, "isLValue": false, "isPure": false, @@ -2183,15 +3006,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1821:57:16", + "src": "2738:57:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2284, + "id": 2368, "nodeType": "ExpressionStatement", - "src": "1821:57:16" + "src": "2738:57:16" } ] }, @@ -2201,19 +3024,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2272, + "id": 2356, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2269, + "id": 2353, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2266, - "src": "1783:1:16", + "referencedDeclaration": 2350, + "src": "2700:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2225,18 +3048,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2270, + "id": 2354, "name": "errors", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2257, - "src": "1787:6:16", + "referencedDeclaration": 2341, + "src": "2704:6:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 2271, + "id": 2355, "isConstant": false, "isLValue": false, "isPure": false, @@ -2244,31 +3067,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "1787:13:16", + "src": "2704:13:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1783:17:16", + "src": "2700:17:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2286, + "id": 2370, "initializationExpression": { "assignments": [ - 2266 + 2350 ], "declarations": [ { "constant": false, - "id": 2266, + "id": 2350, "name": "i", "nodeType": "VariableDeclaration", - "scope": 2286, - "src": "1771:6:16", + "scope": 2370, + "src": "2685:9:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2276,10 +3099,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2265, - "name": "uint", + "id": 2349, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1771:4:16", + "src": "2685:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2289,18 +3112,18 @@ "visibility": "internal" } ], - "id": 2268, + "id": 2352, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 2267, + "id": 2351, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1780:1:16", + "src": "2697:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -2309,12 +3132,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "1771:10:16" + "src": "2685:13:16" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 2274, + "id": 2358, "isConstant": false, "isLValue": false, "isPure": false, @@ -2322,15 +3145,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "1802:3:16", + "src": "2719:3:16", "subExpression": { "argumentTypes": null, - "id": 2273, + "id": 2357, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2266, - "src": "1802:1:16", + "referencedDeclaration": 2350, + "src": "2719:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2341,33 +3164,33 @@ "typeString": "uint256" } }, - "id": 2275, + "id": 2359, "nodeType": "ExpressionStatement", - "src": "1802:3:16" + "src": "2719:3:16" }, "nodeType": "ForStatement", - "src": "1766:123:16" + "src": "2680:126:16" } ] }, "documentation": null, - "id": 2288, + "id": 2372, "implemented": true, "kind": "function", "modifiers": [], "name": "enterMarkets", "nodeType": "FunctionDefinition", "parameters": { - "id": 2252, + "id": 2336, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2251, + "id": 2335, "name": "cTokens", "nodeType": "VariableDeclaration", - "scope": 2288, - "src": "1497:24:16", + "scope": 2372, + "src": "2397:24:16", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -2376,20 +3199,20 @@ }, "typeName": { "baseType": { - "id": 2249, + "id": 2333, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1497:7:16", + "src": "2397:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 2250, + "id": 2334, "length": null, "nodeType": "ArrayTypeName", - "src": "1497:9:16", + "src": "2397:9:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -2399,38 +3222,38 @@ "visibility": "internal" } ], - "src": "1487:98:16" + "src": "2387:96:16" }, "returnParameters": { - "id": 2253, + "id": 2337, "nodeType": "ParameterList", "parameters": [], - "src": "1593:0:16" + "src": "2491:0:16" }, - "scope": 2785, - "src": "1466:429:16", + "scope": 2837, + "src": "2366:446:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2316, + "id": 2400, "nodeType": "Block", - "src": "1982:264:16", + "src": "2880:264:16", "statements": [ { "assignments": [ - 2296 + 2380 ], "declarations": [ { "constant": false, - "id": 2296, + "id": 2380, "name": "underlying", "nodeType": "VariableDeclaration", - "scope": 2316, - "src": "2051:18:16", + "scope": 2400, + "src": "2949:18:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2438,10 +3261,10 @@ "typeString": "address" }, "typeName": { - "id": 2295, + "id": 2379, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2051:7:16", + "src": "2949:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2452,7 +3275,7 @@ "visibility": "internal" } ], - "id": 2302, + "id": 2386, "initialValue": { "argumentTypes": null, "arguments": [], @@ -2463,12 +3286,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2298, + "id": 2382, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2290, - "src": "2080:6:16", + "referencedDeclaration": 2374, + "src": "2978:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2482,18 +3305,18 @@ "typeString": "address" } ], - "id": 2297, + "id": 2381, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "2072:7:16", + "referencedDeclaration": 884, + "src": "2970:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2299, + "id": 2383, "isConstant": false, "isLValue": false, "isPure": false, @@ -2501,27 +3324,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2072:15:16", + "src": "2970:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2300, + "id": 2384, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "2072:26:16", + "referencedDeclaration": 835, + "src": "2970:26:16", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 2301, + "id": 2385, "isConstant": false, "isLValue": false, "isPure": false, @@ -2529,14 +3352,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2072:28:16", + "src": "2970:28:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "2051:49:16" + "src": "2949:49:16" }, { "expression": { @@ -2548,7 +3371,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2312, + "id": 2396, "isConstant": false, "isLValue": false, "isPure": false, @@ -2558,12 +3381,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2308, + "id": 2392, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2290, - "src": "2158:6:16", + "referencedDeclaration": 2374, + "src": "3056:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2571,12 +3394,12 @@ }, { "argumentTypes": null, - "id": 2309, + "id": 2393, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2292, - "src": "2166:6:16", + "referencedDeclaration": 2376, + "src": "3064:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2599,12 +3422,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2305, + "id": 2389, "name": "underlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2296, - "src": "2138:10:16", + "referencedDeclaration": 2380, + "src": "3036:10:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2618,18 +3441,18 @@ "typeString": "address" } ], - "id": 2304, + "id": 2388, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 120, - "src": "2131:6:16", + "src": "3029:6:16", "typeDescriptions": { "typeIdentifier": "t_type$_t_contract$_IERC20_$120_$", "typeString": "type(contract IERC20)" } }, - "id": 2306, + "id": 2390, "isConstant": false, "isLValue": false, "isPure": false, @@ -2637,13 +3460,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2131:18:16", + "src": "3029:18:16", "typeDescriptions": { "typeIdentifier": "t_contract$_IERC20_$120", "typeString": "contract IERC20" } }, - "id": 2307, + "id": 2391, "isConstant": false, "isLValue": false, "isPure": false, @@ -2651,13 +3474,13 @@ "memberName": "approve", "nodeType": "MemberAccess", "referencedDeclaration": 77, - "src": "2131:26:16", + "src": "3029:26:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2310, + "id": 2394, "isConstant": false, "isLValue": false, "isPure": false, @@ -2665,7 +3488,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2131:42:16", + "src": "3029:42:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2676,14 +3499,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2311, + "id": 2395, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "2177:4:16", + "src": "3075:4:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -2691,7 +3514,7 @@ }, "value": "true" }, - "src": "2131:50:16", + "src": "3029:50:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2700,14 +3523,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564", - "id": 2313, + "id": 2397, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2195:34:16", + "src": "3093:34:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_ca9a377afbc7098beb603cadabe94f2184e0ef6e022546af9554c879436a6067", @@ -2727,21 +3550,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-approved-failed\"" } ], - "id": 2303, + "id": 2387, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "2110:7:16", + "referencedDeclaration": 7822, + "src": "3008:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2314, + "id": 2398, "isConstant": false, "isLValue": false, "isPure": false, @@ -2749,36 +3572,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2110:129:16", + "src": "3008:129:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2315, + "id": 2399, "nodeType": "ExpressionStatement", - "src": "2110:129:16" + "src": "3008:129:16" } ] }, "documentation": null, - "id": 2317, + "id": 2401, "implemented": true, "kind": "function", "modifiers": [], "name": "approveCToken", "nodeType": "FunctionDefinition", "parameters": { - "id": 2293, + "id": 2377, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2290, + "id": 2374, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2317, - "src": "1933:14:16", + "scope": 2401, + "src": "2841:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2786,10 +3609,10 @@ "typeString": "address" }, "typeName": { - "id": 2289, + "id": 2373, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1933:7:16", + "src": "2841:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2801,11 +3624,11 @@ }, { "constant": false, - "id": 2292, + "id": 2376, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2317, - "src": "1957:11:16", + "scope": 2401, + "src": "2857:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2813,10 +3636,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2291, - "name": "uint", + "id": 2375, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1957:4:16", + "src": "2857:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2826,31 +3649,31 @@ "visibility": "internal" } ], - "src": "1923:51:16" + "src": "2840:32:16" }, "returnParameters": { - "id": 2294, + "id": 2378, "nodeType": "ParameterList", "parameters": [], - "src": "1982:0:16" + "src": "2880:0:16" }, - "scope": 2785, - "src": "1901:345:16", + "scope": 2837, + "src": "2818:326:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2353, + "id": 2437, "nodeType": "Block", - "src": "2347:228:16", + "src": "3242:234:16", "statements": [ { "body": { - "id": 2351, + "id": 2435, "nodeType": "Block", - "src": "2399:170:16", + "src": "3297:173:16", "statements": [ { "condition": { @@ -2859,7 +3682,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2338, + "id": 2422, "isConstant": false, "isLValue": false, "isPure": false, @@ -2868,26 +3691,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2334, + "id": 2418, "name": "cTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2320, - "src": "2462:7:16", + "referencedDeclaration": 2404, + "src": "3360:7:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 2336, + "id": 2420, "indexExpression": { "argumentTypes": null, - "id": 2335, + "id": 2419, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2324, - "src": "2470:1:16", + "referencedDeclaration": 2408, + "src": "3368:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2898,7 +3721,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2462:10:16", + "src": "3360:10:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2908,31 +3731,31 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 2337, + "id": 2421, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "2476:13:16", + "referencedDeclaration": 2180, + "src": "3374:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "2462:27:16", + "src": "3360:27:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2350, + "id": 2434, "nodeType": "IfStatement", - "src": "2458:101:16", + "src": "3356:104:16", "trueBody": { - "id": 2349, + "id": 2433, "nodeType": "Block", - "src": "2491:68:16", + "src": "3389:71:16", "statements": [ { "expression": { @@ -2942,26 +3765,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2340, + "id": 2424, "name": "cTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2320, - "src": "2523:7:16", + "referencedDeclaration": 2404, + "src": "3421:7:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 2342, + "id": 2426, "indexExpression": { "argumentTypes": null, - "id": 2341, + "id": 2425, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2324, - "src": "2531:1:16", + "referencedDeclaration": 2408, + "src": "3429:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2972,7 +3795,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2523:10:16", + "src": "3421:10:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2983,7 +3806,7 @@ "arguments": [ { "argumentTypes": null, - "id": 2345, + "id": 2429, "isConstant": false, "isLValue": false, "isPure": true, @@ -2991,18 +3814,18 @@ "nodeType": "UnaryOperation", "operator": "-", "prefix": true, - "src": "2540:2:16", + "src": "3441:2:16", "subExpression": { "argumentTypes": null, "hexValue": "31", - "id": 2344, + "id": 2428, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2541:1:16", + "src": "3442:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -3023,20 +3846,20 @@ "typeString": "int_const -1" } ], - "id": 2343, + "id": 2427, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "2535:4:16", + "src": "3433:7:16", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, - "typeName": "uint" + "typeName": "uint256" }, - "id": 2346, + "id": 2430, "isConstant": false, "isLValue": false, "isPure": true, @@ -3044,7 +3867,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2535:8:16", + "src": "3433:11:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3062,18 +3885,18 @@ "typeString": "uint256" } ], - "id": 2339, + "id": 2423, "name": "approveCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2317, - "src": "2509:13:16", + "referencedDeclaration": 2401, + "src": "3407:13:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2347, + "id": 2431, "isConstant": false, "isLValue": false, "isPure": false, @@ -3081,15 +3904,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2509:35:16", + "src": "3407:38:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2348, + "id": 2432, "nodeType": "ExpressionStatement", - "src": "2509:35:16" + "src": "3407:38:16" } ] } @@ -3102,19 +3925,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2330, + "id": 2414, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2327, + "id": 2411, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2324, - "src": "2374:1:16", + "referencedDeclaration": 2408, + "src": "3272:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3126,18 +3949,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2328, + "id": 2412, "name": "cTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2320, - "src": "2378:7:16", + "referencedDeclaration": 2404, + "src": "3276:7:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 2329, + "id": 2413, "isConstant": false, "isLValue": false, "isPure": false, @@ -3145,31 +3968,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2378:14:16", + "src": "3276:14:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2374:18:16", + "src": "3272:18:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2352, + "id": 2436, "initializationExpression": { "assignments": [ - 2324 + 2408 ], "declarations": [ { "constant": false, - "id": 2324, + "id": 2408, "name": "i", "nodeType": "VariableDeclaration", - "scope": 2352, - "src": "2362:6:16", + "scope": 2436, + "src": "3257:9:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3177,10 +4000,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2323, - "name": "uint", + "id": 2407, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2362:4:16", + "src": "3257:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3190,18 +4013,18 @@ "visibility": "internal" } ], - "id": 2326, + "id": 2410, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 2325, + "id": 2409, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2371:1:16", + "src": "3269:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -3210,12 +4033,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "2362:10:16" + "src": "3257:13:16" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 2332, + "id": 2416, "isConstant": false, "isLValue": false, "isPure": false, @@ -3223,15 +4046,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "2394:3:16", + "src": "3292:3:16", "subExpression": { "argumentTypes": null, - "id": 2331, + "id": 2415, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2324, - "src": "2394:1:16", + "referencedDeclaration": 2408, + "src": "3292:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3242,33 +4065,33 @@ "typeString": "uint256" } }, - "id": 2333, + "id": 2417, "nodeType": "ExpressionStatement", - "src": "2394:3:16" + "src": "3292:3:16" }, "nodeType": "ForStatement", - "src": "2357:212:16" + "src": "3252:218:16" } ] }, "documentation": null, - "id": 2354, + "id": 2438, "implemented": true, "kind": "function", "modifiers": [], "name": "approveCTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 2321, + "id": 2405, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2320, + "id": 2404, "name": "cTokens", "nodeType": "VariableDeclaration", - "scope": 2354, - "src": "2285:24:16", + "scope": 2438, + "src": "3183:24:16", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -3277,20 +4100,20 @@ }, "typeName": { "baseType": { - "id": 2318, + "id": 2402, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2285:7:16", + "src": "3183:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 2319, + "id": 2403, "length": null, "nodeType": "ArrayTypeName", - "src": "2285:9:16", + "src": "3183:9:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -3300,25 +4123,25 @@ "visibility": "internal" } ], - "src": "2275:64:16" + "src": "3173:61:16" }, "returnParameters": { - "id": 2322, + "id": 2406, "nodeType": "ParameterList", "parameters": [], - "src": "2347:0:16" + "src": "3242:0:16" }, - "scope": 2785, - "src": "2252:323:16", + "scope": 2837, + "src": "3150:326:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2368, + "id": 2452, "nodeType": "Block", - "src": "2667:71:16", + "src": "3554:71:16", "statements": [ { "expression": { @@ -3326,12 +4149,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2361, + "id": 2445, "name": "cTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2357, - "src": "2690:7:16", + "referencedDeclaration": 2441, + "src": "3577:7:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -3345,18 +4168,18 @@ "typeString": "address[] memory" } ], - "id": 2360, + "id": 2444, "name": "enterMarkets", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2288, - "src": "2677:12:16", + "referencedDeclaration": 2372, + "src": "3564:12:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_array$_t_address_$dyn_memory_ptr_$returns$__$", "typeString": "function (address[] memory)" } }, - "id": 2362, + "id": 2446, "isConstant": false, "isLValue": false, "isPure": false, @@ -3364,15 +4187,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2677:21:16", + "src": "3564:21:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2363, + "id": 2447, "nodeType": "ExpressionStatement", - "src": "2677:21:16" + "src": "3564:21:16" }, { "expression": { @@ -3380,12 +4203,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2365, + "id": 2449, "name": "cTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2357, - "src": "2723:7:16", + "referencedDeclaration": 2441, + "src": "3610:7:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -3399,18 +4222,18 @@ "typeString": "address[] memory" } ], - "id": 2364, + "id": 2448, "name": "approveCTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2354, - "src": "2708:14:16", + "referencedDeclaration": 2438, + "src": "3595:14:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_array$_t_address_$dyn_memory_ptr_$returns$__$", "typeString": "function (address[] memory)" } }, - "id": 2366, + "id": 2450, "isConstant": false, "isLValue": false, "isPure": false, @@ -3418,36 +4241,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2708:23:16", + "src": "3595:23:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2367, + "id": 2451, "nodeType": "ExpressionStatement", - "src": "2708:23:16" + "src": "3595:23:16" } ] }, "documentation": null, - "id": 2369, + "id": 2453, "implemented": true, "kind": "function", "modifiers": [], "name": "enterMarketsAndApproveCTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 2358, + "id": 2442, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2357, + "id": 2441, "name": "cTokens", "nodeType": "VariableDeclaration", - "scope": 2369, - "src": "2629:24:16", + "scope": 2453, + "src": "3521:24:16", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -3456,20 +4279,20 @@ }, "typeName": { "baseType": { - "id": 2355, + "id": 2439, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2629:7:16", + "src": "3521:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 2356, + "id": 2440, "length": null, "nodeType": "ArrayTypeName", - "src": "2629:9:16", + "src": "3521:9:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -3479,25 +4302,25 @@ "visibility": "internal" } ], - "src": "2619:40:16" + "src": "3520:26:16" }, "returnParameters": { - "id": 2359, + "id": 2443, "nodeType": "ParameterList", "parameters": [], - "src": "2667:0:16" + "src": "3554:0:16" }, - "scope": 2785, - "src": "2581:157:16", + "scope": 2837, + "src": "3482:143:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2382, + "id": 2466, "nodeType": "Block", - "src": "2780:63:16", + "src": "3667:63:16", "statements": [ { "expression": { @@ -3510,18 +4333,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2377, + "id": 2461, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "2824:3:16", + "referencedDeclaration": 7818, + "src": "3711:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2378, + "id": 2462, "isConstant": false, "isLValue": false, "isPure": false, @@ -3529,7 +4352,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2824:9:16", + "src": "3711:9:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3550,12 +4373,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2373, + "id": 2457, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "2798:13:16", + "referencedDeclaration": 2180, + "src": "3685:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3569,18 +4392,18 @@ "typeString": "address" } ], - "id": 2372, + "id": 2456, "name": "ICEther", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 732, - "src": "2790:7:16", + "referencedDeclaration": 745, + "src": "3677:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICEther_$732_$", + "typeIdentifier": "t_type$_t_contract$_ICEther_$745_$", "typeString": "type(contract ICEther)" } }, - "id": 2374, + "id": 2458, "isConstant": false, "isLValue": false, "isPure": true, @@ -3588,13 +4411,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2790:22:16", + "src": "3677:22:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICEther_$732", + "typeIdentifier": "t_contract$_ICEther_$745", "typeString": "contract ICEther" } }, - "id": 2375, + "id": 2459, "isConstant": false, "isLValue": false, "isPure": false, @@ -3602,13 +4425,13 @@ "memberName": "mint", "nodeType": "MemberAccess", "referencedDeclaration": 674, - "src": "2790:27:16", + "src": "3677:27:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$__$returns$__$", "typeString": "function () payable external" } }, - "id": 2376, + "id": 2460, "isConstant": false, "isLValue": false, "isPure": false, @@ -3616,13 +4439,13 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2790:33:16", + "src": "3677:33:16", "typeDescriptions": { "typeIdentifier": "t_function_setvalue_pure$_t_uint256_$returns$_t_function_external_payable$__$returns$__$value_$", "typeString": "function (uint256) pure returns (function () payable external)" } }, - "id": 2379, + "id": 2463, "isConstant": false, "isLValue": false, "isPure": false, @@ -3630,13 +4453,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2790:44:16", + "src": "3677:44:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$__$returns$__$value", "typeString": "function () payable external" } }, - "id": 2380, + "id": 2464, "isConstant": false, "isLValue": false, "isPure": false, @@ -3644,48 +4467,48 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2790:46:16", + "src": "3677:46:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2381, + "id": 2465, "nodeType": "ExpressionStatement", - "src": "2790:46:16" + "src": "3677:46:16" } ] }, "documentation": null, - "id": 2383, + "id": 2467, "implemented": true, "kind": "function", "modifiers": [], "name": "supplyETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 2370, + "id": 2454, "nodeType": "ParameterList", "parameters": [], - "src": "2762:2:16" + "src": "3649:2:16" }, "returnParameters": { - "id": 2371, + "id": 2455, "nodeType": "ParameterList", "parameters": [], - "src": "2780:0:16" + "src": "3667:0:16" }, - "scope": 2785, - "src": "2744:99:16", + "scope": 2837, + "src": "3631:99:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2422, + "id": 2506, "nodeType": "Block", - "src": "2909:369:16", + "src": "3799:373:16", "statements": [ { "condition": { @@ -3694,19 +4517,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2392, + "id": 2476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2390, + "id": 2474, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2385, - "src": "2923:6:16", + "referencedDeclaration": 2469, + "src": "3813:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3716,27 +4539,27 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2391, + "id": 2475, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "2933:13:16", + "referencedDeclaration": 2180, + "src": "3823:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "2923:23:16", + "src": "3813:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2420, + "id": 2504, "nodeType": "Block", - "src": "3022:250:16", + "src": "3912:254:16", "statements": [ { "expression": { @@ -3744,12 +4567,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2404, + "id": 2488, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2385, - "src": "3113:6:16", + "referencedDeclaration": 2469, + "src": "4003:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3757,12 +4580,12 @@ }, { "argumentTypes": null, - "id": 2405, + "id": 2489, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2387, - "src": "3121:6:16", + "referencedDeclaration": 2471, + "src": "4011:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3780,18 +4603,18 @@ "typeString": "uint256" } ], - "id": 2403, + "id": 2487, "name": "approveCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2317, - "src": "3099:13:16", + "referencedDeclaration": 2401, + "src": "3989:13:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2406, + "id": 2490, "isConstant": false, "isLValue": false, "isPure": false, @@ -3799,15 +4622,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3099:29:16", + "src": "3989:29:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2407, + "id": 2491, "nodeType": "ExpressionStatement", - "src": "3099:29:16" + "src": "3989:29:16" }, { "expression": { @@ -3819,7 +4642,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2416, + "id": 2500, "isConstant": false, "isLValue": false, "isPure": false, @@ -3829,12 +4652,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2413, + "id": 2497, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2387, - "src": "3187:6:16", + "referencedDeclaration": 2471, + "src": "4079:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3853,12 +4676,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2410, + "id": 2494, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2385, - "src": "3174:6:16", + "referencedDeclaration": 2469, + "src": "4066:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3872,18 +4695,18 @@ "typeString": "address" } ], - "id": 2409, + "id": 2493, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "3166:7:16", + "referencedDeclaration": 884, + "src": "4058:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2411, + "id": 2495, "isConstant": false, "isLValue": false, "isPure": false, @@ -3891,27 +4714,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3166:15:16", + "src": "4058:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2412, + "id": 2496, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "mint", "nodeType": "MemberAccess", - "referencedDeclaration": 741, - "src": "3166:20:16", + "referencedDeclaration": 754, + "src": "4058:20:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 2414, + "id": 2498, "isConstant": false, "isLValue": false, "isPure": false, @@ -3919,7 +4742,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3166:28:16", + "src": "4058:28:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3930,14 +4753,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2415, + "id": 2499, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "3198:1:16", + "src": "4090:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -3945,7 +4768,7 @@ }, "value": "0" }, - "src": "3166:33:16", + "src": "4058:33:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3954,14 +4777,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d737570706c792d6661696c6564", - "id": 2417, + "id": 2501, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3215:32:16", + "src": "4109:32:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_eed4d8ac9ec37feeb59d4f3eed660d16ce6b6d4c1e0f69c896f2a21b54a727bc", @@ -3981,21 +4804,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-supply-failed\"" } ], - "id": 2408, + "id": 2492, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "3143:7:16", + "referencedDeclaration": 7822, + "src": "4033:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2418, + "id": 2502, "isConstant": false, "isLValue": false, "isPure": false, @@ -4003,25 +4826,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3143:118:16", + "src": "4033:122:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2419, + "id": 2503, "nodeType": "ExpressionStatement", - "src": "3143:118:16" + "src": "4033:122:16" } ] }, - "id": 2421, + "id": 2505, "nodeType": "IfStatement", - "src": "2919:353:16", + "src": "3809:357:16", "trueBody": { - "id": 2402, + "id": 2486, "nodeType": "Block", - "src": "2948:68:16", + "src": "3838:68:16", "statements": [ { "expression": { @@ -4032,12 +4855,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2398, + "id": 2482, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2387, - "src": "2996:6:16", + "referencedDeclaration": 2471, + "src": "3886:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4058,12 +4881,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2394, + "id": 2478, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "2970:13:16", + "referencedDeclaration": 2180, + "src": "3860:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4077,18 +4900,18 @@ "typeString": "address" } ], - "id": 2393, + "id": 2477, "name": "ICEther", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 732, - "src": "2962:7:16", + "referencedDeclaration": 745, + "src": "3852:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICEther_$732_$", + "typeIdentifier": "t_type$_t_contract$_ICEther_$745_$", "typeString": "type(contract ICEther)" } }, - "id": 2395, + "id": 2479, "isConstant": false, "isLValue": false, "isPure": true, @@ -4096,13 +4919,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2962:22:16", + "src": "3852:22:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICEther_$732", + "typeIdentifier": "t_contract$_ICEther_$745", "typeString": "contract ICEther" } }, - "id": 2396, + "id": 2480, "isConstant": false, "isLValue": false, "isPure": false, @@ -4110,13 +4933,13 @@ "memberName": "mint", "nodeType": "MemberAccess", "referencedDeclaration": 674, - "src": "2962:27:16", + "src": "3852:27:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$__$returns$__$", "typeString": "function () payable external" } }, - "id": 2397, + "id": 2481, "isConstant": false, "isLValue": false, "isPure": false, @@ -4124,13 +4947,13 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2962:33:16", + "src": "3852:33:16", "typeDescriptions": { "typeIdentifier": "t_function_setvalue_pure$_t_uint256_$returns$_t_function_external_payable$__$returns$__$value_$", "typeString": "function (uint256) pure returns (function () payable external)" } }, - "id": 2399, + "id": 2483, "isConstant": false, "isLValue": false, "isPure": false, @@ -4138,13 +4961,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2962:41:16", + "src": "3852:41:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$__$returns$__$value", "typeString": "function () payable external" } }, - "id": 2400, + "id": 2484, "isConstant": false, "isLValue": false, "isPure": false, @@ -4152,15 +4975,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2962:43:16", + "src": "3852:43:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2401, + "id": 2485, "nodeType": "ExpressionStatement", - "src": "2962:43:16" + "src": "3852:43:16" } ] } @@ -4168,23 +4991,23 @@ ] }, "documentation": null, - "id": 2423, + "id": 2507, "implemented": true, "kind": "function", "modifiers": [], "name": "supply", "nodeType": "FunctionDefinition", "parameters": { - "id": 2388, + "id": 2472, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2385, + "id": 2469, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2423, - "src": "2865:14:16", + "scope": 2507, + "src": "3752:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4192,10 +5015,10 @@ "typeString": "address" }, "typeName": { - "id": 2384, + "id": 2468, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2865:7:16", + "src": "3752:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4207,11 +5030,11 @@ }, { "constant": false, - "id": 2387, + "id": 2471, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2423, - "src": "2881:11:16", + "scope": 2507, + "src": "3768:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4219,10 +5042,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2386, - "name": "uint", + "id": 2470, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2881:4:16", + "src": "3768:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4232,25 +5055,25 @@ "visibility": "internal" } ], - "src": "2864:29:16" + "src": "3751:32:16" }, "returnParameters": { - "id": 2389, + "id": 2473, "nodeType": "ParameterList", "parameters": [], - "src": "2909:0:16" + "src": "3799:0:16" }, - "scope": 2785, - "src": "2849:429:16", + "scope": 2837, + "src": "3736:436:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2442, + "id": 2526, "nodeType": "Block", - "src": "3342:101:16", + "src": "4239:135:16", "statements": [ { "expression": { @@ -4262,7 +5085,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2438, + "id": 2522, "isConstant": false, "isLValue": false, "isPure": false, @@ -4272,12 +5095,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2435, + "id": 2519, "name": "borrowAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2427, - "src": "3383:12:16", + "referencedDeclaration": 2511, + "src": "4293:12:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4296,12 +5119,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2432, + "id": 2516, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2425, - "src": "3368:6:16", + "referencedDeclaration": 2509, + "src": "4278:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4315,18 +5138,18 @@ "typeString": "address" } ], - "id": 2431, + "id": 2515, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "3360:7:16", + "referencedDeclaration": 884, + "src": "4270:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2433, + "id": 2517, "isConstant": false, "isLValue": false, "isPure": false, @@ -4334,27 +5157,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3360:15:16", + "src": "4270:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2434, + "id": 2518, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "borrow", "nodeType": "MemberAccess", - "referencedDeclaration": 762, - "src": "3360:22:16", + "referencedDeclaration": 775, + "src": "4270:22:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 2436, + "id": 2520, "isConstant": false, "isLValue": false, "isPure": false, @@ -4362,7 +5185,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3360:36:16", + "src": "4270:36:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4373,14 +5196,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2437, + "id": 2521, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "3400:1:16", + "src": "4310:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -4388,7 +5211,7 @@ }, "value": "0" }, - "src": "3360:41:16", + "src": "4270:41:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4397,14 +5220,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d626f72726f772d6661696c6564", - "id": 2439, + "id": 2523, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3403:32:16", + "src": "4325:32:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_336f65677d69bdb738d1bedb5f7651ac26ef11a7eab0993d50138f181bc50513", @@ -4424,21 +5247,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-borrow-failed\"" } ], - "id": 2430, + "id": 2514, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "3352:7:16", + "referencedDeclaration": 7822, + "src": "4249:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2440, + "id": 2524, "isConstant": false, "isLValue": false, "isPure": false, @@ -4446,36 +5269,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3352:84:16", + "src": "4249:118:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2441, + "id": 2525, "nodeType": "ExpressionStatement", - "src": "3352:84:16" + "src": "4249:118:16" } ] }, "documentation": null, - "id": 2443, + "id": 2527, "implemented": true, "kind": "function", "modifiers": [], "name": "borrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 2428, + "id": 2512, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2425, + "id": 2509, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2443, - "src": "3300:14:16", + "scope": 2527, + "src": "4194:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4483,10 +5306,10 @@ "typeString": "address" }, "typeName": { - "id": 2424, + "id": 2508, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3300:7:16", + "src": "4194:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4498,11 +5321,11 @@ }, { "constant": false, - "id": 2427, + "id": 2511, "name": "borrowAmount", "nodeType": "VariableDeclaration", - "scope": 2443, - "src": "3316:17:16", + "scope": 2527, + "src": "4210:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4510,10 +5333,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2426, - "name": "uint", + "id": 2510, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3316:4:16", + "src": "4210:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4523,25 +5346,25 @@ "visibility": "internal" } ], - "src": "3299:35:16" + "src": "4193:38:16" }, "returnParameters": { - "id": 2429, + "id": 2513, "nodeType": "ParameterList", "parameters": [], - "src": "3342:0:16" + "src": "4239:0:16" }, - "scope": 2785, - "src": "3284:159:16", + "scope": 2837, + "src": "4178:196:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2464, + "id": 2548, "nodeType": "Block", - "src": "3609:95:16", + "src": "4546:95:16", "statements": [ { "expression": { @@ -4549,12 +5372,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2455, + "id": 2539, "name": "supplyCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2445, - "src": "3626:12:16", + "referencedDeclaration": 2529, + "src": "4563:12:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4562,12 +5385,12 @@ }, { "argumentTypes": null, - "id": 2456, + "id": 2540, "name": "supplyAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2447, - "src": "3640:12:16", + "referencedDeclaration": 2531, + "src": "4577:12:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4585,18 +5408,18 @@ "typeString": "uint256" } ], - "id": 2454, + "id": 2538, "name": "supply", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2423, - "src": "3619:6:16", + "referencedDeclaration": 2507, + "src": "4556:6:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2457, + "id": 2541, "isConstant": false, "isLValue": false, "isPure": false, @@ -4604,15 +5427,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3619:34:16", + "src": "4556:34:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2458, + "id": 2542, "nodeType": "ExpressionStatement", - "src": "3619:34:16" + "src": "4556:34:16" }, { "expression": { @@ -4620,12 +5443,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2460, + "id": 2544, "name": "borrowCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2449, - "src": "3670:12:16", + "referencedDeclaration": 2533, + "src": "4607:12:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4633,12 +5456,12 @@ }, { "argumentTypes": null, - "id": 2461, + "id": 2545, "name": "borrowAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2451, - "src": "3684:12:16", + "referencedDeclaration": 2535, + "src": "4621:12:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4656,18 +5479,18 @@ "typeString": "uint256" } ], - "id": 2459, + "id": 2543, "name": "borrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "3663:6:16", + "referencedDeclaration": 2527, + "src": "4600:6:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2462, + "id": 2546, "isConstant": false, "isLValue": false, "isPure": false, @@ -4675,36 +5498,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3663:34:16", + "src": "4600:34:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2463, + "id": 2547, "nodeType": "ExpressionStatement", - "src": "3663:34:16" + "src": "4600:34:16" } ] }, "documentation": null, - "id": 2465, + "id": 2549, "implemented": true, "kind": "function", "modifiers": [], "name": "supplyAndBorrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 2452, + "id": 2536, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2445, + "id": 2529, "name": "supplyCToken", "nodeType": "VariableDeclaration", - "scope": 2465, - "src": "3483:20:16", + "scope": 2549, + "src": "4414:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4712,10 +5535,10 @@ "typeString": "address" }, "typeName": { - "id": 2444, + "id": 2528, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3483:7:16", + "src": "4414:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4727,11 +5550,11 @@ }, { "constant": false, - "id": 2447, + "id": 2531, "name": "supplyAmount", "nodeType": "VariableDeclaration", - "scope": 2465, - "src": "3513:17:16", + "scope": 2549, + "src": "4444:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4739,10 +5562,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2446, - "name": "uint", + "id": 2530, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3513:4:16", + "src": "4444:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4753,11 +5576,11 @@ }, { "constant": false, - "id": 2449, + "id": 2533, "name": "borrowCToken", "nodeType": "VariableDeclaration", - "scope": 2465, - "src": "3540:20:16", + "scope": 2549, + "src": "4474:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4765,10 +5588,10 @@ "typeString": "address" }, "typeName": { - "id": 2448, + "id": 2532, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3540:7:16", + "src": "4474:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4780,11 +5603,11 @@ }, { "constant": false, - "id": 2451, + "id": 2535, "name": "borrowAmount", "nodeType": "VariableDeclaration", - "scope": 2465, - "src": "3570:17:16", + "scope": 2549, + "src": "4504:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4792,10 +5615,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2450, - "name": "uint", + "id": 2534, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3570:4:16", + "src": "4504:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4805,25 +5628,25 @@ "visibility": "internal" } ], - "src": "3473:120:16" + "src": "4404:126:16" }, "returnParameters": { - "id": 2453, + "id": 2537, "nodeType": "ParameterList", "parameters": [], - "src": "3609:0:16" + "src": "4546:0:16" }, - "scope": 2785, - "src": "3449:255:16", + "scope": 2837, + "src": "4380:261:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2480, + "id": 2564, "nodeType": "Block", - "src": "3810:127:16", + "src": "4748:127:16", "statements": [ { "expression": { @@ -4831,18 +5654,18 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 2472, + "id": 2556, "name": "supplyETH", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2383, - "src": "3849:9:16", + "referencedDeclaration": 2467, + "src": "4787:9:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$", "typeString": "function ()" } }, - "id": 2473, + "id": 2557, "isConstant": false, "isLValue": false, "isPure": false, @@ -4850,15 +5673,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3849:11:16", + "src": "4787:11:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2474, + "id": 2558, "nodeType": "ExpressionStatement", - "src": "3849:11:16" + "src": "4787:11:16" }, { "expression": { @@ -4866,12 +5689,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2476, + "id": 2560, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2467, - "src": "3909:6:16", + "referencedDeclaration": 2551, + "src": "4847:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4879,12 +5702,12 @@ }, { "argumentTypes": null, - "id": 2477, + "id": 2561, "name": "borrowAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2469, - "src": "3917:12:16", + "referencedDeclaration": 2553, + "src": "4855:12:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4902,18 +5725,18 @@ "typeString": "uint256" } ], - "id": 2475, + "id": 2559, "name": "borrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "3902:6:16", + "referencedDeclaration": 2527, + "src": "4840:6:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2478, + "id": 2562, "isConstant": false, "isLValue": false, "isPure": false, @@ -4921,36 +5744,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3902:28:16", + "src": "4840:28:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2479, + "id": 2563, "nodeType": "ExpressionStatement", - "src": "3902:28:16" + "src": "4840:28:16" } ] }, "documentation": null, - "id": 2481, + "id": 2565, "implemented": true, "kind": "function", "modifiers": [], "name": "supplyETHAndBorrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 2470, + "id": 2554, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2467, + "id": 2551, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2481, - "src": "3747:14:16", + "scope": 2565, + "src": "4675:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4958,10 +5781,10 @@ "typeString": "address" }, "typeName": { - "id": 2466, + "id": 2550, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3747:7:16", + "src": "4675:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4973,11 +5796,11 @@ }, { "constant": false, - "id": 2469, + "id": 2553, "name": "borrowAmount", "nodeType": "VariableDeclaration", - "scope": 2481, - "src": "3771:17:16", + "scope": 2565, + "src": "4691:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4985,10 +5808,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2468, - "name": "uint", + "id": 2552, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3771:4:16", + "src": "4691:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4998,25 +5821,25 @@ "visibility": "internal" } ], - "src": "3737:57:16" + "src": "4674:38:16" }, "returnParameters": { - "id": 2471, + "id": 2555, "nodeType": "ParameterList", "parameters": [], - "src": "3810:0:16" + "src": "4748:0:16" }, - "scope": 2785, - "src": "3710:227:16", + "scope": 2837, + "src": "4647:228:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2520, + "id": 2604, "nodeType": "Block", - "src": "4008:269:16", + "src": "4949:315:16", "statements": [ { "condition": { @@ -5025,19 +5848,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2490, + "id": 2574, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2488, + "id": 2572, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2483, - "src": "4022:6:16", + "referencedDeclaration": 2567, + "src": "4963:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5047,27 +5870,27 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2489, + "id": 2573, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "4032:13:16", + "referencedDeclaration": 2180, + "src": "4973:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "4022:23:16", + "src": "4963:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2518, + "id": 2602, "nodeType": "Block", - "src": "4121:150:16", + "src": "5062:196:16", "statements": [ { "expression": { @@ -5075,12 +5898,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2502, + "id": 2586, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2483, - "src": "4149:6:16", + "referencedDeclaration": 2567, + "src": "5090:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5088,12 +5911,12 @@ }, { "argumentTypes": null, - "id": 2503, + "id": 2587, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2485, - "src": "4157:6:16", + "referencedDeclaration": 2569, + "src": "5098:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5111,18 +5934,18 @@ "typeString": "uint256" } ], - "id": 2501, + "id": 2585, "name": "approveCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2317, - "src": "4135:13:16", + "referencedDeclaration": 2401, + "src": "5076:13:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2504, + "id": 2588, "isConstant": false, "isLValue": false, "isPure": false, @@ -5130,15 +5953,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4135:29:16", + "src": "5076:29:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2505, + "id": 2589, "nodeType": "ExpressionStatement", - "src": "4135:29:16" + "src": "5076:29:16" }, { "expression": { @@ -5150,7 +5973,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2514, + "id": 2598, "isConstant": false, "isLValue": false, "isPure": false, @@ -5160,12 +5983,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2511, + "id": 2595, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2485, - "src": "4214:6:16", + "referencedDeclaration": 2569, + "src": "5172:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5184,12 +6007,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2508, + "id": 2592, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2483, - "src": "4194:6:16", + "referencedDeclaration": 2567, + "src": "5152:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5203,18 +6026,18 @@ "typeString": "address" } ], - "id": 2507, + "id": 2591, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "4186:7:16", + "referencedDeclaration": 884, + "src": "5144:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2509, + "id": 2593, "isConstant": false, "isLValue": false, "isPure": false, @@ -5222,27 +6045,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4186:15:16", + "src": "5144:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2510, + "id": 2594, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "repayBorrow", "nodeType": "MemberAccess", - "referencedDeclaration": 769, - "src": "4186:27:16", + "referencedDeclaration": 782, + "src": "5144:27:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 2512, + "id": 2596, "isConstant": false, "isLValue": false, "isPure": false, @@ -5250,7 +6073,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4186:35:16", + "src": "5144:35:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5261,14 +6084,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2513, + "id": 2597, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4225:1:16", + "src": "5183:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -5276,7 +6099,7 @@ }, "value": "0" }, - "src": "4186:40:16", + "src": "5144:40:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5285,14 +6108,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564", - "id": 2515, + "id": 2599, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4228:31:16", + "src": "5202:31:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_999cd91154bd9e69ce31d224fa6000cac622ab857a94bfb0df17582f1ba47dfe", @@ -5312,21 +6135,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-repay-failed\"" } ], - "id": 2506, + "id": 2590, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "4178:7:16", + "referencedDeclaration": 7822, + "src": "5119:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2516, + "id": 2600, "isConstant": false, "isLValue": false, "isPure": false, @@ -5334,25 +6157,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4178:82:16", + "src": "5119:128:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2517, + "id": 2601, "nodeType": "ExpressionStatement", - "src": "4178:82:16" + "src": "5119:128:16" } ] }, - "id": 2519, + "id": 2603, "nodeType": "IfStatement", - "src": "4018:253:16", + "src": "4959:299:16", "trueBody": { - "id": 2500, + "id": 2584, "nodeType": "Block", - "src": "4047:68:16", + "src": "4988:68:16", "statements": [ { "expression": { @@ -5363,12 +6186,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2496, + "id": 2580, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2485, - "src": "4095:6:16", + "referencedDeclaration": 2569, + "src": "5036:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5389,12 +6212,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2492, + "id": 2576, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2483, - "src": "4069:6:16", + "referencedDeclaration": 2567, + "src": "5010:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5408,18 +6231,18 @@ "typeString": "address" } ], - "id": 2491, + "id": 2575, "name": "ICEther", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 732, - "src": "4061:7:16", + "referencedDeclaration": 745, + "src": "5002:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICEther_$732_$", + "typeIdentifier": "t_type$_t_contract$_ICEther_$745_$", "typeString": "type(contract ICEther)" } }, - "id": 2493, + "id": 2577, "isConstant": false, "isLValue": false, "isPure": false, @@ -5427,13 +6250,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4061:15:16", + "src": "5002:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICEther_$732", + "typeIdentifier": "t_contract$_ICEther_$745", "typeString": "contract ICEther" } }, - "id": 2494, + "id": 2578, "isConstant": false, "isLValue": false, "isPure": false, @@ -5441,13 +6264,13 @@ "memberName": "repayBorrow", "nodeType": "MemberAccess", "referencedDeclaration": 698, - "src": "4061:27:16", + "src": "5002:27:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$__$returns$__$", "typeString": "function () payable external" } }, - "id": 2495, + "id": 2579, "isConstant": false, "isLValue": false, "isPure": false, @@ -5455,13 +6278,13 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4061:33:16", + "src": "5002:33:16", "typeDescriptions": { "typeIdentifier": "t_function_setvalue_pure$_t_uint256_$returns$_t_function_external_payable$__$returns$__$value_$", "typeString": "function (uint256) pure returns (function () payable external)" } }, - "id": 2497, + "id": 2581, "isConstant": false, "isLValue": false, "isPure": false, @@ -5469,13 +6292,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4061:41:16", + "src": "5002:41:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$__$returns$__$value", "typeString": "function () payable external" } }, - "id": 2498, + "id": 2582, "isConstant": false, "isLValue": false, "isPure": false, @@ -5483,15 +6306,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4061:43:16", + "src": "5002:43:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2499, + "id": 2583, "nodeType": "ExpressionStatement", - "src": "4061:43:16" + "src": "5002:43:16" } ] } @@ -5499,23 +6322,23 @@ ] }, "documentation": null, - "id": 2521, + "id": 2605, "implemented": true, "kind": "function", "modifiers": [], "name": "repayBorrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 2486, + "id": 2570, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2483, + "id": 2567, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2521, - "src": "3964:14:16", + "scope": 2605, + "src": "4902:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5523,10 +6346,10 @@ "typeString": "address" }, "typeName": { - "id": 2482, + "id": 2566, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3964:7:16", + "src": "4902:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5538,11 +6361,11 @@ }, { "constant": false, - "id": 2485, + "id": 2569, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2521, - "src": "3980:11:16", + "scope": 2605, + "src": "4918:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5550,10 +6373,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2484, - "name": "uint", + "id": 2568, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3980:4:16", + "src": "4918:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5563,25 +6386,25 @@ "visibility": "internal" } ], - "src": "3963:29:16" + "src": "4901:32:16" }, "returnParameters": { - "id": 2487, + "id": 2571, "nodeType": "ParameterList", "parameters": [], - "src": "4008:0:16" + "src": "4949:0:16" }, - "scope": 2785, - "src": "3943:334:16", + "scope": 2837, + "src": "4881:383:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2564, + "id": 2648, "nodeType": "Block", - "src": "4373:307:16", + "src": "5393:353:16", "statements": [ { "condition": { @@ -5590,19 +6413,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2532, + "id": 2616, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2530, + "id": 2614, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2525, - "src": "4387:6:16", + "referencedDeclaration": 2609, + "src": "5407:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5612,27 +6435,27 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2531, + "id": 2615, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "4397:13:16", + "referencedDeclaration": 2180, + "src": "5417:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "4387:23:16", + "src": "5407:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2562, + "id": 2646, "nodeType": "Block", - "src": "4501:173:16", + "src": "5521:219:16", "statements": [ { "expression": { @@ -5640,12 +6463,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2545, + "id": 2629, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2525, - "src": "4529:6:16", + "referencedDeclaration": 2609, + "src": "5549:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5653,12 +6476,12 @@ }, { "argumentTypes": null, - "id": 2546, + "id": 2630, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2527, - "src": "4537:6:16", + "referencedDeclaration": 2611, + "src": "5557:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5676,18 +6499,18 @@ "typeString": "uint256" } ], - "id": 2544, + "id": 2628, "name": "approveCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2317, - "src": "4515:13:16", + "referencedDeclaration": 2401, + "src": "5535:13:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2547, + "id": 2631, "isConstant": false, "isLValue": false, "isPure": false, @@ -5695,15 +6518,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4515:29:16", + "src": "5535:29:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2548, + "id": 2632, "nodeType": "ExpressionStatement", - "src": "4515:29:16" + "src": "5535:29:16" }, { "expression": { @@ -5715,7 +6538,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2558, + "id": 2642, "isConstant": false, "isLValue": false, "isPure": false, @@ -5725,12 +6548,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2554, + "id": 2638, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2523, - "src": "4600:9:16", + "referencedDeclaration": 2607, + "src": "5637:9:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5738,12 +6561,12 @@ }, { "argumentTypes": null, - "id": 2555, + "id": 2639, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2527, - "src": "4611:6:16", + "referencedDeclaration": 2611, + "src": "5648:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5766,12 +6589,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2551, + "id": 2635, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2525, - "src": "4574:6:16", + "referencedDeclaration": 2609, + "src": "5611:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5785,18 +6608,18 @@ "typeString": "address" } ], - "id": 2550, + "id": 2634, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "4566:7:16", + "referencedDeclaration": 884, + "src": "5603:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2552, + "id": 2636, "isConstant": false, "isLValue": false, "isPure": false, @@ -5804,27 +6627,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4566:15:16", + "src": "5603:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2553, + "id": 2637, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "repayBorrowBehalf", "nodeType": "MemberAccess", - "referencedDeclaration": 778, - "src": "4566:33:16", + "referencedDeclaration": 791, + "src": "5603:33:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) external returns (uint256)" } }, - "id": 2556, + "id": 2640, "isConstant": false, "isLValue": false, "isPure": false, @@ -5832,7 +6655,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4566:52:16", + "src": "5603:52:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5843,14 +6666,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2557, + "id": 2641, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4622:1:16", + "src": "5659:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -5858,7 +6681,7 @@ }, "value": "0" }, - "src": "4566:57:16", + "src": "5603:57:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -5867,14 +6690,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d7265706179626568616c662d6661696c6564", - "id": 2559, + "id": 2643, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4625:37:16", + "src": "5678:37:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_9271b3f440bc756bcf9d9edd637efa6f47cc4a3fa7de577dc2c93368fcac9e79", @@ -5894,21 +6717,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-repaybehalf-failed\"" } ], - "id": 2549, + "id": 2633, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "4558:7:16", + "referencedDeclaration": 7822, + "src": "5578:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2560, + "id": 2644, "isConstant": false, "isLValue": false, "isPure": false, @@ -5916,25 +6739,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4558:105:16", + "src": "5578:151:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2561, + "id": 2645, "nodeType": "ExpressionStatement", - "src": "4558:105:16" + "src": "5578:151:16" } ] }, - "id": 2563, + "id": 2647, "nodeType": "IfStatement", - "src": "4383:291:16", + "src": "5403:337:16", "trueBody": { - "id": 2543, + "id": 2627, "nodeType": "Block", - "src": "4412:83:16", + "src": "5432:83:16", "statements": [ { "expression": { @@ -5942,12 +6765,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2540, + "id": 2624, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2523, - "src": "4474:9:16", + "referencedDeclaration": 2607, + "src": "5494:9:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5964,12 +6787,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2538, + "id": 2622, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2527, - "src": "4466:6:16", + "referencedDeclaration": 2611, + "src": "5486:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5990,12 +6813,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2534, + "id": 2618, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2525, - "src": "4434:6:16", + "referencedDeclaration": 2609, + "src": "5454:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6009,18 +6832,18 @@ "typeString": "address" } ], - "id": 2533, + "id": 2617, "name": "ICEther", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 732, - "src": "4426:7:16", + "referencedDeclaration": 745, + "src": "5446:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICEther_$732_$", + "typeIdentifier": "t_type$_t_contract$_ICEther_$745_$", "typeString": "type(contract ICEther)" } }, - "id": 2535, + "id": 2619, "isConstant": false, "isLValue": false, "isPure": false, @@ -6028,13 +6851,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4426:15:16", + "src": "5446:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICEther_$732", + "typeIdentifier": "t_contract$_ICEther_$745", "typeString": "contract ICEther" } }, - "id": 2536, + "id": 2620, "isConstant": false, "isLValue": false, "isPure": false, @@ -6042,13 +6865,13 @@ "memberName": "repayBorrowBehalf", "nodeType": "MemberAccess", "referencedDeclaration": 703, - "src": "4426:33:16", + "src": "5446:33:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$returns$__$", "typeString": "function (address) payable external" } }, - "id": 2537, + "id": 2621, "isConstant": false, "isLValue": false, "isPure": false, @@ -6056,13 +6879,13 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4426:39:16", + "src": "5446:39:16", "typeDescriptions": { "typeIdentifier": "t_function_setvalue_pure$_t_uint256_$returns$_t_function_external_payable$_t_address_$returns$__$value_$", "typeString": "function (uint256) pure returns (function (address) payable external)" } }, - "id": 2539, + "id": 2623, "isConstant": false, "isLValue": false, "isPure": false, @@ -6070,13 +6893,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4426:47:16", + "src": "5446:47:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$returns$__$value", "typeString": "function (address) payable external" } }, - "id": 2541, + "id": 2625, "isConstant": false, "isLValue": false, "isPure": false, @@ -6084,15 +6907,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4426:58:16", + "src": "5446:58:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2542, + "id": 2626, "nodeType": "ExpressionStatement", - "src": "4426:58:16" + "src": "5446:58:16" } ] } @@ -6100,23 +6923,23 @@ ] }, "documentation": null, - "id": 2565, + "id": 2649, "implemented": true, "kind": "function", "modifiers": [], "name": "repayBorrowBehalf", "nodeType": "FunctionDefinition", "parameters": { - "id": 2528, + "id": 2612, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2523, + "id": 2607, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 2565, - "src": "4310:17:16", + "scope": 2649, + "src": "5306:17:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6124,10 +6947,10 @@ "typeString": "address" }, "typeName": { - "id": 2522, + "id": 2606, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4310:7:16", + "src": "5306:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6139,11 +6962,11 @@ }, { "constant": false, - "id": 2525, + "id": 2609, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2565, - "src": "4329:14:16", + "scope": 2649, + "src": "5333:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6151,10 +6974,10 @@ "typeString": "address" }, "typeName": { - "id": 2524, + "id": 2608, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4329:7:16", + "src": "5333:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6166,11 +6989,11 @@ }, { "constant": false, - "id": 2527, + "id": 2611, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2565, - "src": "4345:11:16", + "scope": 2649, + "src": "5357:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6178,10 +7001,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2526, - "name": "uint", + "id": 2610, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "4345:4:16", + "src": "5357:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6191,25 +7014,25 @@ "visibility": "internal" } ], - "src": "4309:48:16" + "src": "5296:81:16" }, "returnParameters": { - "id": 2529, + "id": 2613, "nodeType": "ParameterList", "parameters": [], - "src": "4373:0:16" + "src": "5393:0:16" }, - "scope": 2785, - "src": "4283:397:16", + "scope": 2837, + "src": "5270:476:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2584, + "id": 2668, "nodeType": "Block", - "src": "4752:101:16", + "src": "5821:135:16", "statements": [ { "expression": { @@ -6221,7 +7044,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2580, + "id": 2664, "isConstant": false, "isLValue": false, "isPure": false, @@ -6231,12 +7054,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2577, + "id": 2661, "name": "redeemTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2569, - "src": "4793:12:16", + "referencedDeclaration": 2653, + "src": "5875:12:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6255,12 +7078,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2574, + "id": 2658, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2567, - "src": "4778:6:16", + "referencedDeclaration": 2651, + "src": "5860:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6274,18 +7097,18 @@ "typeString": "address" } ], - "id": 2573, + "id": 2657, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "4770:7:16", + "referencedDeclaration": 884, + "src": "5852:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2575, + "id": 2659, "isConstant": false, "isLValue": false, "isPure": false, @@ -6293,27 +7116,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4770:15:16", + "src": "5852:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2576, + "id": 2660, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "redeem", "nodeType": "MemberAccess", - "referencedDeclaration": 748, - "src": "4770:22:16", + "referencedDeclaration": 761, + "src": "5852:22:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 2578, + "id": 2662, "isConstant": false, "isLValue": false, "isPure": false, @@ -6321,7 +7144,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4770:36:16", + "src": "5852:36:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6332,14 +7155,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2579, + "id": 2663, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4810:1:16", + "src": "5892:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -6347,7 +7170,7 @@ }, "value": "0" }, - "src": "4770:41:16", + "src": "5852:41:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6356,14 +7179,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d72656465656d2d6661696c6564", - "id": 2581, + "id": 2665, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4813:32:16", + "src": "5907:32:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_3f3b4acbdfd19ecca99167853c0ab7e48a16390e2bcd8ee493e05b1ffaf7c80a", @@ -6383,21 +7206,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-redeem-failed\"" } ], - "id": 2572, + "id": 2656, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "4762:7:16", + "referencedDeclaration": 7822, + "src": "5831:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2582, + "id": 2666, "isConstant": false, "isLValue": false, "isPure": false, @@ -6405,36 +7228,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4762:84:16", + "src": "5831:118:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2583, + "id": 2667, "nodeType": "ExpressionStatement", - "src": "4762:84:16" + "src": "5831:118:16" } ] }, "documentation": null, - "id": 2585, + "id": 2669, "implemented": true, "kind": "function", "modifiers": [], "name": "redeem", "nodeType": "FunctionDefinition", "parameters": { - "id": 2570, + "id": 2654, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2567, + "id": 2651, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2585, - "src": "4702:14:16", + "scope": 2669, + "src": "5768:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6442,10 +7265,10 @@ "typeString": "address" }, "typeName": { - "id": 2566, + "id": 2650, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4702:7:16", + "src": "5768:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6457,11 +7280,11 @@ }, { "constant": false, - "id": 2569, + "id": 2653, "name": "redeemTokens", "nodeType": "VariableDeclaration", - "scope": 2585, - "src": "4718:17:16", + "scope": 2669, + "src": "5784:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6469,10 +7292,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2568, - "name": "uint", + "id": 2652, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "4718:4:16", + "src": "5784:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6482,25 +7305,25 @@ "visibility": "internal" } ], - "src": "4701:35:16" + "src": "5767:38:16" }, "returnParameters": { - "id": 2571, + "id": 2655, "nodeType": "ParameterList", "parameters": [], - "src": "4752:0:16" + "src": "5821:0:16" }, - "scope": 2785, - "src": "4686:167:16", + "scope": 2837, + "src": "5752:204:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2604, + "id": 2688, "nodeType": "Block", - "src": "4935:122:16", + "src": "6061:156:16", "statements": [ { "expression": { @@ -6512,7 +7335,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2600, + "id": 2684, "isConstant": false, "isLValue": false, "isPure": false, @@ -6522,12 +7345,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2597, + "id": 2681, "name": "redeemTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2589, - "src": "4986:12:16", + "referencedDeclaration": 2673, + "src": "6125:12:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6546,12 +7369,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2594, + "id": 2678, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2587, - "src": "4961:6:16", + "referencedDeclaration": 2671, + "src": "6100:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6565,18 +7388,18 @@ "typeString": "address" } ], - "id": 2593, + "id": 2677, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "4953:7:16", + "referencedDeclaration": 884, + "src": "6092:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2595, + "id": 2679, "isConstant": false, "isLValue": false, "isPure": false, @@ -6584,27 +7407,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4953:15:16", + "src": "6092:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2596, + "id": 2680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "redeemUnderlying", "nodeType": "MemberAccess", - "referencedDeclaration": 755, - "src": "4953:32:16", + "referencedDeclaration": 768, + "src": "6092:32:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 2598, + "id": 2682, "isConstant": false, "isLValue": false, "isPure": false, @@ -6612,7 +7435,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4953:46:16", + "src": "6092:46:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6623,14 +7446,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2599, + "id": 2683, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "5003:1:16", + "src": "6142:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -6638,7 +7461,7 @@ }, "value": "0" }, - "src": "4953:51:16", + "src": "6092:51:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -6647,14 +7470,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79696e672d6661696c6564", - "id": 2601, + "id": 2685, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5006:43:16", + "src": "6157:43:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_422f21513af86bee962b3ccca9c32226e776b380fb2ed292445c5cf781b3f1f1", @@ -6674,21 +7497,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-redeem-underlying-failed\"" } ], - "id": 2592, + "id": 2676, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "4945:7:16", + "referencedDeclaration": 7822, + "src": "6071:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2602, + "id": 2686, "isConstant": false, "isLValue": false, "isPure": false, @@ -6696,278 +7519,103 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4945:105:16", + "src": "6071:139:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" - } - }, - "id": 2603, - "nodeType": "ExpressionStatement", - "src": "4945:105:16" - } - ] - }, - "documentation": null, - "id": 2605, - "implemented": true, - "kind": "function", - "modifiers": [], - "name": "redeemUnderlying", - "nodeType": "FunctionDefinition", - "parameters": { - "id": 2590, - "nodeType": "ParameterList", - "parameters": [ - { - "constant": false, - "id": 2587, - "name": "cToken", - "nodeType": "VariableDeclaration", - "scope": 2605, - "src": "4885:14:16", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 2586, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "4885:7:16", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 2589, - "name": "redeemTokens", - "nodeType": "VariableDeclaration", - "scope": 2605, - "src": "4901:17:16", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 2588, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "4901:4:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - } - ], - "src": "4884:35:16" - }, - "returnParameters": { - "id": 2591, - "nodeType": "ParameterList", - "parameters": [], - "src": "4935:0:16" - }, - "scope": 2785, - "src": "4859:198:16", - "stateMutability": "payable", - "superFunction": null, - "visibility": "public" - }, - { - "body": { - "id": 2664, - "nodeType": "Block", - "src": "5358:596:16", - "statements": [ - { - "assignments": [ - 2613 - ], - "declarations": [ - { - "constant": false, - "id": 2613, - "name": "initialBal", - "nodeType": "VariableDeclaration", - "scope": 2664, - "src": "5407:15:16", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 2612, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "5407:4:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 2622, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2619, - "name": "this", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7877, - "src": "5459:4:16", - "typeDescriptions": { - "typeIdentifier": "t_contract$_CompoundBase_$2785", - "typeString": "contract CompoundBase" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_contract$_CompoundBase_$2785", - "typeString": "contract CompoundBase" - } - ], - "id": 2618, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "5451:7:16", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_address_$", - "typeString": "type(address)" - }, - "typeName": "address" - }, - "id": 2620, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5451:13:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2615, - "name": "cToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2607, - "src": "5433:6:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 2614, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "5425:7:16", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 2616, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5425:15:16", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 2617, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "balanceOf", - "nodeType": "MemberAccess", - "referencedDeclaration": 821, - "src": "5425:25:16", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", - "typeString": "function (address) view external returns (uint256)" - } - }, - "id": 2621, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5425:40:16", + } + }, + "id": 2687, + "nodeType": "ExpressionStatement", + "src": "6071:139:16" + } + ] + }, + "documentation": null, + "id": 2689, + "implemented": true, + "kind": "function", + "modifiers": [], + "name": "redeemUnderlying", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 2674, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 2671, + "name": "cToken", + "nodeType": "VariableDeclaration", + "scope": 2689, + "src": "5988:14:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 2670, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "5988:7:16", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2673, + "name": "redeemTokens", + "nodeType": "VariableDeclaration", + "scope": 2689, + "src": "6004:20:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2672, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "6004:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "nodeType": "VariableDeclarationStatement", - "src": "5407:58:16" - }, + "value": null, + "visibility": "internal" + } + ], + "src": "5987:38:16" + }, + "returnParameters": { + "id": 2675, + "nodeType": "ParameterList", + "parameters": [], + "src": "6061:0:16" + }, + "scope": 2837, + "src": "5962:255:16", + "stateMutability": "payable", + "superFunction": null, + "visibility": "public" + }, + { + "body": { + "id": 2716, + "nodeType": "Block", + "src": "6499:168:16", + "statements": [ { "condition": { "argumentTypes": null, @@ -6975,19 +7623,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2625, + "id": 2698, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2623, + "id": 2696, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2607, - "src": "5639:6:16", + "referencedDeclaration": 2691, + "src": "6513:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6997,31 +7645,31 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 2624, + "id": 2697, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "5649:13:16", + "referencedDeclaration": 2180, + "src": "6523:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "5639:23:16", + "src": "6513:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2637, + "id": 2710, "nodeType": "IfStatement", - "src": "5635:110:16", + "src": "6509:120:16", "trueBody": { - "id": 2636, + "id": 2709, "nodeType": "Block", - "src": "5664:81:16", + "src": "6538:91:16", "statements": [ { "expression": { @@ -7031,18 +7679,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2627, + "id": 2700, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "5692:3:16", + "referencedDeclaration": 7818, + "src": "6576:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2628, + "id": 2701, "isConstant": false, "isLValue": false, "isPure": false, @@ -7050,7 +7698,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5692:10:16", + "src": "6576:10:16", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -7061,14 +7709,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2630, + "id": 2703, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7877, - "src": "5712:4:16", + "referencedDeclaration": 7868, + "src": "6596:4:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } } @@ -7076,360 +7724,114 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } ], - "id": 2629, + "id": 2702, "isConstant": false, "isLValue": false, "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "5704:7:16", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_address_$", - "typeString": "type(address)" - }, - "typeName": "address" - }, - "id": 2631, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5704:13:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 2632, - "name": "cToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2607, - "src": "5719:6:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 2633, - "name": "amount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2609, - "src": "5727:6:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - }, - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 2626, - "name": "_transferFrom", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2207, - "src": "5678:13:16", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,address,address,uint256)" - } - }, - "id": 2634, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5678:56:16", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 2635, - "nodeType": "ExpressionStatement", - "src": "5678:56:16" - } - ] - } - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2639, - "name": "cToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2607, - "src": "5761:6:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 2640, - "name": "amount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2609, - "src": "5769:6:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 2638, - "name": "supply", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2423, - "src": "5754:6:16", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" - } - }, - "id": 2641, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5754:22:16", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 2642, - "nodeType": "ExpressionStatement", - "src": "5754:22:16" - }, - { - "assignments": [ - 2644 - ], - "declarations": [ - { - "constant": false, - "id": 2644, - "name": "finalBal", - "nodeType": "VariableDeclaration", - "scope": 2664, - "src": "5824:13:16", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 2643, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "5824:4:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 2653, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2650, - "name": "this", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7877, - "src": "5874:4:16", - "typeDescriptions": { - "typeIdentifier": "t_contract$_CompoundBase_$2785", - "typeString": "contract CompoundBase" - } - } - ], - "expression": { - "argumentTypes": [ + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "6588:7:16", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_address_$", + "typeString": "type(address)" + }, + "typeName": "address" + }, + "id": 2704, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "6588:13:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 2705, + "name": "cToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2691, + "src": "6603:6:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, { - "typeIdentifier": "t_contract$_CompoundBase_$2785", - "typeString": "contract CompoundBase" + "argumentTypes": null, + "id": 2706, + "name": "amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2693, + "src": "6611:6:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } } ], - "id": 2649, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "5866:7:16", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_address_$", - "typeString": "type(address)" - }, - "typeName": "address" - }, - "id": 2651, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5866:13:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2646, - "name": "cToken", + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 2699, + "name": "_transferFromUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2607, - "src": "5848:6:16", + "referencedDeclaration": 2270, + "src": "6552:23:16", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,address,address,uint256)" } - ], - "id": 2645, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "5840:7:16", + }, + "id": 2707, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "6552:66:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" } }, - "id": 2647, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5840:15:16", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 2648, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "balanceOf", - "nodeType": "MemberAccess", - "referencedDeclaration": 821, - "src": "5840:25:16", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", - "typeString": "function (address) view external returns (uint256)" + "id": 2708, + "nodeType": "ExpressionStatement", + "src": "6552:66:16" } - }, - "id": 2652, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5840:40:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "5824:56:16" + ] + } }, { "expression": { @@ -7437,12 +7839,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2655, + "id": 2712, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2607, - "src": "5901:6:16", + "referencedDeclaration": 2691, + "src": "6645:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7450,94 +7852,12 @@ }, { "argumentTypes": null, - "expression": { - "argumentTypes": null, - "id": 2656, - "name": "msg", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "5909:3:16", - "typeDescriptions": { - "typeIdentifier": "t_magic_message", - "typeString": "msg" - } - }, - "id": 2657, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "sender", - "nodeType": "MemberAccess", - "referencedDeclaration": null, - "src": "5909:10:16", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - } - }, - { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2659, - "name": "finalBal", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2644, - "src": "5925:8:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - { - "argumentTypes": null, - "id": 2660, - "name": "initialBal", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2613, - "src": "5935:10:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 2658, - "name": "sub", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "5921:3:16", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (uint256,uint256) pure returns (uint256)" - } - }, - "id": 2661, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5921:25:16", + "id": 2713, + "name": "amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2693, + "src": "6653:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7550,27 +7870,23 @@ "typeIdentifier": "t_address", "typeString": "address" }, - { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - }, { "typeIdentifier": "t_uint256", "typeString": "uint256" } ], - "id": 2654, - "name": "_transfer", + "id": 2711, + "name": "supply", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2248, - "src": "5891:9:16", + "referencedDeclaration": 2507, + "src": "6638:6:16", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,address,uint256)" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" } }, - "id": 2662, + "id": 2714, "isConstant": false, "isLValue": false, "isPure": false, @@ -7578,36 +7894,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5891:56:16", + "src": "6638:22:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2663, + "id": 2715, "nodeType": "ExpressionStatement", - "src": "5891:56:16" + "src": "6638:22:16" } ] }, "documentation": null, - "id": 2665, + "id": 2717, "implemented": true, "kind": "function", "modifiers": [], "name": "supplyThroughProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 2610, + "id": 2694, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2607, + "id": 2691, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2665, - "src": "5301:14:16", + "scope": 2717, + "src": "6452:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7615,10 +7931,10 @@ "typeString": "address" }, "typeName": { - "id": 2606, + "id": 2690, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5301:7:16", + "src": "6452:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7630,11 +7946,11 @@ }, { "constant": false, - "id": 2609, + "id": 2693, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2665, - "src": "5325:11:16", + "scope": 2717, + "src": "6468:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7642,10 +7958,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2608, - "name": "uint", + "id": 2692, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "5325:4:16", + "src": "6468:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7655,25 +7971,25 @@ "visibility": "internal" } ], - "src": "5291:51:16" + "src": "6451:32:16" }, "returnParameters": { - "id": 2611, + "id": 2695, "nodeType": "ParameterList", "parameters": [], - "src": "5358:0:16" + "src": "6499:0:16" }, - "scope": 2785, - "src": "5264:690:16", + "scope": 2837, + "src": "6424:243:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2692, + "id": 2744, "nodeType": "Block", - "src": "6037:163:16", + "src": "6773:173:16", "statements": [ { "condition": { @@ -7682,19 +7998,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2674, + "id": 2726, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2672, + "id": 2724, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2667, - "src": "6051:6:16", + "referencedDeclaration": 2719, + "src": "6787:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7704,31 +8020,31 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 2673, + "id": 2725, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "6061:13:16", + "referencedDeclaration": 2180, + "src": "6797:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "6051:23:16", + "src": "6787:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2686, + "id": 2738, "nodeType": "IfStatement", - "src": "6047:110:16", + "src": "6783:120:16", "trueBody": { - "id": 2685, + "id": 2737, "nodeType": "Block", - "src": "6076:81:16", + "src": "6812:91:16", "statements": [ { "expression": { @@ -7738,18 +8054,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2676, + "id": 2728, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "6104:3:16", + "referencedDeclaration": 7818, + "src": "6850:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2677, + "id": 2729, "isConstant": false, "isLValue": false, "isPure": false, @@ -7757,7 +8073,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6104:10:16", + "src": "6850:10:16", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -7768,14 +8084,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2679, + "id": 2731, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7877, - "src": "6124:4:16", + "referencedDeclaration": 7868, + "src": "6870:4:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } } @@ -7783,24 +8099,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } ], - "id": 2678, + "id": 2730, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "6116:7:16", + "src": "6862:7:16", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 2680, + "id": 2732, "isConstant": false, "isLValue": false, "isPure": false, @@ -7808,7 +8124,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6116:13:16", + "src": "6862:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7816,12 +8132,12 @@ }, { "argumentTypes": null, - "id": 2681, + "id": 2733, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2667, - "src": "6131:6:16", + "referencedDeclaration": 2719, + "src": "6877:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7829,12 +8145,12 @@ }, { "argumentTypes": null, - "id": 2682, + "id": 2734, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2669, - "src": "6139:6:16", + "referencedDeclaration": 2721, + "src": "6885:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7860,18 +8176,18 @@ "typeString": "uint256" } ], - "id": 2675, - "name": "_transferFrom", + "id": 2727, + "name": "_transferFromUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2207, - "src": "6090:13:16", + "referencedDeclaration": 2270, + "src": "6826:23:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,address,uint256)" } }, - "id": 2683, + "id": 2735, "isConstant": false, "isLValue": false, "isPure": false, @@ -7879,15 +8195,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6090:56:16", + "src": "6826:66:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2684, + "id": 2736, "nodeType": "ExpressionStatement", - "src": "6090:56:16" + "src": "6826:66:16" } ] } @@ -7898,12 +8214,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2688, + "id": 2740, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2667, - "src": "6178:6:16", + "referencedDeclaration": 2719, + "src": "6924:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7911,12 +8227,12 @@ }, { "argumentTypes": null, - "id": 2689, + "id": 2741, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2669, - "src": "6186:6:16", + "referencedDeclaration": 2721, + "src": "6932:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7934,18 +8250,18 @@ "typeString": "uint256" } ], - "id": 2687, + "id": 2739, "name": "repayBorrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2521, - "src": "6166:11:16", + "referencedDeclaration": 2605, + "src": "6912:11:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2690, + "id": 2742, "isConstant": false, "isLValue": false, "isPure": false, @@ -7953,36 +8269,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6166:27:16", + "src": "6912:27:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2691, + "id": 2743, "nodeType": "ExpressionStatement", - "src": "6166:27:16" + "src": "6912:27:16" } ] }, "documentation": null, - "id": 2693, + "id": 2745, "implemented": true, "kind": "function", "modifiers": [], "name": "repayBorrowThroughProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 2670, + "id": 2722, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2667, + "id": 2719, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2693, - "src": "5993:14:16", + "scope": 2745, + "src": "6706:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -7990,10 +8306,10 @@ "typeString": "address" }, "typeName": { - "id": 2666, + "id": 2718, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5993:7:16", + "src": "6706:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8005,11 +8321,11 @@ }, { "constant": false, - "id": 2669, + "id": 2721, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2693, - "src": "6009:11:16", + "scope": 2745, + "src": "6722:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8017,10 +8333,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2668, - "name": "uint", + "id": 2720, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6009:4:16", + "src": "6722:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8030,25 +8346,25 @@ "visibility": "internal" } ], - "src": "5992:29:16" + "src": "6705:32:16" }, "returnParameters": { - "id": 2671, + "id": 2723, "nodeType": "ParameterList", "parameters": [], - "src": "6037:0:16" + "src": "6773:0:16" }, - "scope": 2785, - "src": "5960:240:16", + "scope": 2837, + "src": "6673:273:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2723, + "id": 2775, "nodeType": "Block", - "src": "6308:180:16", + "src": "7087:190:16", "statements": [ { "condition": { @@ -8057,19 +8373,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2704, + "id": 2756, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2702, + "id": 2754, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2697, - "src": "6322:6:16", + "referencedDeclaration": 2749, + "src": "7101:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8079,31 +8395,31 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 2703, + "id": 2755, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "6332:13:16", + "referencedDeclaration": 2180, + "src": "7111:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "6322:23:16", + "src": "7101:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2716, + "id": 2768, "nodeType": "IfStatement", - "src": "6318:110:16", + "src": "7097:120:16", "trueBody": { - "id": 2715, + "id": 2767, "nodeType": "Block", - "src": "6347:81:16", + "src": "7126:91:16", "statements": [ { "expression": { @@ -8113,18 +8429,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2706, + "id": 2758, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "6375:3:16", + "referencedDeclaration": 7818, + "src": "7164:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2707, + "id": 2759, "isConstant": false, "isLValue": false, "isPure": false, @@ -8132,7 +8448,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6375:10:16", + "src": "7164:10:16", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -8143,14 +8459,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2709, + "id": 2761, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7877, - "src": "6395:4:16", + "referencedDeclaration": 7868, + "src": "7184:4:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } } @@ -8158,24 +8474,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } ], - "id": 2708, + "id": 2760, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "6387:7:16", + "src": "7176:7:16", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 2710, + "id": 2762, "isConstant": false, "isLValue": false, "isPure": false, @@ -8183,7 +8499,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6387:13:16", + "src": "7176:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8191,12 +8507,12 @@ }, { "argumentTypes": null, - "id": 2711, + "id": 2763, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2697, - "src": "6402:6:16", + "referencedDeclaration": 2749, + "src": "7191:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8204,12 +8520,12 @@ }, { "argumentTypes": null, - "id": 2712, + "id": 2764, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2699, - "src": "6410:6:16", + "referencedDeclaration": 2751, + "src": "7199:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8235,18 +8551,18 @@ "typeString": "uint256" } ], - "id": 2705, - "name": "_transferFrom", + "id": 2757, + "name": "_transferFromUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2207, - "src": "6361:13:16", + "referencedDeclaration": 2270, + "src": "7140:23:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,address,uint256)" } }, - "id": 2713, + "id": 2765, "isConstant": false, "isLValue": false, "isPure": false, @@ -8254,15 +8570,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6361:56:16", + "src": "7140:66:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2714, + "id": 2766, "nodeType": "ExpressionStatement", - "src": "6361:56:16" + "src": "7140:66:16" } ] } @@ -8273,12 +8589,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2718, + "id": 2770, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2695, - "src": "6455:9:16", + "referencedDeclaration": 2747, + "src": "7244:9:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8286,12 +8602,12 @@ }, { "argumentTypes": null, - "id": 2719, + "id": 2771, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2697, - "src": "6466:6:16", + "referencedDeclaration": 2749, + "src": "7255:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8299,12 +8615,12 @@ }, { "argumentTypes": null, - "id": 2720, + "id": 2772, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2699, - "src": "6474:6:16", + "referencedDeclaration": 2751, + "src": "7263:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8326,18 +8642,18 @@ "typeString": "uint256" } ], - "id": 2717, + "id": 2769, "name": "repayBorrowBehalf", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2565, - "src": "6437:17:16", + "referencedDeclaration": 2649, + "src": "7226:17:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 2721, + "id": 2773, "isConstant": false, "isLValue": false, "isPure": false, @@ -8345,36 +8661,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6437:44:16", + "src": "7226:44:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2722, + "id": 2774, "nodeType": "ExpressionStatement", - "src": "6437:44:16" + "src": "7226:44:16" } ] }, "documentation": null, - "id": 2724, + "id": 2776, "implemented": true, "kind": "function", "modifiers": [], "name": "repayBorrowBehalfThroughProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 2700, + "id": 2752, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2695, + "id": 2747, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 2724, - "src": "6245:17:16", + "scope": 2776, + "src": "7000:17:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8382,10 +8698,10 @@ "typeString": "address" }, "typeName": { - "id": 2694, + "id": 2746, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6245:7:16", + "src": "7000:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8397,11 +8713,11 @@ }, { "constant": false, - "id": 2697, + "id": 2749, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2724, - "src": "6264:14:16", + "scope": 2776, + "src": "7027:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8409,10 +8725,10 @@ "typeString": "address" }, "typeName": { - "id": 2696, + "id": 2748, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6264:7:16", + "src": "7027:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8424,11 +8740,11 @@ }, { "constant": false, - "id": 2699, + "id": 2751, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2724, - "src": "6280:11:16", + "scope": 2776, + "src": "7051:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8436,10 +8752,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2698, - "name": "uint", + "id": 2750, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6280:4:16", + "src": "7051:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8449,25 +8765,25 @@ "visibility": "internal" } ], - "src": "6244:48:16" + "src": "6990:81:16" }, "returnParameters": { - "id": 2701, + "id": 2753, "nodeType": "ParameterList", "parameters": [], - "src": "6308:0:16" + "src": "7087:0:16" }, - "scope": 2785, - "src": "6206:282:16", + "scope": 2837, + "src": "6952:325:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2743, + "id": 2795, "nodeType": "Block", - "src": "6558:86:16", + "src": "7350:96:16", "statements": [ { "expression": { @@ -8475,12 +8791,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2732, + "id": 2784, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2726, - "src": "6575:6:16", + "referencedDeclaration": 2778, + "src": "7367:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8488,12 +8804,12 @@ }, { "argumentTypes": null, - "id": 2733, + "id": 2785, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2728, - "src": "6583:6:16", + "referencedDeclaration": 2780, + "src": "7375:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8511,18 +8827,18 @@ "typeString": "uint256" } ], - "id": 2731, + "id": 2783, "name": "borrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "6568:6:16", + "referencedDeclaration": 2527, + "src": "7360:6:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2734, + "id": 2786, "isConstant": false, "isLValue": false, "isPure": false, @@ -8530,15 +8846,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6568:22:16", + "src": "7360:22:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2735, + "id": 2787, "nodeType": "ExpressionStatement", - "src": "6568:22:16" + "src": "7360:22:16" }, { "expression": { @@ -8546,12 +8862,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2737, + "id": 2789, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2726, - "src": "6610:6:16", + "referencedDeclaration": 2778, + "src": "7412:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8561,18 +8877,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2738, + "id": 2790, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "6618:3:16", + "referencedDeclaration": 7818, + "src": "7420:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2739, + "id": 2791, "isConstant": false, "isLValue": false, "isPure": false, @@ -8580,7 +8896,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6618:10:16", + "src": "7420:10:16", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -8588,12 +8904,12 @@ }, { "argumentTypes": null, - "id": 2740, + "id": 2792, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2728, - "src": "6630:6:16", + "referencedDeclaration": 2780, + "src": "7432:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8615,18 +8931,18 @@ "typeString": "uint256" } ], - "id": 2736, - "name": "_transfer", + "id": 2788, + "name": "_transferUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2248, - "src": "6600:9:16", + "referencedDeclaration": 2311, + "src": "7392:19:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 2741, + "id": 2793, "isConstant": false, "isLValue": false, "isPure": false, @@ -8634,36 +8950,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6600:37:16", + "src": "7392:47:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2742, + "id": 2794, "nodeType": "ExpressionStatement", - "src": "6600:37:16" + "src": "7392:47:16" } ] }, "documentation": null, - "id": 2744, + "id": 2796, "implemented": true, "kind": "function", "modifiers": [], "name": "borrowThroughProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 2729, + "id": 2781, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2726, + "id": 2778, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2744, - "src": "6522:14:16", + "scope": 2796, + "src": "7311:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8671,10 +8987,10 @@ "typeString": "address" }, "typeName": { - "id": 2725, + "id": 2777, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6522:7:16", + "src": "7311:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8686,11 +9002,11 @@ }, { "constant": false, - "id": 2728, + "id": 2780, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2744, - "src": "6538:11:16", + "scope": 2796, + "src": "7327:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8698,10 +9014,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2727, - "name": "uint", + "id": 2779, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6538:4:16", + "src": "7327:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8711,25 +9027,25 @@ "visibility": "internal" } ], - "src": "6521:29:16" + "src": "7310:32:16" }, "returnParameters": { - "id": 2730, + "id": 2782, "nodeType": "ParameterList", "parameters": [], - "src": "6558:0:16" + "src": "7350:0:16" }, - "scope": 2785, - "src": "6494:150:16", + "scope": 2837, + "src": "7283:163:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2763, + "id": 2815, "nodeType": "Block", - "src": "6744:86:16", + "src": "7527:96:16", "statements": [ { "expression": { @@ -8737,12 +9053,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2752, + "id": 2804, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2746, - "src": "6761:6:16", + "referencedDeclaration": 2798, + "src": "7544:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8750,12 +9066,12 @@ }, { "argumentTypes": null, - "id": 2753, + "id": 2805, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2748, - "src": "6769:6:16", + "referencedDeclaration": 2800, + "src": "7552:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8773,18 +9089,18 @@ "typeString": "uint256" } ], - "id": 2751, + "id": 2803, "name": "redeem", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2585, - "src": "6754:6:16", + "referencedDeclaration": 2669, + "src": "7537:6:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2754, + "id": 2806, "isConstant": false, "isLValue": false, "isPure": false, @@ -8792,15 +9108,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6754:22:16", + "src": "7537:22:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2755, + "id": 2807, "nodeType": "ExpressionStatement", - "src": "6754:22:16" + "src": "7537:22:16" }, { "expression": { @@ -8808,12 +9124,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2757, + "id": 2809, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2746, - "src": "6796:6:16", + "referencedDeclaration": 2798, + "src": "7589:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -8823,18 +9139,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2758, + "id": 2810, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "6804:3:16", + "referencedDeclaration": 7818, + "src": "7597:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2759, + "id": 2811, "isConstant": false, "isLValue": false, "isPure": false, @@ -8842,7 +9158,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6804:10:16", + "src": "7597:10:16", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -8850,12 +9166,12 @@ }, { "argumentTypes": null, - "id": 2760, + "id": 2812, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2748, - "src": "6816:6:16", + "referencedDeclaration": 2800, + "src": "7609:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8877,18 +9193,18 @@ "typeString": "uint256" } ], - "id": 2756, - "name": "_transfer", + "id": 2808, + "name": "_transferUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2248, - "src": "6786:9:16", + "referencedDeclaration": 2311, + "src": "7569:19:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 2761, + "id": 2813, "isConstant": false, "isLValue": false, "isPure": false, @@ -8896,36 +9212,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6786:37:16", + "src": "7569:47:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2762, + "id": 2814, "nodeType": "ExpressionStatement", - "src": "6786:37:16" + "src": "7569:47:16" } ] }, "documentation": null, - "id": 2764, + "id": 2816, "implemented": true, "kind": "function", "modifiers": [], "name": "redeemThroughProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 2749, + "id": 2801, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2746, + "id": 2798, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2764, - "src": "6687:14:16", + "scope": 2816, + "src": "7480:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8933,10 +9249,10 @@ "typeString": "address" }, "typeName": { - "id": 2745, + "id": 2797, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6687:7:16", + "src": "7480:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8948,11 +9264,11 @@ }, { "constant": false, - "id": 2748, + "id": 2800, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2764, - "src": "6711:11:16", + "scope": 2816, + "src": "7496:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -8960,10 +9276,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2747, - "name": "uint", + "id": 2799, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6711:4:16", + "src": "7496:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -8973,25 +9289,25 @@ "visibility": "internal" } ], - "src": "6677:51:16" + "src": "7479:32:16" }, "returnParameters": { - "id": 2750, + "id": 2802, "nodeType": "ParameterList", "parameters": [], - "src": "6744:0:16" + "src": "7527:0:16" }, - "scope": 2785, - "src": "6650:180:16", + "scope": 2837, + "src": "7452:171:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2783, + "id": 2835, "nodeType": "Block", - "src": "6940:96:16", + "src": "7734:106:16", "statements": [ { "expression": { @@ -8999,12 +9315,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2772, + "id": 2824, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2766, - "src": "6967:6:16", + "referencedDeclaration": 2818, + "src": "7761:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9012,12 +9328,12 @@ }, { "argumentTypes": null, - "id": 2773, + "id": 2825, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2768, - "src": "6975:6:16", + "referencedDeclaration": 2820, + "src": "7769:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9035,18 +9351,18 @@ "typeString": "uint256" } ], - "id": 2771, + "id": 2823, "name": "redeemUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2605, - "src": "6950:16:16", + "referencedDeclaration": 2689, + "src": "7744:16:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2774, + "id": 2826, "isConstant": false, "isLValue": false, "isPure": false, @@ -9054,15 +9370,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6950:32:16", + "src": "7744:32:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2775, + "id": 2827, "nodeType": "ExpressionStatement", - "src": "6950:32:16" + "src": "7744:32:16" }, { "expression": { @@ -9070,12 +9386,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2777, + "id": 2829, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2766, - "src": "7002:6:16", + "referencedDeclaration": 2818, + "src": "7806:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9085,18 +9401,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2778, + "id": 2830, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "7010:3:16", + "referencedDeclaration": 7818, + "src": "7814:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2779, + "id": 2831, "isConstant": false, "isLValue": false, "isPure": false, @@ -9104,7 +9420,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7010:10:16", + "src": "7814:10:16", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -9112,12 +9428,12 @@ }, { "argumentTypes": null, - "id": 2780, + "id": 2832, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2768, - "src": "7022:6:16", + "referencedDeclaration": 2820, + "src": "7826:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9139,18 +9455,18 @@ "typeString": "uint256" } ], - "id": 2776, - "name": "_transfer", + "id": 2828, + "name": "_transferUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2248, - "src": "6992:9:16", + "referencedDeclaration": 2311, + "src": "7786:19:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 2781, + "id": 2833, "isConstant": false, "isLValue": false, "isPure": false, @@ -9158,36 +9474,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6992:37:16", + "src": "7786:47:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2782, + "id": 2834, "nodeType": "ExpressionStatement", - "src": "6992:37:16" + "src": "7786:47:16" } ] }, "documentation": null, - "id": 2784, + "id": 2836, "implemented": true, "kind": "function", "modifiers": [], "name": "redeemUnderlyingThroughProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 2769, + "id": 2821, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2766, + "id": 2818, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2784, - "src": "6883:14:16", + "scope": 2836, + "src": "7667:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9195,10 +9511,10 @@ "typeString": "address" }, "typeName": { - "id": 2765, + "id": 2817, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6883:7:16", + "src": "7667:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9210,11 +9526,11 @@ }, { "constant": false, - "id": 2768, + "id": 2820, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2784, - "src": "6907:11:16", + "scope": 2836, + "src": "7683:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9222,10 +9538,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2767, - "name": "uint", + "id": 2819, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6907:4:16", + "src": "7683:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9235,39 +9551,39 @@ "visibility": "internal" } ], - "src": "6873:51:16" + "src": "7666:32:16" }, "returnParameters": { - "id": 2770, + "id": 2822, "nodeType": "ParameterList", "parameters": [], - "src": "6940:0:16" + "src": "7734:0:16" }, - "scope": 2785, - "src": "6836:200:16", + "scope": 2837, + "src": "7629:211:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" } ], - "scope": 2786, - "src": "343:6695:16" + "scope": 2838, + "src": "396:7446:16" } ], - "src": "129:6910:16" + "src": "129:7714:16" }, "legacyAST": { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/compound/CompoundBase.sol", "exportedSymbols": { "CompoundBase": [ - 2785 + 2837 ] }, - "id": 2786, + "id": 2838, "nodeType": "SourceUnit", "nodes": [ { - "id": 2140, + "id": 2166, "literals": [ "solidity", "0.5", @@ -9279,10 +9595,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", "file": "../../interfaces/compound/IComptroller.sol", - "id": 2141, + "id": 2167, "nodeType": "ImportDirective", - "scope": 2786, - "sourceUnit": 1097, + "scope": 2838, + "sourceUnit": 1123, "src": "154:52:16", "symbolAliases": [], "unitAlias": "" @@ -9290,10 +9606,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol", "file": "../../interfaces/compound/ICEther.sol", - "id": 2142, + "id": 2168, "nodeType": "ImportDirective", - "scope": 2786, - "sourceUnit": 733, + "scope": 2838, + "sourceUnit": 746, "src": "207:47:16", "symbolAliases": [], "unitAlias": "" @@ -9301,10 +9617,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol", "file": "../../interfaces/compound/ICToken.sol", - "id": 2143, + "id": 2169, "nodeType": "ImportDirective", - "scope": 2786, - "sourceUnit": 859, + "scope": 2838, + "sourceUnit": 885, "src": "255:47:16", "symbolAliases": [], "unitAlias": "" @@ -9312,34 +9628,72 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 2144, + "id": 2170, "nodeType": "ImportDirective", - "scope": 2786, + "scope": 2838, "sourceUnit": 121, "src": "304:37:16", "symbolAliases": [], "unitAlias": "" }, + { + "absolutePath": "@openzeppelin/contracts/math/SafeMath.sol", + "file": "@openzeppelin/contracts/math/SafeMath.sol", + "id": 2171, + "nodeType": "ImportDirective", + "scope": 2838, + "sourceUnit": 7729, + "src": "343:51:16", + "symbolAliases": [], + "unitAlias": "" + }, { "baseContracts": [], "contractDependencies": [], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2785, + "id": 2837, "linearizedBaseContracts": [ - 2785 + 2837 ], "name": "CompoundBase", "nodeType": "ContractDefinition", "nodes": [ + { + "id": 2174, + "libraryName": { + "contractScope": null, + "id": 2172, + "name": "SafeMath", + "nodeType": "UserDefinedTypeName", + "referencedDeclaration": 7728, + "src": "430:8:16", + "typeDescriptions": { + "typeIdentifier": "t_contract$_SafeMath_$7728", + "typeString": "library SafeMath" + } + }, + "nodeType": "UsingForDirective", + "src": "424:27:16", + "typeName": { + "id": 2173, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "443:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + }, { "constant": true, - "id": 2147, + "id": 2177, "name": "CompoundComptrollerAddress", "nodeType": "VariableDeclaration", - "scope": 2785, - "src": "371:88:16", + "scope": 2837, + "src": "457:88:16", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -9347,10 +9701,10 @@ "typeString": "address" }, "typeName": { - "id": 2145, + "id": 2175, "name": "address", "nodeType": "ElementaryTypeName", - "src": "371:7:16", + "src": "457:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9360,14 +9714,14 @@ "value": { "argumentTypes": null, "hexValue": "307833643938313932313041333162343936316233304546353462453261654437394239633943643342", - "id": 2146, + "id": 2176, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "417:42:16", + "src": "503:42:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -9379,11 +9733,11 @@ }, { "constant": true, - "id": 2150, + "id": 2180, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 2785, - "src": "465:75:16", + "scope": 2837, + "src": "551:75:16", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -9391,10 +9745,10 @@ "typeString": "address" }, "typeName": { - "id": 2148, + "id": 2178, "name": "address", "nodeType": "ElementaryTypeName", - "src": "465:7:16", + "src": "551:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9404,14 +9758,14 @@ "value": { "argumentTypes": null, "hexValue": "307834446463324431393339343839323644303266394231664539653164616130373138323730454435", - "id": 2149, + "id": 2179, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "498:42:16", + "src": "584:42:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -9423,9 +9777,9 @@ }, { "body": { - "id": 2174, + "id": 2204, "nodeType": "Block", - "src": "614:102:16", + "src": "700:102:16", "statements": [ { "expression": { @@ -9437,19 +9791,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2162, + "id": 2192, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2160, + "id": 2190, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2154, - "src": "632:1:16", + "referencedDeclaration": 2184, + "src": "718:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9459,18 +9813,18 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 2161, + "id": 2191, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2152, - "src": "637:1:16", + "referencedDeclaration": 2182, + "src": "723:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "632:6:16", + "src": "718:6:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -9479,14 +9833,14 @@ { "argumentTypes": null, "hexValue": "736166652d6d6174682d7375622d6661696c6564", - "id": 2163, + "id": 2193, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "640:22:16", + "src": "726:22:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_7f8c7307a443d266921963bec94cdc3284a5bd12537c4fb2de8d3f3d9315cda6", @@ -9506,50 +9860,344 @@ "typeString": "literal_string \"safe-math-sub-failed\"" } ], - "id": 2159, + "id": 2189, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "624:7:16", + "referencedDeclaration": 7822, + "src": "710:7:16", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 2194, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "710:39:16", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 2195, + "nodeType": "ExpressionStatement", + "src": "710:39:16" + }, + { + "assignments": [ + 2197 + ], + "declarations": [ + { + "constant": false, + "id": 2197, + "name": "c", + "nodeType": "VariableDeclaration", + "scope": 2204, + "src": "759:9:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2196, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "759:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 2201, + "initialValue": { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "id": 2200, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "id": 2198, + "name": "a", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2182, + "src": "771:1:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "BinaryOperation", + "operator": "-", + "rightExpression": { + "argumentTypes": null, + "id": 2199, + "name": "b", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2184, + "src": "775:1:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "src": "771:5:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "759:17:16" + }, + { + "expression": { + "argumentTypes": null, + "id": 2202, + "name": "c", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2197, + "src": "794:1:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "functionReturnParameters": 2188, + "id": 2203, + "nodeType": "Return", + "src": "787:8:16" + } + ] + }, + "documentation": null, + "id": 2205, + "implemented": true, + "kind": "function", + "modifiers": [], + "name": "sub", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 2185, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 2182, + "name": "a", + "nodeType": "VariableDeclaration", + "scope": 2205, + "src": "646:9:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2181, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "646:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2184, + "name": "b", + "nodeType": "VariableDeclaration", + "scope": 2205, + "src": "657:9:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2183, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "657:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "645:22:16" + }, + "returnParameters": { + "id": 2188, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 2187, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 2205, + "src": "691:7:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2186, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "691:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "690:9:16" + }, + "scope": 2837, + "src": "633:169:16", + "stateMutability": "pure", + "superFunction": null, + "visibility": "internal" + }, + { + "body": { + "id": 2237, + "nodeType": "Block", + "src": "955:330:16", + "statements": [ + { + "assignments": [ + 2215, + 2217, + 2219, + 2221 + ], + "declarations": [ + { + "constant": false, + "id": 2215, + "name": "err", + "nodeType": "VariableDeclaration", + "scope": 2237, + "src": "979:11:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2214, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "979:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2217, + "name": "cTokenBalance", + "nodeType": "VariableDeclaration", + "scope": 2237, + "src": "1004:21:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2216, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "1004:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2219, + "name": "borrowBalance", + "nodeType": "VariableDeclaration", + "scope": 2237, + "src": "1039:21:16", + "stateVariable": false, + "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", - "typeString": "function (bool,string memory) pure" - } + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2218, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "1039:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" }, - "id": 2164, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "624:39:16", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 2165, - "nodeType": "ExpressionStatement", - "src": "624:39:16" - }, - { - "assignments": [ - 2167 - ], - "declarations": [ { "constant": false, - "id": 2167, - "name": "c", + "id": 2221, + "name": "exchangeRateMantissa", "nodeType": "VariableDeclaration", - "scope": 2174, - "src": "673:9:16", + "scope": 2237, + "src": "1074:28:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9557,10 +10205,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2166, + "id": 2220, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "673:7:16", + "src": "1074:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9570,108 +10218,274 @@ "visibility": "internal" } ], - "id": 2171, + "id": 2228, "initialValue": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "arguments": [ + { + "argumentTypes": null, + "id": 2226, + "name": "owner", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2209, + "src": "1150:5:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2223, + "name": "cToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2207, + "src": "1123:6:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 2222, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "1115:7:16", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" + } + }, + "id": 2224, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1115:15:16", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" + } + }, + "id": 2225, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "getAccountSnapshot", + "nodeType": "MemberAccess", + "referencedDeclaration": 830, + "src": "1115:34:16", + "typeDescriptions": { + "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", + "typeString": "function (address) view external returns (uint256,uint256,uint256,uint256)" + } }, - "id": 2170, + "id": 2227, "isConstant": false, "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 2168, - "name": "a", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2152, - "src": "685:1:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "-", - "rightExpression": { - "argumentTypes": null, - "id": 2169, - "name": "b", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2154, - "src": "689:1:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "685:5:16", + "names": [], + "nodeType": "FunctionCall", + "src": "1115:41:16", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_tuple$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", + "typeString": "tuple(uint256,uint256,uint256,uint256)" } }, "nodeType": "VariableDeclarationStatement", - "src": "673:17:16" + "src": "965:191:16" }, { "expression": { "argumentTypes": null, - "id": 2172, - "name": "c", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2167, - "src": "708:1:16", + "arguments": [ + { + "argumentTypes": null, + "hexValue": "31653138", + "id": 2234, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "1273:4:16", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_1000000000000000000_by_1", + "typeString": "int_const 1000000000000000000" + }, + "value": "1e18" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_1000000000000000000_by_1", + "typeString": "int_const 1000000000000000000" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2231, + "name": "exchangeRateMantissa", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2221, + "src": "1247:20:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "id": 2229, + "name": "cTokenBalance", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2217, + "src": "1229:13:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 2230, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 7645, + "src": "1229:17:16", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 2232, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1229:39:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 2233, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "div", + "nodeType": "MemberAccess", + "referencedDeclaration": 7661, + "src": "1229:43:16", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 2235, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1229:49:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 2158, - "id": 2173, + "functionReturnParameters": 2213, + "id": 2236, "nodeType": "Return", - "src": "701:8:16" + "src": "1222:56:16" } ] }, "documentation": null, - "id": 2175, + "id": 2238, "implemented": true, "kind": "function", "modifiers": [], - "name": "sub", + "name": "getBorrowBalanceUnderlying", "nodeType": "FunctionDefinition", "parameters": { - "id": 2155, + "id": 2210, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2152, - "name": "a", + "id": 2207, + "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2175, - "src": "560:9:16", + "scope": 2238, + "src": "853:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" }, "typeName": { - "id": 2151, - "name": "uint256", + "id": 2206, + "name": "address", "nodeType": "ElementaryTypeName", - "src": "560:7:16", + "src": "853:7:16", + "stateMutability": "nonpayable", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } }, "value": null, @@ -9679,44 +10493,45 @@ }, { "constant": false, - "id": 2154, - "name": "b", + "id": 2209, + "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2175, - "src": "571:9:16", + "scope": 2238, + "src": "877:13:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" }, "typeName": { - "id": 2153, - "name": "uint256", + "id": 2208, + "name": "address", "nodeType": "ElementaryTypeName", - "src": "571:7:16", + "src": "877:7:16", + "stateMutability": "nonpayable", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } }, "value": null, "visibility": "internal" } ], - "src": "559:22:16" + "src": "843:53:16" }, "returnParameters": { - "id": 2158, + "id": 2213, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2157, + "id": 2212, "name": "", "nodeType": "VariableDeclaration", - "scope": 2175, - "src": "605:7:16", + "scope": 2238, + "src": "942:7:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9724,10 +10539,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2156, + "id": 2211, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "605:7:16", + "src": "942:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9737,32 +10552,32 @@ "visibility": "internal" } ], - "src": "604:9:16" + "src": "941:9:16" }, - "scope": 2785, - "src": "547:169:16", - "stateMutability": "pure", + "scope": 2837, + "src": "808:477:16", + "stateMutability": "view", "superFunction": null, - "visibility": "internal" + "visibility": "public" }, { "body": { - "id": 2206, + "id": 2269, "nodeType": "Block", - "src": "856:211:16", + "src": "1438:221:16", "statements": [ { "assignments": [ - 2187 + 2250 ], "declarations": [ { "constant": false, - "id": 2187, + "id": 2250, "name": "underlying", "nodeType": "VariableDeclaration", - "scope": 2206, - "src": "866:18:16", + "scope": 2269, + "src": "1448:18:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -9770,10 +10585,10 @@ "typeString": "address" }, "typeName": { - "id": 2186, + "id": 2249, "name": "address", "nodeType": "ElementaryTypeName", - "src": "866:7:16", + "src": "1448:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9784,7 +10599,7 @@ "visibility": "internal" } ], - "id": 2193, + "id": 2256, "initialValue": { "argumentTypes": null, "arguments": [], @@ -9795,12 +10610,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2189, + "id": 2252, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2181, - "src": "895:6:16", + "referencedDeclaration": 2244, + "src": "1477:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9814,18 +10629,18 @@ "typeString": "address" } ], - "id": 2188, + "id": 2251, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "887:7:16", + "referencedDeclaration": 884, + "src": "1469:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2190, + "id": 2253, "isConstant": false, "isLValue": false, "isPure": false, @@ -9833,27 +10648,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "887:15:16", + "src": "1469:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2191, + "id": 2254, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "887:26:16", + "referencedDeclaration": 835, + "src": "1469:26:16", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 2192, + "id": 2255, "isConstant": false, "isLValue": false, "isPure": false, @@ -9861,14 +10676,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "887:28:16", + "src": "1469:28:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "866:49:16" + "src": "1448:49:16" }, { "expression": { @@ -9879,12 +10694,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2199, + "id": 2262, "name": "sender", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2177, - "src": "978:6:16", + "referencedDeclaration": 2240, + "src": "1560:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9892,12 +10707,12 @@ }, { "argumentTypes": null, - "id": 2200, + "id": 2263, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2179, - "src": "986:9:16", + "referencedDeclaration": 2242, + "src": "1568:9:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9905,12 +10720,12 @@ }, { "argumentTypes": null, - "id": 2201, + "id": 2264, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2183, - "src": "997:6:16", + "referencedDeclaration": 2246, + "src": "1579:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -9937,12 +10752,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2196, + "id": 2259, "name": "underlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2187, - "src": "953:10:16", + "referencedDeclaration": 2250, + "src": "1535:10:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -9956,18 +10771,18 @@ "typeString": "address" } ], - "id": 2195, + "id": 2258, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 120, - "src": "946:6:16", + "src": "1528:6:16", "typeDescriptions": { "typeIdentifier": "t_type$_t_contract$_IERC20_$120_$", "typeString": "type(contract IERC20)" } }, - "id": 2197, + "id": 2260, "isConstant": false, "isLValue": false, "isPure": false, @@ -9975,13 +10790,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "946:18:16", + "src": "1528:18:16", "typeDescriptions": { "typeIdentifier": "t_contract$_IERC20_$120", "typeString": "contract IERC20" } }, - "id": 2198, + "id": 2261, "isConstant": false, "isLValue": false, "isPure": false, @@ -9989,13 +10804,13 @@ "memberName": "transferFrom", "nodeType": "MemberAccess", "referencedDeclaration": 88, - "src": "946:31:16", + "src": "1528:31:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,address,uint256) external returns (bool)" } }, - "id": 2202, + "id": 2265, "isConstant": false, "isLValue": false, "isPure": false, @@ -10003,7 +10818,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "946:58:16", + "src": "1528:58:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10011,21 +10826,21 @@ }, { "argumentTypes": null, - "hexValue": "636d706e642d6d67722d7472616e736665722d66726f6d2d6661696c6564", - "id": 2203, + "hexValue": "636d706e642d6d67722d7472616e7366657246726f6d2d756e6465726c79696e672d6661696c6564", + "id": 2266, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "1018:32:16", + "src": "1600:42:16", "subdenomination": null, "typeDescriptions": { - "typeIdentifier": "t_stringliteral_988f4b216d59d8ffb8b0197685cfb8e661f26f50842dcde245fb338bad4bf3c7", - "typeString": "literal_string \"cmpnd-mgr-transfer-from-failed\"" + "typeIdentifier": "t_stringliteral_846e5515f3943b69728da09b85525376521c6f329758b130b66130c1fe9752fc", + "typeString": "literal_string \"cmpnd-mgr-transferFrom-underlying-failed\"" }, - "value": "cmpnd-mgr-transfer-from-failed" + "value": "cmpnd-mgr-transferFrom-underlying-failed" } ], "expression": { @@ -10035,25 +10850,25 @@ "typeString": "bool" }, { - "typeIdentifier": "t_stringliteral_988f4b216d59d8ffb8b0197685cfb8e661f26f50842dcde245fb338bad4bf3c7", - "typeString": "literal_string \"cmpnd-mgr-transfer-from-failed\"" + "typeIdentifier": "t_stringliteral_846e5515f3943b69728da09b85525376521c6f329758b130b66130c1fe9752fc", + "typeString": "literal_string \"cmpnd-mgr-transferFrom-underlying-failed\"" } ], - "id": 2194, + "id": 2257, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "925:7:16", + "referencedDeclaration": 7822, + "src": "1507:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2204, + "id": 2267, "isConstant": false, "isLValue": false, "isPure": false, @@ -10061,36 +10876,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "925:135:16", + "src": "1507:145:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2205, + "id": 2268, "nodeType": "ExpressionStatement", - "src": "925:135:16" + "src": "1507:145:16" } ] }, "documentation": null, - "id": 2207, + "id": 2270, "implemented": true, "kind": "function", "modifiers": [], - "name": "_transferFrom", + "name": "_transferFromUnderlying", "nodeType": "FunctionDefinition", "parameters": { - "id": 2184, + "id": 2247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2177, + "id": 2240, "name": "sender", "nodeType": "VariableDeclaration", - "scope": 2207, - "src": "754:14:16", + "scope": 2270, + "src": "1333:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10098,10 +10913,10 @@ "typeString": "address" }, "typeName": { - "id": 2176, + "id": 2239, "name": "address", "nodeType": "ElementaryTypeName", - "src": "754:7:16", + "src": "1333:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10113,11 +10928,11 @@ }, { "constant": false, - "id": 2179, + "id": 2242, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 2207, - "src": "778:17:16", + "scope": 2270, + "src": "1357:17:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10125,10 +10940,10 @@ "typeString": "address" }, "typeName": { - "id": 2178, + "id": 2241, "name": "address", "nodeType": "ElementaryTypeName", - "src": "778:7:16", + "src": "1357:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10140,11 +10955,11 @@ }, { "constant": false, - "id": 2181, + "id": 2244, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2207, - "src": "805:14:16", + "scope": 2270, + "src": "1384:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10152,10 +10967,10 @@ "typeString": "address" }, "typeName": { - "id": 2180, + "id": 2243, "name": "address", "nodeType": "ElementaryTypeName", - "src": "805:7:16", + "src": "1384:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10167,11 +10982,11 @@ }, { "constant": false, - "id": 2183, + "id": 2246, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2207, - "src": "829:11:16", + "scope": 2270, + "src": "1408:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10179,10 +10994,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2182, - "name": "uint", + "id": 2245, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "829:4:16", + "src": "1408:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10192,25 +11007,25 @@ "visibility": "internal" } ], - "src": "744:102:16" + "src": "1323:105:16" }, "returnParameters": { - "id": 2185, + "id": 2248, "nodeType": "ParameterList", "parameters": [], - "src": "856:0:16" + "src": "1438:0:16" }, - "scope": 2785, - "src": "722:345:16", + "scope": 2837, + "src": "1291:368:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 2247, + "id": 2310, "nodeType": "Block", - "src": "1179:281:16", + "src": "1784:350:16", "statements": [ { "condition": { @@ -10219,19 +11034,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2218, + "id": 2281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2216, + "id": 2279, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2209, - "src": "1193:6:16", + "referencedDeclaration": 2272, + "src": "1798:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10241,27 +11056,27 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2217, + "id": 2280, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "1203:13:16", + "referencedDeclaration": 2180, + "src": "1808:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "1193:23:16", + "src": "1798:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2245, + "id": 2308, "nodeType": "Block", - "src": "1281:173:16", + "src": "1886:242:16", "statements": [ { "expression": { @@ -10272,12 +11087,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2239, + "id": 2302, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2211, - "src": "1366:9:16", + "referencedDeclaration": 2274, + "src": "1992:9:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10285,12 +11100,12 @@ }, { "argumentTypes": null, - "id": 2240, + "id": 2303, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2213, - "src": "1377:6:16", + "referencedDeclaration": 2276, + "src": "2023:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10321,12 +11136,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2233, + "id": 2296, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2209, - "src": "1335:6:16", + "referencedDeclaration": 2272, + "src": "1940:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10340,18 +11155,18 @@ "typeString": "address" } ], - "id": 2232, + "id": 2295, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "1327:7:16", + "referencedDeclaration": 884, + "src": "1932:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2234, + "id": 2297, "isConstant": false, "isLValue": false, "isPure": false, @@ -10359,27 +11174,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1327:15:16", + "src": "1932:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2235, + "id": 2298, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "1327:26:16", + "referencedDeclaration": 835, + "src": "1932:26:16", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 2236, + "id": 2299, "isConstant": false, "isLValue": false, "isPure": false, @@ -10387,7 +11202,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1327:28:16", + "src": "1932:28:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10401,18 +11216,18 @@ "typeString": "address" } ], - "id": 2231, + "id": 2294, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 120, - "src": "1320:6:16", + "src": "1925:6:16", "typeDescriptions": { "typeIdentifier": "t_type$_t_contract$_IERC20_$120_$", "typeString": "type(contract IERC20)" } }, - "id": 2237, + "id": 2300, "isConstant": false, "isLValue": false, "isPure": false, @@ -10420,13 +11235,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1320:36:16", + "src": "1925:36:16", "typeDescriptions": { "typeIdentifier": "t_contract$_IERC20_$120", "typeString": "contract IERC20" } }, - "id": 2238, + "id": 2301, "isConstant": false, "isLValue": false, "isPure": false, @@ -10434,13 +11249,13 @@ "memberName": "transfer", "nodeType": "MemberAccess", "referencedDeclaration": 59, - "src": "1320:45:16", + "src": "1925:45:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2241, + "id": 2304, "isConstant": false, "isLValue": false, "isPure": false, @@ -10448,7 +11263,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1320:64:16", + "src": "1925:122:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -10456,21 +11271,21 @@ }, { "argumentTypes": null, - "hexValue": "636d706e642d6d67722d7472616e736665722d6661696c6564", - "id": 2242, + "hexValue": "636d706e642d6d67722d7472616e736665722d756e6465726c79696e672d6661696c6564", + "id": 2305, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "1402:27:16", + "src": "2065:38:16", "subdenomination": null, "typeDescriptions": { - "typeIdentifier": "t_stringliteral_a0b492c6552587e508e318f471f5c8125b6edf0db99286af9f7919fd44bd2148", - "typeString": "literal_string \"cmpnd-mgr-transfer-failed\"" + "typeIdentifier": "t_stringliteral_eb556e8ac6248652710a553e310393750ebf619ce763819fd0e93bcd4cf6350f", + "typeString": "literal_string \"cmpnd-mgr-transfer-underlying-failed\"" }, - "value": "cmpnd-mgr-transfer-failed" + "value": "cmpnd-mgr-transfer-underlying-failed" } ], "expression": { @@ -10480,202 +11295,500 @@ "typeString": "bool" }, { - "typeIdentifier": "t_stringliteral_a0b492c6552587e508e318f471f5c8125b6edf0db99286af9f7919fd44bd2148", - "typeString": "literal_string \"cmpnd-mgr-transfer-failed\"" + "typeIdentifier": "t_stringliteral_eb556e8ac6248652710a553e310393750ebf619ce763819fd0e93bcd4cf6350f", + "typeString": "literal_string \"cmpnd-mgr-transfer-underlying-failed\"" } ], - "id": 2230, + "id": 2293, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 + ], + "referencedDeclaration": 7822, + "src": "1900:7:16", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 2306, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1900:217:16", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 2307, + "nodeType": "ExpressionStatement", + "src": "1900:217:16" + } + ] + }, + "id": 2309, + "nodeType": "IfStatement", + "src": "1794:334:16", + "trueBody": { + "id": 2292, + "nodeType": "Block", + "src": "1823:57:16", + "statements": [ + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "", + "id": 2289, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "1866:2:16", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", + "typeString": "literal_string \"\"" + }, + "value": "" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", + "typeString": "literal_string \"\"" + } + ], + "arguments": [ + { + "argumentTypes": null, + "id": 2287, + "name": "amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2276, + "src": "1858:6:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } ], - "referencedDeclaration": 7831, - "src": "1295:7:16", + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 2282, + "name": "recipient", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2274, + "src": "1837:9:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "id": 2285, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "call", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "1837:14:16", + "typeDescriptions": { + "typeIdentifier": "t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$", + "typeString": "function (bytes memory) payable returns (bool,bytes memory)" + } + }, + "id": 2286, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "value", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "1837:20:16", + "typeDescriptions": { + "typeIdentifier": "t_function_setvalue_pure$_t_uint256_$returns$_t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$value_$", + "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" + } + }, + "id": 2288, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1837:28:16", + "typeDescriptions": { + "typeIdentifier": "t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$value", + "typeString": "function (bytes memory) payable returns (bool,bytes memory)" + } + }, + "id": 2290, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1837:32:16", + "typeDescriptions": { + "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$", + "typeString": "tuple(bool,bytes memory)" + } + }, + "id": 2291, + "nodeType": "ExpressionStatement", + "src": "1837:32:16" + } + ] + } + } + ] + }, + "documentation": null, + "id": 2311, + "implemented": true, + "kind": "function", + "modifiers": [], + "name": "_transferUnderlying", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 2277, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 2272, + "name": "cToken", + "nodeType": "VariableDeclaration", + "scope": 2311, + "src": "1703:14:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 2271, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1703:7:16", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2274, + "name": "recipient", + "nodeType": "VariableDeclaration", + "scope": 2311, + "src": "1727:17:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 2273, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1727:7:16", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2276, + "name": "amount", + "nodeType": "VariableDeclaration", + "scope": 2311, + "src": "1754:14:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2275, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "1754:7:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "1693:81:16" + }, + "returnParameters": { + "id": 2278, + "nodeType": "ParameterList", + "parameters": [], + "src": "1784:0:16" + }, + "scope": 2837, + "src": "1665:469:16", + "stateMutability": "nonpayable", + "superFunction": null, + "visibility": "internal" + }, + { + "body": { + "id": 2331, + "nodeType": "Block", + "src": "2230:130:16", + "statements": [ + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 2325, + "name": "recipient", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2315, + "src": "2284:9:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 2326, + "name": "amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2317, + "src": "2295:6:16", "typeDescriptions": { - "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", - "typeString": "function (bool,string memory) pure" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - }, - "id": 2243, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1295:148:16", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" } - }, - "id": 2244, - "nodeType": "ExpressionStatement", - "src": "1295:148:16" - } - ] - }, - "id": 2246, - "nodeType": "IfStatement", - "src": "1189:265:16", - "trueBody": { - "id": 2229, - "nodeType": "Block", - "src": "1218:57:16", - "statements": [ - { + ], "expression": { - "argumentTypes": null, - "arguments": [ + "argumentTypes": [ { - "argumentTypes": null, - "hexValue": "", - "id": 2226, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "string", - "lValueRequested": false, - "nodeType": "Literal", - "src": "1261:2:16", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", - "typeString": "literal_string \"\"" - }, - "value": "" + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } ], "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", - "typeString": "literal_string \"\"" - } - ], + "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2224, - "name": "amount", + "id": 2322, + "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2213, - "src": "1253:6:16", + "referencedDeclaration": 2313, + "src": "2268:5:16", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } } ], "expression": { "argumentTypes": [ { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } ], - "expression": { - "argumentTypes": null, - "expression": { - "argumentTypes": null, - "id": 2219, - "name": "recipient", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2211, - "src": "1232:9:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "id": 2222, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "call", - "nodeType": "MemberAccess", - "referencedDeclaration": null, - "src": "1232:14:16", - "typeDescriptions": { - "typeIdentifier": "t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$", - "typeString": "function (bytes memory) payable returns (bool,bytes memory)" - } - }, - "id": 2223, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "value", - "nodeType": "MemberAccess", - "referencedDeclaration": null, - "src": "1232:20:16", + "id": 2321, + "name": "IERC20", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 120, + "src": "2261:6:16", "typeDescriptions": { - "typeIdentifier": "t_function_setvalue_pure$_t_uint256_$returns$_t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$value_$", - "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" + "typeIdentifier": "t_type$_t_contract$_IERC20_$120_$", + "typeString": "type(contract IERC20)" } }, - "id": 2225, + "id": 2323, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", + "kind": "typeConversion", "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1232:28:16", + "src": "2261:13:16", "typeDescriptions": { - "typeIdentifier": "t_function_barecall_payable$_t_bytes_memory_ptr_$returns$_t_bool_$_t_bytes_memory_ptr_$value", - "typeString": "function (bytes memory) payable returns (bool,bytes memory)" + "typeIdentifier": "t_contract$_IERC20_$120", + "typeString": "contract IERC20" } }, - "id": 2227, + "id": 2324, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1232:32:16", + "memberName": "transfer", + "nodeType": "MemberAccess", + "referencedDeclaration": 59, + "src": "2261:22:16", "typeDescriptions": { - "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$", - "typeString": "tuple(bool,bytes memory)" + "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", + "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2228, - "nodeType": "ExpressionStatement", - "src": "1232:32:16" + "id": 2327, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2261:41:16", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + { + "argumentTypes": null, + "hexValue": "636d706e642d6d67722d7472616e736665722d6661696c6564", + "id": 2328, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "2316:27:16", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_a0b492c6552587e508e318f471f5c8125b6edf0db99286af9f7919fd44bd2148", + "typeString": "literal_string \"cmpnd-mgr-transfer-failed\"" + }, + "value": "cmpnd-mgr-transfer-failed" } - ] - } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_a0b492c6552587e508e318f471f5c8125b6edf0db99286af9f7919fd44bd2148", + "typeString": "literal_string \"cmpnd-mgr-transfer-failed\"" + } + ], + "id": 2320, + "name": "require", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 7821, + 7822 + ], + "referencedDeclaration": 7822, + "src": "2240:7:16", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 2329, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2240:113:16", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 2330, + "nodeType": "ExpressionStatement", + "src": "2240:113:16" } ] }, "documentation": null, - "id": 2248, + "id": 2332, "implemented": true, "kind": "function", "modifiers": [], "name": "_transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 2214, + "id": 2318, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2209, - "name": "cToken", + "id": 2313, + "name": "token", "nodeType": "VariableDeclaration", - "scope": 2248, - "src": "1101:14:16", + "scope": 2332, + "src": "2159:13:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10683,10 +11796,10 @@ "typeString": "address" }, "typeName": { - "id": 2208, + "id": 2312, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1101:7:16", + "src": "2159:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10698,11 +11811,11 @@ }, { "constant": false, - "id": 2211, + "id": 2315, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 2248, - "src": "1125:17:16", + "scope": 2332, + "src": "2174:17:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10710,10 +11823,10 @@ "typeString": "address" }, "typeName": { - "id": 2210, + "id": 2314, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1125:7:16", + "src": "2174:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10725,11 +11838,11 @@ }, { "constant": false, - "id": 2213, + "id": 2317, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2248, - "src": "1152:11:16", + "scope": 2332, + "src": "2193:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -10737,10 +11850,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2212, - "name": "uint", + "id": 2316, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1152:4:16", + "src": "2193:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10750,38 +11863,38 @@ "visibility": "internal" } ], - "src": "1091:78:16" + "src": "2158:50:16" }, "returnParameters": { - "id": 2215, + "id": 2319, "nodeType": "ParameterList", "parameters": [], - "src": "1179:0:16" + "src": "2230:0:16" }, - "scope": 2785, - "src": "1073:387:16", + "scope": 2837, + "src": "2140:220:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 2287, + "id": 2371, "nodeType": "Block", - "src": "1593:302:16", + "src": "2491:321:16", "statements": [ { "assignments": [ - 2257 + 2341 ], "declarations": [ { "constant": false, - "id": 2257, + "id": 2341, "name": "errors", "nodeType": "VariableDeclaration", - "scope": 2287, - "src": "1670:20:16", + "scope": 2371, + "src": "2568:23:16", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -10790,19 +11903,19 @@ }, "typeName": { "baseType": { - "id": 2255, - "name": "uint", + "id": 2339, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1670:4:16", + "src": "2568:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 2256, + "id": 2340, "length": null, "nodeType": "ArrayTypeName", - "src": "1670:6:16", + "src": "2568:9:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr", "typeString": "uint256[]" @@ -10812,18 +11925,18 @@ "visibility": "internal" } ], - "id": 2264, + "id": 2348, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 2262, + "id": 2346, "name": "cTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2251, - "src": "1747:7:16", + "referencedDeclaration": 2335, + "src": "2661:7:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -10842,12 +11955,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2259, + "id": 2343, "name": "CompoundComptrollerAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2147, - "src": "1706:26:16", + "referencedDeclaration": 2177, + "src": "2607:26:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -10861,18 +11974,18 @@ "typeString": "address" } ], - "id": 2258, + "id": 2342, "name": "IComptroller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1096, - "src": "1693:12:16", + "referencedDeclaration": 1122, + "src": "2594:12:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IComptroller_$1096_$", + "typeIdentifier": "t_type$_t_contract$_IComptroller_$1122_$", "typeString": "type(contract IComptroller)" } }, - "id": 2260, + "id": 2344, "isConstant": false, "isLValue": false, "isPure": true, @@ -10880,27 +11993,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1693:40:16", + "src": "2594:40:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_IComptroller_$1096", + "typeIdentifier": "t_contract$_IComptroller_$1122", "typeString": "contract IComptroller" } }, - "id": 2261, + "id": 2345, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "enterMarkets", "nodeType": "MemberAccess", - "referencedDeclaration": 884, - "src": "1693:53:16", + "referencedDeclaration": 910, + "src": "2594:66:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_array$_t_address_$dyn_memory_ptr_$returns$_t_array$_t_uint256_$dyn_memory_ptr_$", "typeString": "function (address[] memory) external returns (uint256[] memory)" } }, - "id": 2263, + "id": 2347, "isConstant": false, "isLValue": false, "isPure": false, @@ -10908,20 +12021,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1693:62:16", + "src": "2594:75:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, "nodeType": "VariableDeclarationStatement", - "src": "1670:85:16" + "src": "2568:101:16" }, { "body": { - "id": 2285, + "id": 2369, "nodeType": "Block", - "src": "1807:82:16", + "src": "2724:82:16", "statements": [ { "expression": { @@ -10933,7 +12046,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2281, + "id": 2365, "isConstant": false, "isLValue": false, "isPure": false, @@ -10942,26 +12055,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2277, + "id": 2361, "name": "errors", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2257, - "src": "1829:6:16", + "referencedDeclaration": 2341, + "src": "2746:6:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 2279, + "id": 2363, "indexExpression": { "argumentTypes": null, - "id": 2278, + "id": 2362, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2266, - "src": "1836:1:16", + "referencedDeclaration": 2350, + "src": "2753:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10972,7 +12085,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "1829:9:16", + "src": "2746:9:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -10983,14 +12096,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2280, + "id": 2364, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1842:1:16", + "src": "2759:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -10998,7 +12111,7 @@ }, "value": "0" }, - "src": "1829:14:16", + "src": "2746:14:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11007,14 +12120,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d656e7465722d6d61726b6574732d6661696c6564", - "id": 2282, + "id": 2366, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "1845:32:16", + "src": "2762:32:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_85cee76b557302ef3f4a648369ff7a7022c2205f14450535d6d8fab4f8b0677e", @@ -11034,21 +12147,21 @@ "typeString": "literal_string \"cmpnd-mgr-enter-markets-failed\"" } ], - "id": 2276, + "id": 2360, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "1821:7:16", + "referencedDeclaration": 7822, + "src": "2738:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2283, + "id": 2367, "isConstant": false, "isLValue": false, "isPure": false, @@ -11056,15 +12169,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1821:57:16", + "src": "2738:57:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2284, + "id": 2368, "nodeType": "ExpressionStatement", - "src": "1821:57:16" + "src": "2738:57:16" } ] }, @@ -11074,19 +12187,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2272, + "id": 2356, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2269, + "id": 2353, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2266, - "src": "1783:1:16", + "referencedDeclaration": 2350, + "src": "2700:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11098,18 +12211,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2270, + "id": 2354, "name": "errors", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2257, - "src": "1787:6:16", + "referencedDeclaration": 2341, + "src": "2704:6:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 2271, + "id": 2355, "isConstant": false, "isLValue": false, "isPure": false, @@ -11117,31 +12230,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "1787:13:16", + "src": "2704:13:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1783:17:16", + "src": "2700:17:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2286, + "id": 2370, "initializationExpression": { "assignments": [ - 2266 + 2350 ], "declarations": [ { "constant": false, - "id": 2266, + "id": 2350, "name": "i", "nodeType": "VariableDeclaration", - "scope": 2286, - "src": "1771:6:16", + "scope": 2370, + "src": "2685:9:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11149,10 +12262,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2265, - "name": "uint", + "id": 2349, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1771:4:16", + "src": "2685:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11162,18 +12275,18 @@ "visibility": "internal" } ], - "id": 2268, + "id": 2352, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 2267, + "id": 2351, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1780:1:16", + "src": "2697:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -11182,12 +12295,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "1771:10:16" + "src": "2685:13:16" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 2274, + "id": 2358, "isConstant": false, "isLValue": false, "isPure": false, @@ -11195,15 +12308,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "1802:3:16", + "src": "2719:3:16", "subExpression": { "argumentTypes": null, - "id": 2273, + "id": 2357, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2266, - "src": "1802:1:16", + "referencedDeclaration": 2350, + "src": "2719:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11214,33 +12327,33 @@ "typeString": "uint256" } }, - "id": 2275, + "id": 2359, "nodeType": "ExpressionStatement", - "src": "1802:3:16" + "src": "2719:3:16" }, "nodeType": "ForStatement", - "src": "1766:123:16" + "src": "2680:126:16" } ] }, "documentation": null, - "id": 2288, + "id": 2372, "implemented": true, "kind": "function", "modifiers": [], "name": "enterMarkets", "nodeType": "FunctionDefinition", "parameters": { - "id": 2252, + "id": 2336, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2251, + "id": 2335, "name": "cTokens", "nodeType": "VariableDeclaration", - "scope": 2288, - "src": "1497:24:16", + "scope": 2372, + "src": "2397:24:16", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -11249,20 +12362,20 @@ }, "typeName": { "baseType": { - "id": 2249, + "id": 2333, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1497:7:16", + "src": "2397:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 2250, + "id": 2334, "length": null, "nodeType": "ArrayTypeName", - "src": "1497:9:16", + "src": "2397:9:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -11272,38 +12385,38 @@ "visibility": "internal" } ], - "src": "1487:98:16" + "src": "2387:96:16" }, "returnParameters": { - "id": 2253, + "id": 2337, "nodeType": "ParameterList", "parameters": [], - "src": "1593:0:16" + "src": "2491:0:16" }, - "scope": 2785, - "src": "1466:429:16", + "scope": 2837, + "src": "2366:446:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2316, + "id": 2400, "nodeType": "Block", - "src": "1982:264:16", + "src": "2880:264:16", "statements": [ { "assignments": [ - 2296 + 2380 ], "declarations": [ { "constant": false, - "id": 2296, + "id": 2380, "name": "underlying", "nodeType": "VariableDeclaration", - "scope": 2316, - "src": "2051:18:16", + "scope": 2400, + "src": "2949:18:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11311,10 +12424,10 @@ "typeString": "address" }, "typeName": { - "id": 2295, + "id": 2379, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2051:7:16", + "src": "2949:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11325,7 +12438,7 @@ "visibility": "internal" } ], - "id": 2302, + "id": 2386, "initialValue": { "argumentTypes": null, "arguments": [], @@ -11336,12 +12449,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2298, + "id": 2382, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2290, - "src": "2080:6:16", + "referencedDeclaration": 2374, + "src": "2978:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11355,18 +12468,18 @@ "typeString": "address" } ], - "id": 2297, + "id": 2381, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "2072:7:16", + "referencedDeclaration": 884, + "src": "2970:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2299, + "id": 2383, "isConstant": false, "isLValue": false, "isPure": false, @@ -11374,27 +12487,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2072:15:16", + "src": "2970:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2300, + "id": 2384, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "2072:26:16", + "referencedDeclaration": 835, + "src": "2970:26:16", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 2301, + "id": 2385, "isConstant": false, "isLValue": false, "isPure": false, @@ -11402,14 +12515,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2072:28:16", + "src": "2970:28:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "2051:49:16" + "src": "2949:49:16" }, { "expression": { @@ -11421,7 +12534,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 2312, + "id": 2396, "isConstant": false, "isLValue": false, "isPure": false, @@ -11431,12 +12544,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2308, + "id": 2392, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2290, - "src": "2158:6:16", + "referencedDeclaration": 2374, + "src": "3056:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11444,12 +12557,12 @@ }, { "argumentTypes": null, - "id": 2309, + "id": 2393, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2292, - "src": "2166:6:16", + "referencedDeclaration": 2376, + "src": "3064:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11472,12 +12585,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2305, + "id": 2389, "name": "underlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2296, - "src": "2138:10:16", + "referencedDeclaration": 2380, + "src": "3036:10:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11491,18 +12604,18 @@ "typeString": "address" } ], - "id": 2304, + "id": 2388, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 120, - "src": "2131:6:16", + "src": "3029:6:16", "typeDescriptions": { "typeIdentifier": "t_type$_t_contract$_IERC20_$120_$", "typeString": "type(contract IERC20)" } }, - "id": 2306, + "id": 2390, "isConstant": false, "isLValue": false, "isPure": false, @@ -11510,13 +12623,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2131:18:16", + "src": "3029:18:16", "typeDescriptions": { "typeIdentifier": "t_contract$_IERC20_$120", "typeString": "contract IERC20" } }, - "id": 2307, + "id": 2391, "isConstant": false, "isLValue": false, "isPure": false, @@ -11524,13 +12637,13 @@ "memberName": "approve", "nodeType": "MemberAccess", "referencedDeclaration": 77, - "src": "2131:26:16", + "src": "3029:26:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2310, + "id": 2394, "isConstant": false, "isLValue": false, "isPure": false, @@ -11538,7 +12651,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2131:42:16", + "src": "3029:42:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11549,14 +12662,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2311, + "id": 2395, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "2177:4:16", + "src": "3075:4:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -11564,7 +12677,7 @@ }, "value": "true" }, - "src": "2131:50:16", + "src": "3029:50:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -11573,14 +12686,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564", - "id": 2313, + "id": 2397, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2195:34:16", + "src": "3093:34:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_ca9a377afbc7098beb603cadabe94f2184e0ef6e022546af9554c879436a6067", @@ -11600,21 +12713,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-approved-failed\"" } ], - "id": 2303, + "id": 2387, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "2110:7:16", + "referencedDeclaration": 7822, + "src": "3008:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2314, + "id": 2398, "isConstant": false, "isLValue": false, "isPure": false, @@ -11622,36 +12735,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2110:129:16", + "src": "3008:129:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2315, + "id": 2399, "nodeType": "ExpressionStatement", - "src": "2110:129:16" + "src": "3008:129:16" } ] }, "documentation": null, - "id": 2317, + "id": 2401, "implemented": true, "kind": "function", "modifiers": [], "name": "approveCToken", "nodeType": "FunctionDefinition", "parameters": { - "id": 2293, + "id": 2377, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2290, + "id": 2374, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2317, - "src": "1933:14:16", + "scope": 2401, + "src": "2841:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11659,10 +12772,10 @@ "typeString": "address" }, "typeName": { - "id": 2289, + "id": 2373, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1933:7:16", + "src": "2841:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11674,11 +12787,11 @@ }, { "constant": false, - "id": 2292, + "id": 2376, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2317, - "src": "1957:11:16", + "scope": 2401, + "src": "2857:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -11686,10 +12799,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2291, - "name": "uint", + "id": 2375, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1957:4:16", + "src": "2857:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11699,31 +12812,31 @@ "visibility": "internal" } ], - "src": "1923:51:16" + "src": "2840:32:16" }, "returnParameters": { - "id": 2294, + "id": 2378, "nodeType": "ParameterList", "parameters": [], - "src": "1982:0:16" + "src": "2880:0:16" }, - "scope": 2785, - "src": "1901:345:16", + "scope": 2837, + "src": "2818:326:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2353, + "id": 2437, "nodeType": "Block", - "src": "2347:228:16", + "src": "3242:234:16", "statements": [ { "body": { - "id": 2351, + "id": 2435, "nodeType": "Block", - "src": "2399:170:16", + "src": "3297:173:16", "statements": [ { "condition": { @@ -11732,7 +12845,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2338, + "id": 2422, "isConstant": false, "isLValue": false, "isPure": false, @@ -11741,26 +12854,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2334, + "id": 2418, "name": "cTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2320, - "src": "2462:7:16", + "referencedDeclaration": 2404, + "src": "3360:7:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 2336, + "id": 2420, "indexExpression": { "argumentTypes": null, - "id": 2335, + "id": 2419, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2324, - "src": "2470:1:16", + "referencedDeclaration": 2408, + "src": "3368:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11771,7 +12884,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2462:10:16", + "src": "3360:10:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11781,31 +12894,31 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 2337, + "id": 2421, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "2476:13:16", + "referencedDeclaration": 2180, + "src": "3374:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "2462:27:16", + "src": "3360:27:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2350, + "id": 2434, "nodeType": "IfStatement", - "src": "2458:101:16", + "src": "3356:104:16", "trueBody": { - "id": 2349, + "id": 2433, "nodeType": "Block", - "src": "2491:68:16", + "src": "3389:71:16", "statements": [ { "expression": { @@ -11815,26 +12928,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2340, + "id": 2424, "name": "cTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2320, - "src": "2523:7:16", + "referencedDeclaration": 2404, + "src": "3421:7:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 2342, + "id": 2426, "indexExpression": { "argumentTypes": null, - "id": 2341, + "id": 2425, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2324, - "src": "2531:1:16", + "referencedDeclaration": 2408, + "src": "3429:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11845,7 +12958,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2523:10:16", + "src": "3421:10:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -11856,7 +12969,7 @@ "arguments": [ { "argumentTypes": null, - "id": 2345, + "id": 2429, "isConstant": false, "isLValue": false, "isPure": true, @@ -11864,18 +12977,18 @@ "nodeType": "UnaryOperation", "operator": "-", "prefix": true, - "src": "2540:2:16", + "src": "3441:2:16", "subExpression": { "argumentTypes": null, "hexValue": "31", - "id": 2344, + "id": 2428, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2541:1:16", + "src": "3442:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_1_by_1", @@ -11896,20 +13009,20 @@ "typeString": "int_const -1" } ], - "id": 2343, + "id": 2427, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "2535:4:16", + "src": "3433:7:16", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, - "typeName": "uint" + "typeName": "uint256" }, - "id": 2346, + "id": 2430, "isConstant": false, "isLValue": false, "isPure": true, @@ -11917,7 +13030,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2535:8:16", + "src": "3433:11:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11935,18 +13048,18 @@ "typeString": "uint256" } ], - "id": 2339, + "id": 2423, "name": "approveCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2317, - "src": "2509:13:16", + "referencedDeclaration": 2401, + "src": "3407:13:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2347, + "id": 2431, "isConstant": false, "isLValue": false, "isPure": false, @@ -11954,15 +13067,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2509:35:16", + "src": "3407:38:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2348, + "id": 2432, "nodeType": "ExpressionStatement", - "src": "2509:35:16" + "src": "3407:38:16" } ] } @@ -11975,19 +13088,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2330, + "id": 2414, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2327, + "id": 2411, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2324, - "src": "2374:1:16", + "referencedDeclaration": 2408, + "src": "3272:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -11999,18 +13112,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2328, + "id": 2412, "name": "cTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2320, - "src": "2378:7:16", + "referencedDeclaration": 2404, + "src": "3276:7:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 2329, + "id": 2413, "isConstant": false, "isLValue": false, "isPure": false, @@ -12018,31 +13131,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2378:14:16", + "src": "3276:14:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "2374:18:16", + "src": "3272:18:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 2352, + "id": 2436, "initializationExpression": { "assignments": [ - 2324 + 2408 ], "declarations": [ { "constant": false, - "id": 2324, + "id": 2408, "name": "i", "nodeType": "VariableDeclaration", - "scope": 2352, - "src": "2362:6:16", + "scope": 2436, + "src": "3257:9:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12050,10 +13163,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2323, - "name": "uint", + "id": 2407, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2362:4:16", + "src": "3257:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12063,18 +13176,18 @@ "visibility": "internal" } ], - "id": 2326, + "id": 2410, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 2325, + "id": 2409, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2371:1:16", + "src": "3269:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -12083,12 +13196,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "2362:10:16" + "src": "3257:13:16" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 2332, + "id": 2416, "isConstant": false, "isLValue": false, "isPure": false, @@ -12096,15 +13209,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "2394:3:16", + "src": "3292:3:16", "subExpression": { "argumentTypes": null, - "id": 2331, + "id": 2415, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2324, - "src": "2394:1:16", + "referencedDeclaration": 2408, + "src": "3292:1:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12115,33 +13228,33 @@ "typeString": "uint256" } }, - "id": 2333, + "id": 2417, "nodeType": "ExpressionStatement", - "src": "2394:3:16" + "src": "3292:3:16" }, "nodeType": "ForStatement", - "src": "2357:212:16" + "src": "3252:218:16" } ] }, "documentation": null, - "id": 2354, + "id": 2438, "implemented": true, "kind": "function", "modifiers": [], "name": "approveCTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 2321, + "id": 2405, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2320, + "id": 2404, "name": "cTokens", "nodeType": "VariableDeclaration", - "scope": 2354, - "src": "2285:24:16", + "scope": 2438, + "src": "3183:24:16", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -12150,20 +13263,20 @@ }, "typeName": { "baseType": { - "id": 2318, + "id": 2402, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2285:7:16", + "src": "3183:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 2319, + "id": 2403, "length": null, "nodeType": "ArrayTypeName", - "src": "2285:9:16", + "src": "3183:9:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -12173,25 +13286,25 @@ "visibility": "internal" } ], - "src": "2275:64:16" + "src": "3173:61:16" }, "returnParameters": { - "id": 2322, + "id": 2406, "nodeType": "ParameterList", "parameters": [], - "src": "2347:0:16" + "src": "3242:0:16" }, - "scope": 2785, - "src": "2252:323:16", + "scope": 2837, + "src": "3150:326:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2368, + "id": 2452, "nodeType": "Block", - "src": "2667:71:16", + "src": "3554:71:16", "statements": [ { "expression": { @@ -12199,12 +13312,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2361, + "id": 2445, "name": "cTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2357, - "src": "2690:7:16", + "referencedDeclaration": 2441, + "src": "3577:7:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -12218,18 +13331,18 @@ "typeString": "address[] memory" } ], - "id": 2360, + "id": 2444, "name": "enterMarkets", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2288, - "src": "2677:12:16", + "referencedDeclaration": 2372, + "src": "3564:12:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_array$_t_address_$dyn_memory_ptr_$returns$__$", "typeString": "function (address[] memory)" } }, - "id": 2362, + "id": 2446, "isConstant": false, "isLValue": false, "isPure": false, @@ -12237,15 +13350,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2677:21:16", + "src": "3564:21:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2363, + "id": 2447, "nodeType": "ExpressionStatement", - "src": "2677:21:16" + "src": "3564:21:16" }, { "expression": { @@ -12253,12 +13366,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2365, + "id": 2449, "name": "cTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2357, - "src": "2723:7:16", + "referencedDeclaration": 2441, + "src": "3610:7:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -12272,18 +13385,18 @@ "typeString": "address[] memory" } ], - "id": 2364, + "id": 2448, "name": "approveCTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2354, - "src": "2708:14:16", + "referencedDeclaration": 2438, + "src": "3595:14:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_array$_t_address_$dyn_memory_ptr_$returns$__$", "typeString": "function (address[] memory)" } }, - "id": 2366, + "id": 2450, "isConstant": false, "isLValue": false, "isPure": false, @@ -12291,36 +13404,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2708:23:16", + "src": "3595:23:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2367, + "id": 2451, "nodeType": "ExpressionStatement", - "src": "2708:23:16" + "src": "3595:23:16" } ] }, "documentation": null, - "id": 2369, + "id": 2453, "implemented": true, "kind": "function", "modifiers": [], "name": "enterMarketsAndApproveCTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 2358, + "id": 2442, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2357, + "id": 2441, "name": "cTokens", "nodeType": "VariableDeclaration", - "scope": 2369, - "src": "2629:24:16", + "scope": 2453, + "src": "3521:24:16", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -12329,20 +13442,20 @@ }, "typeName": { "baseType": { - "id": 2355, + "id": 2439, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2629:7:16", + "src": "3521:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 2356, + "id": 2440, "length": null, "nodeType": "ArrayTypeName", - "src": "2629:9:16", + "src": "3521:9:16", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -12352,25 +13465,25 @@ "visibility": "internal" } ], - "src": "2619:40:16" + "src": "3520:26:16" }, "returnParameters": { - "id": 2359, + "id": 2443, "nodeType": "ParameterList", "parameters": [], - "src": "2667:0:16" + "src": "3554:0:16" }, - "scope": 2785, - "src": "2581:157:16", + "scope": 2837, + "src": "3482:143:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2382, + "id": 2466, "nodeType": "Block", - "src": "2780:63:16", + "src": "3667:63:16", "statements": [ { "expression": { @@ -12383,18 +13496,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2377, + "id": 2461, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "2824:3:16", + "referencedDeclaration": 7818, + "src": "3711:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2378, + "id": 2462, "isConstant": false, "isLValue": false, "isPure": false, @@ -12402,7 +13515,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2824:9:16", + "src": "3711:9:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12423,12 +13536,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2373, + "id": 2457, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "2798:13:16", + "referencedDeclaration": 2180, + "src": "3685:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12442,18 +13555,18 @@ "typeString": "address" } ], - "id": 2372, + "id": 2456, "name": "ICEther", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 732, - "src": "2790:7:16", + "referencedDeclaration": 745, + "src": "3677:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICEther_$732_$", + "typeIdentifier": "t_type$_t_contract$_ICEther_$745_$", "typeString": "type(contract ICEther)" } }, - "id": 2374, + "id": 2458, "isConstant": false, "isLValue": false, "isPure": true, @@ -12461,13 +13574,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2790:22:16", + "src": "3677:22:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICEther_$732", + "typeIdentifier": "t_contract$_ICEther_$745", "typeString": "contract ICEther" } }, - "id": 2375, + "id": 2459, "isConstant": false, "isLValue": false, "isPure": false, @@ -12475,13 +13588,13 @@ "memberName": "mint", "nodeType": "MemberAccess", "referencedDeclaration": 674, - "src": "2790:27:16", + "src": "3677:27:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$__$returns$__$", "typeString": "function () payable external" } }, - "id": 2376, + "id": 2460, "isConstant": false, "isLValue": false, "isPure": false, @@ -12489,13 +13602,13 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2790:33:16", + "src": "3677:33:16", "typeDescriptions": { "typeIdentifier": "t_function_setvalue_pure$_t_uint256_$returns$_t_function_external_payable$__$returns$__$value_$", "typeString": "function (uint256) pure returns (function () payable external)" } }, - "id": 2379, + "id": 2463, "isConstant": false, "isLValue": false, "isPure": false, @@ -12503,13 +13616,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2790:44:16", + "src": "3677:44:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$__$returns$__$value", "typeString": "function () payable external" } }, - "id": 2380, + "id": 2464, "isConstant": false, "isLValue": false, "isPure": false, @@ -12517,48 +13630,48 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2790:46:16", + "src": "3677:46:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2381, + "id": 2465, "nodeType": "ExpressionStatement", - "src": "2790:46:16" + "src": "3677:46:16" } ] }, "documentation": null, - "id": 2383, + "id": 2467, "implemented": true, "kind": "function", "modifiers": [], "name": "supplyETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 2370, + "id": 2454, "nodeType": "ParameterList", "parameters": [], - "src": "2762:2:16" + "src": "3649:2:16" }, "returnParameters": { - "id": 2371, + "id": 2455, "nodeType": "ParameterList", "parameters": [], - "src": "2780:0:16" + "src": "3667:0:16" }, - "scope": 2785, - "src": "2744:99:16", + "scope": 2837, + "src": "3631:99:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2422, + "id": 2506, "nodeType": "Block", - "src": "2909:369:16", + "src": "3799:373:16", "statements": [ { "condition": { @@ -12567,19 +13680,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2392, + "id": 2476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2390, + "id": 2474, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2385, - "src": "2923:6:16", + "referencedDeclaration": 2469, + "src": "3813:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12589,27 +13702,27 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2391, + "id": 2475, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "2933:13:16", + "referencedDeclaration": 2180, + "src": "3823:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "2923:23:16", + "src": "3813:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2420, + "id": 2504, "nodeType": "Block", - "src": "3022:250:16", + "src": "3912:254:16", "statements": [ { "expression": { @@ -12617,12 +13730,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2404, + "id": 2488, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2385, - "src": "3113:6:16", + "referencedDeclaration": 2469, + "src": "4003:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12630,12 +13743,12 @@ }, { "argumentTypes": null, - "id": 2405, + "id": 2489, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2387, - "src": "3121:6:16", + "referencedDeclaration": 2471, + "src": "4011:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12653,18 +13766,18 @@ "typeString": "uint256" } ], - "id": 2403, + "id": 2487, "name": "approveCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2317, - "src": "3099:13:16", + "referencedDeclaration": 2401, + "src": "3989:13:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2406, + "id": 2490, "isConstant": false, "isLValue": false, "isPure": false, @@ -12672,15 +13785,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3099:29:16", + "src": "3989:29:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2407, + "id": 2491, "nodeType": "ExpressionStatement", - "src": "3099:29:16" + "src": "3989:29:16" }, { "expression": { @@ -12692,7 +13805,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2416, + "id": 2500, "isConstant": false, "isLValue": false, "isPure": false, @@ -12702,12 +13815,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2413, + "id": 2497, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2387, - "src": "3187:6:16", + "referencedDeclaration": 2471, + "src": "4079:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12726,12 +13839,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2410, + "id": 2494, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2385, - "src": "3174:6:16", + "referencedDeclaration": 2469, + "src": "4066:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12745,18 +13858,18 @@ "typeString": "address" } ], - "id": 2409, + "id": 2493, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "3166:7:16", + "referencedDeclaration": 884, + "src": "4058:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2411, + "id": 2495, "isConstant": false, "isLValue": false, "isPure": false, @@ -12764,27 +13877,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3166:15:16", + "src": "4058:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2412, + "id": 2496, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "mint", "nodeType": "MemberAccess", - "referencedDeclaration": 741, - "src": "3166:20:16", + "referencedDeclaration": 754, + "src": "4058:20:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 2414, + "id": 2498, "isConstant": false, "isLValue": false, "isPure": false, @@ -12792,7 +13905,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3166:28:16", + "src": "4058:28:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12803,14 +13916,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2415, + "id": 2499, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "3198:1:16", + "src": "4090:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -12818,7 +13931,7 @@ }, "value": "0" }, - "src": "3166:33:16", + "src": "4058:33:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -12827,14 +13940,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d737570706c792d6661696c6564", - "id": 2417, + "id": 2501, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3215:32:16", + "src": "4109:32:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_eed4d8ac9ec37feeb59d4f3eed660d16ce6b6d4c1e0f69c896f2a21b54a727bc", @@ -12854,21 +13967,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-supply-failed\"" } ], - "id": 2408, + "id": 2492, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "3143:7:16", + "referencedDeclaration": 7822, + "src": "4033:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2418, + "id": 2502, "isConstant": false, "isLValue": false, "isPure": false, @@ -12876,25 +13989,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3143:118:16", + "src": "4033:122:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2419, + "id": 2503, "nodeType": "ExpressionStatement", - "src": "3143:118:16" + "src": "4033:122:16" } ] }, - "id": 2421, + "id": 2505, "nodeType": "IfStatement", - "src": "2919:353:16", + "src": "3809:357:16", "trueBody": { - "id": 2402, + "id": 2486, "nodeType": "Block", - "src": "2948:68:16", + "src": "3838:68:16", "statements": [ { "expression": { @@ -12905,12 +14018,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2398, + "id": 2482, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2387, - "src": "2996:6:16", + "referencedDeclaration": 2471, + "src": "3886:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12931,12 +14044,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2394, + "id": 2478, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "2970:13:16", + "referencedDeclaration": 2180, + "src": "3860:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -12950,18 +14063,18 @@ "typeString": "address" } ], - "id": 2393, + "id": 2477, "name": "ICEther", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 732, - "src": "2962:7:16", + "referencedDeclaration": 745, + "src": "3852:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICEther_$732_$", + "typeIdentifier": "t_type$_t_contract$_ICEther_$745_$", "typeString": "type(contract ICEther)" } }, - "id": 2395, + "id": 2479, "isConstant": false, "isLValue": false, "isPure": true, @@ -12969,13 +14082,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2962:22:16", + "src": "3852:22:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICEther_$732", + "typeIdentifier": "t_contract$_ICEther_$745", "typeString": "contract ICEther" } }, - "id": 2396, + "id": 2480, "isConstant": false, "isLValue": false, "isPure": false, @@ -12983,13 +14096,13 @@ "memberName": "mint", "nodeType": "MemberAccess", "referencedDeclaration": 674, - "src": "2962:27:16", + "src": "3852:27:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$__$returns$__$", "typeString": "function () payable external" } }, - "id": 2397, + "id": 2481, "isConstant": false, "isLValue": false, "isPure": false, @@ -12997,13 +14110,13 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2962:33:16", + "src": "3852:33:16", "typeDescriptions": { "typeIdentifier": "t_function_setvalue_pure$_t_uint256_$returns$_t_function_external_payable$__$returns$__$value_$", "typeString": "function (uint256) pure returns (function () payable external)" } }, - "id": 2399, + "id": 2483, "isConstant": false, "isLValue": false, "isPure": false, @@ -13011,13 +14124,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2962:41:16", + "src": "3852:41:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$__$returns$__$value", "typeString": "function () payable external" } }, - "id": 2400, + "id": 2484, "isConstant": false, "isLValue": false, "isPure": false, @@ -13025,15 +14138,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2962:43:16", + "src": "3852:43:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2401, + "id": 2485, "nodeType": "ExpressionStatement", - "src": "2962:43:16" + "src": "3852:43:16" } ] } @@ -13041,23 +14154,23 @@ ] }, "documentation": null, - "id": 2423, + "id": 2507, "implemented": true, "kind": "function", "modifiers": [], "name": "supply", "nodeType": "FunctionDefinition", "parameters": { - "id": 2388, + "id": 2472, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2385, + "id": 2469, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2423, - "src": "2865:14:16", + "scope": 2507, + "src": "3752:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13065,10 +14178,10 @@ "typeString": "address" }, "typeName": { - "id": 2384, + "id": 2468, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2865:7:16", + "src": "3752:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -13080,11 +14193,11 @@ }, { "constant": false, - "id": 2387, + "id": 2471, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2423, - "src": "2881:11:16", + "scope": 2507, + "src": "3768:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13092,10 +14205,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2386, - "name": "uint", + "id": 2470, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2881:4:16", + "src": "3768:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13105,25 +14218,25 @@ "visibility": "internal" } ], - "src": "2864:29:16" + "src": "3751:32:16" }, "returnParameters": { - "id": 2389, + "id": 2473, "nodeType": "ParameterList", "parameters": [], - "src": "2909:0:16" + "src": "3799:0:16" }, - "scope": 2785, - "src": "2849:429:16", + "scope": 2837, + "src": "3736:436:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2442, + "id": 2526, "nodeType": "Block", - "src": "3342:101:16", + "src": "4239:135:16", "statements": [ { "expression": { @@ -13135,7 +14248,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2438, + "id": 2522, "isConstant": false, "isLValue": false, "isPure": false, @@ -13145,12 +14258,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2435, + "id": 2519, "name": "borrowAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2427, - "src": "3383:12:16", + "referencedDeclaration": 2511, + "src": "4293:12:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13169,12 +14282,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2432, + "id": 2516, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2425, - "src": "3368:6:16", + "referencedDeclaration": 2509, + "src": "4278:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13188,18 +14301,18 @@ "typeString": "address" } ], - "id": 2431, + "id": 2515, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "3360:7:16", + "referencedDeclaration": 884, + "src": "4270:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2433, + "id": 2517, "isConstant": false, "isLValue": false, "isPure": false, @@ -13207,27 +14320,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3360:15:16", + "src": "4270:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2434, + "id": 2518, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "borrow", "nodeType": "MemberAccess", - "referencedDeclaration": 762, - "src": "3360:22:16", + "referencedDeclaration": 775, + "src": "4270:22:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 2436, + "id": 2520, "isConstant": false, "isLValue": false, "isPure": false, @@ -13235,7 +14348,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3360:36:16", + "src": "4270:36:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13246,14 +14359,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2437, + "id": 2521, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "3400:1:16", + "src": "4310:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -13261,7 +14374,7 @@ }, "value": "0" }, - "src": "3360:41:16", + "src": "4270:41:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -13270,14 +14383,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d626f72726f772d6661696c6564", - "id": 2439, + "id": 2523, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3403:32:16", + "src": "4325:32:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_336f65677d69bdb738d1bedb5f7651ac26ef11a7eab0993d50138f181bc50513", @@ -13297,21 +14410,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-borrow-failed\"" } ], - "id": 2430, + "id": 2514, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "3352:7:16", + "referencedDeclaration": 7822, + "src": "4249:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2440, + "id": 2524, "isConstant": false, "isLValue": false, "isPure": false, @@ -13319,36 +14432,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3352:84:16", + "src": "4249:118:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2441, + "id": 2525, "nodeType": "ExpressionStatement", - "src": "3352:84:16" + "src": "4249:118:16" } ] }, "documentation": null, - "id": 2443, + "id": 2527, "implemented": true, "kind": "function", "modifiers": [], "name": "borrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 2428, + "id": 2512, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2425, + "id": 2509, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2443, - "src": "3300:14:16", + "scope": 2527, + "src": "4194:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13356,10 +14469,10 @@ "typeString": "address" }, "typeName": { - "id": 2424, + "id": 2508, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3300:7:16", + "src": "4194:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -13371,11 +14484,11 @@ }, { "constant": false, - "id": 2427, + "id": 2511, "name": "borrowAmount", "nodeType": "VariableDeclaration", - "scope": 2443, - "src": "3316:17:16", + "scope": 2527, + "src": "4210:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13383,10 +14496,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2426, - "name": "uint", + "id": 2510, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3316:4:16", + "src": "4210:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13396,25 +14509,25 @@ "visibility": "internal" } ], - "src": "3299:35:16" + "src": "4193:38:16" }, "returnParameters": { - "id": 2429, + "id": 2513, "nodeType": "ParameterList", "parameters": [], - "src": "3342:0:16" + "src": "4239:0:16" }, - "scope": 2785, - "src": "3284:159:16", + "scope": 2837, + "src": "4178:196:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2464, + "id": 2548, "nodeType": "Block", - "src": "3609:95:16", + "src": "4546:95:16", "statements": [ { "expression": { @@ -13422,12 +14535,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2455, + "id": 2539, "name": "supplyCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2445, - "src": "3626:12:16", + "referencedDeclaration": 2529, + "src": "4563:12:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13435,12 +14548,12 @@ }, { "argumentTypes": null, - "id": 2456, + "id": 2540, "name": "supplyAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2447, - "src": "3640:12:16", + "referencedDeclaration": 2531, + "src": "4577:12:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13458,18 +14571,18 @@ "typeString": "uint256" } ], - "id": 2454, + "id": 2538, "name": "supply", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2423, - "src": "3619:6:16", + "referencedDeclaration": 2507, + "src": "4556:6:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2457, + "id": 2541, "isConstant": false, "isLValue": false, "isPure": false, @@ -13477,15 +14590,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3619:34:16", + "src": "4556:34:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2458, + "id": 2542, "nodeType": "ExpressionStatement", - "src": "3619:34:16" + "src": "4556:34:16" }, { "expression": { @@ -13493,12 +14606,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2460, + "id": 2544, "name": "borrowCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2449, - "src": "3670:12:16", + "referencedDeclaration": 2533, + "src": "4607:12:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13506,12 +14619,12 @@ }, { "argumentTypes": null, - "id": 2461, + "id": 2545, "name": "borrowAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2451, - "src": "3684:12:16", + "referencedDeclaration": 2535, + "src": "4621:12:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13529,18 +14642,18 @@ "typeString": "uint256" } ], - "id": 2459, + "id": 2543, "name": "borrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "3663:6:16", + "referencedDeclaration": 2527, + "src": "4600:6:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2462, + "id": 2546, "isConstant": false, "isLValue": false, "isPure": false, @@ -13548,36 +14661,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3663:34:16", + "src": "4600:34:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2463, + "id": 2547, "nodeType": "ExpressionStatement", - "src": "3663:34:16" + "src": "4600:34:16" } ] }, "documentation": null, - "id": 2465, + "id": 2549, "implemented": true, "kind": "function", "modifiers": [], "name": "supplyAndBorrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 2452, + "id": 2536, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2445, + "id": 2529, "name": "supplyCToken", "nodeType": "VariableDeclaration", - "scope": 2465, - "src": "3483:20:16", + "scope": 2549, + "src": "4414:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13585,10 +14698,10 @@ "typeString": "address" }, "typeName": { - "id": 2444, + "id": 2528, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3483:7:16", + "src": "4414:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -13600,11 +14713,11 @@ }, { "constant": false, - "id": 2447, + "id": 2531, "name": "supplyAmount", "nodeType": "VariableDeclaration", - "scope": 2465, - "src": "3513:17:16", + "scope": 2549, + "src": "4444:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13612,10 +14725,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2446, - "name": "uint", + "id": 2530, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3513:4:16", + "src": "4444:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13626,11 +14739,11 @@ }, { "constant": false, - "id": 2449, + "id": 2533, "name": "borrowCToken", "nodeType": "VariableDeclaration", - "scope": 2465, - "src": "3540:20:16", + "scope": 2549, + "src": "4474:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13638,10 +14751,10 @@ "typeString": "address" }, "typeName": { - "id": 2448, + "id": 2532, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3540:7:16", + "src": "4474:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -13653,11 +14766,11 @@ }, { "constant": false, - "id": 2451, + "id": 2535, "name": "borrowAmount", "nodeType": "VariableDeclaration", - "scope": 2465, - "src": "3570:17:16", + "scope": 2549, + "src": "4504:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13665,10 +14778,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2450, - "name": "uint", + "id": 2534, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3570:4:16", + "src": "4504:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13678,25 +14791,25 @@ "visibility": "internal" } ], - "src": "3473:120:16" + "src": "4404:126:16" }, "returnParameters": { - "id": 2453, + "id": 2537, "nodeType": "ParameterList", "parameters": [], - "src": "3609:0:16" + "src": "4546:0:16" }, - "scope": 2785, - "src": "3449:255:16", + "scope": 2837, + "src": "4380:261:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2480, + "id": 2564, "nodeType": "Block", - "src": "3810:127:16", + "src": "4748:127:16", "statements": [ { "expression": { @@ -13704,18 +14817,18 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 2472, + "id": 2556, "name": "supplyETH", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2383, - "src": "3849:9:16", + "referencedDeclaration": 2467, + "src": "4787:9:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$", "typeString": "function ()" } }, - "id": 2473, + "id": 2557, "isConstant": false, "isLValue": false, "isPure": false, @@ -13723,15 +14836,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3849:11:16", + "src": "4787:11:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2474, + "id": 2558, "nodeType": "ExpressionStatement", - "src": "3849:11:16" + "src": "4787:11:16" }, { "expression": { @@ -13739,12 +14852,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2476, + "id": 2560, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2467, - "src": "3909:6:16", + "referencedDeclaration": 2551, + "src": "4847:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13752,12 +14865,12 @@ }, { "argumentTypes": null, - "id": 2477, + "id": 2561, "name": "borrowAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2469, - "src": "3917:12:16", + "referencedDeclaration": 2553, + "src": "4855:12:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13775,18 +14888,18 @@ "typeString": "uint256" } ], - "id": 2475, + "id": 2559, "name": "borrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "3902:6:16", + "referencedDeclaration": 2527, + "src": "4840:6:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2478, + "id": 2562, "isConstant": false, "isLValue": false, "isPure": false, @@ -13794,36 +14907,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3902:28:16", + "src": "4840:28:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2479, + "id": 2563, "nodeType": "ExpressionStatement", - "src": "3902:28:16" + "src": "4840:28:16" } ] }, "documentation": null, - "id": 2481, + "id": 2565, "implemented": true, "kind": "function", "modifiers": [], "name": "supplyETHAndBorrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 2470, + "id": 2554, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2467, + "id": 2551, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2481, - "src": "3747:14:16", + "scope": 2565, + "src": "4675:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13831,10 +14944,10 @@ "typeString": "address" }, "typeName": { - "id": 2466, + "id": 2550, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3747:7:16", + "src": "4675:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -13846,11 +14959,11 @@ }, { "constant": false, - "id": 2469, + "id": 2553, "name": "borrowAmount", "nodeType": "VariableDeclaration", - "scope": 2481, - "src": "3771:17:16", + "scope": 2565, + "src": "4691:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13858,10 +14971,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2468, - "name": "uint", + "id": 2552, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3771:4:16", + "src": "4691:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13871,25 +14984,25 @@ "visibility": "internal" } ], - "src": "3737:57:16" + "src": "4674:38:16" }, "returnParameters": { - "id": 2471, + "id": 2555, "nodeType": "ParameterList", "parameters": [], - "src": "3810:0:16" + "src": "4748:0:16" }, - "scope": 2785, - "src": "3710:227:16", + "scope": 2837, + "src": "4647:228:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2520, + "id": 2604, "nodeType": "Block", - "src": "4008:269:16", + "src": "4949:315:16", "statements": [ { "condition": { @@ -13898,19 +15011,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2490, + "id": 2574, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2488, + "id": 2572, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2483, - "src": "4022:6:16", + "referencedDeclaration": 2567, + "src": "4963:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13920,27 +15033,27 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2489, + "id": 2573, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "4032:13:16", + "referencedDeclaration": 2180, + "src": "4973:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "4022:23:16", + "src": "4963:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2518, + "id": 2602, "nodeType": "Block", - "src": "4121:150:16", + "src": "5062:196:16", "statements": [ { "expression": { @@ -13948,12 +15061,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2502, + "id": 2586, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2483, - "src": "4149:6:16", + "referencedDeclaration": 2567, + "src": "5090:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13961,12 +15074,12 @@ }, { "argumentTypes": null, - "id": 2503, + "id": 2587, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2485, - "src": "4157:6:16", + "referencedDeclaration": 2569, + "src": "5098:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13984,18 +15097,18 @@ "typeString": "uint256" } ], - "id": 2501, + "id": 2585, "name": "approveCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2317, - "src": "4135:13:16", + "referencedDeclaration": 2401, + "src": "5076:13:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2504, + "id": 2588, "isConstant": false, "isLValue": false, "isPure": false, @@ -14003,15 +15116,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4135:29:16", + "src": "5076:29:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2505, + "id": 2589, "nodeType": "ExpressionStatement", - "src": "4135:29:16" + "src": "5076:29:16" }, { "expression": { @@ -14023,7 +15136,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2514, + "id": 2598, "isConstant": false, "isLValue": false, "isPure": false, @@ -14033,12 +15146,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2511, + "id": 2595, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2485, - "src": "4214:6:16", + "referencedDeclaration": 2569, + "src": "5172:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14057,12 +15170,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2508, + "id": 2592, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2483, - "src": "4194:6:16", + "referencedDeclaration": 2567, + "src": "5152:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14076,18 +15189,18 @@ "typeString": "address" } ], - "id": 2507, + "id": 2591, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "4186:7:16", + "referencedDeclaration": 884, + "src": "5144:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2509, + "id": 2593, "isConstant": false, "isLValue": false, "isPure": false, @@ -14095,27 +15208,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4186:15:16", + "src": "5144:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2510, + "id": 2594, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "repayBorrow", "nodeType": "MemberAccess", - "referencedDeclaration": 769, - "src": "4186:27:16", + "referencedDeclaration": 782, + "src": "5144:27:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 2512, + "id": 2596, "isConstant": false, "isLValue": false, "isPure": false, @@ -14123,7 +15236,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4186:35:16", + "src": "5144:35:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14134,14 +15247,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2513, + "id": 2597, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4225:1:16", + "src": "5183:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -14149,7 +15262,7 @@ }, "value": "0" }, - "src": "4186:40:16", + "src": "5144:40:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14158,14 +15271,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564", - "id": 2515, + "id": 2599, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4228:31:16", + "src": "5202:31:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_999cd91154bd9e69ce31d224fa6000cac622ab857a94bfb0df17582f1ba47dfe", @@ -14185,21 +15298,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-repay-failed\"" } ], - "id": 2506, + "id": 2590, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "4178:7:16", + "referencedDeclaration": 7822, + "src": "5119:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2516, + "id": 2600, "isConstant": false, "isLValue": false, "isPure": false, @@ -14207,25 +15320,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4178:82:16", + "src": "5119:128:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2517, + "id": 2601, "nodeType": "ExpressionStatement", - "src": "4178:82:16" + "src": "5119:128:16" } ] }, - "id": 2519, + "id": 2603, "nodeType": "IfStatement", - "src": "4018:253:16", + "src": "4959:299:16", "trueBody": { - "id": 2500, + "id": 2584, "nodeType": "Block", - "src": "4047:68:16", + "src": "4988:68:16", "statements": [ { "expression": { @@ -14236,12 +15349,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2496, + "id": 2580, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2485, - "src": "4095:6:16", + "referencedDeclaration": 2569, + "src": "5036:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14262,12 +15375,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2492, + "id": 2576, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2483, - "src": "4069:6:16", + "referencedDeclaration": 2567, + "src": "5010:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14281,18 +15394,18 @@ "typeString": "address" } ], - "id": 2491, + "id": 2575, "name": "ICEther", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 732, - "src": "4061:7:16", + "referencedDeclaration": 745, + "src": "5002:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICEther_$732_$", + "typeIdentifier": "t_type$_t_contract$_ICEther_$745_$", "typeString": "type(contract ICEther)" } }, - "id": 2493, + "id": 2577, "isConstant": false, "isLValue": false, "isPure": false, @@ -14300,13 +15413,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4061:15:16", + "src": "5002:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICEther_$732", + "typeIdentifier": "t_contract$_ICEther_$745", "typeString": "contract ICEther" } }, - "id": 2494, + "id": 2578, "isConstant": false, "isLValue": false, "isPure": false, @@ -14314,13 +15427,13 @@ "memberName": "repayBorrow", "nodeType": "MemberAccess", "referencedDeclaration": 698, - "src": "4061:27:16", + "src": "5002:27:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$__$returns$__$", "typeString": "function () payable external" } }, - "id": 2495, + "id": 2579, "isConstant": false, "isLValue": false, "isPure": false, @@ -14328,13 +15441,13 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4061:33:16", + "src": "5002:33:16", "typeDescriptions": { "typeIdentifier": "t_function_setvalue_pure$_t_uint256_$returns$_t_function_external_payable$__$returns$__$value_$", "typeString": "function (uint256) pure returns (function () payable external)" } }, - "id": 2497, + "id": 2581, "isConstant": false, "isLValue": false, "isPure": false, @@ -14342,13 +15455,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4061:41:16", + "src": "5002:41:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$__$returns$__$value", "typeString": "function () payable external" } }, - "id": 2498, + "id": 2582, "isConstant": false, "isLValue": false, "isPure": false, @@ -14356,15 +15469,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4061:43:16", + "src": "5002:43:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2499, + "id": 2583, "nodeType": "ExpressionStatement", - "src": "4061:43:16" + "src": "5002:43:16" } ] } @@ -14372,23 +15485,23 @@ ] }, "documentation": null, - "id": 2521, + "id": 2605, "implemented": true, "kind": "function", "modifiers": [], "name": "repayBorrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 2486, + "id": 2570, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2483, + "id": 2567, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2521, - "src": "3964:14:16", + "scope": 2605, + "src": "4902:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14396,10 +15509,10 @@ "typeString": "address" }, "typeName": { - "id": 2482, + "id": 2566, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3964:7:16", + "src": "4902:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -14411,11 +15524,11 @@ }, { "constant": false, - "id": 2485, + "id": 2569, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2521, - "src": "3980:11:16", + "scope": 2605, + "src": "4918:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14423,10 +15536,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2484, - "name": "uint", + "id": 2568, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3980:4:16", + "src": "4918:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14436,25 +15549,25 @@ "visibility": "internal" } ], - "src": "3963:29:16" + "src": "4901:32:16" }, "returnParameters": { - "id": 2487, + "id": 2571, "nodeType": "ParameterList", "parameters": [], - "src": "4008:0:16" + "src": "4949:0:16" }, - "scope": 2785, - "src": "3943:334:16", + "scope": 2837, + "src": "4881:383:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2564, + "id": 2648, "nodeType": "Block", - "src": "4373:307:16", + "src": "5393:353:16", "statements": [ { "condition": { @@ -14463,19 +15576,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2532, + "id": 2616, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2530, + "id": 2614, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2525, - "src": "4387:6:16", + "referencedDeclaration": 2609, + "src": "5407:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14485,27 +15598,27 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2531, + "id": 2615, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "4397:13:16", + "referencedDeclaration": 2180, + "src": "5417:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "4387:23:16", + "src": "5407:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 2562, + "id": 2646, "nodeType": "Block", - "src": "4501:173:16", + "src": "5521:219:16", "statements": [ { "expression": { @@ -14513,12 +15626,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2545, + "id": 2629, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2525, - "src": "4529:6:16", + "referencedDeclaration": 2609, + "src": "5549:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14526,12 +15639,12 @@ }, { "argumentTypes": null, - "id": 2546, + "id": 2630, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2527, - "src": "4537:6:16", + "referencedDeclaration": 2611, + "src": "5557:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14549,18 +15662,18 @@ "typeString": "uint256" } ], - "id": 2544, + "id": 2628, "name": "approveCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2317, - "src": "4515:13:16", + "referencedDeclaration": 2401, + "src": "5535:13:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2547, + "id": 2631, "isConstant": false, "isLValue": false, "isPure": false, @@ -14568,15 +15681,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4515:29:16", + "src": "5535:29:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2548, + "id": 2632, "nodeType": "ExpressionStatement", - "src": "4515:29:16" + "src": "5535:29:16" }, { "expression": { @@ -14588,7 +15701,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2558, + "id": 2642, "isConstant": false, "isLValue": false, "isPure": false, @@ -14598,12 +15711,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2554, + "id": 2638, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2523, - "src": "4600:9:16", + "referencedDeclaration": 2607, + "src": "5637:9:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14611,12 +15724,12 @@ }, { "argumentTypes": null, - "id": 2555, + "id": 2639, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2527, - "src": "4611:6:16", + "referencedDeclaration": 2611, + "src": "5648:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14639,12 +15752,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2551, + "id": 2635, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2525, - "src": "4574:6:16", + "referencedDeclaration": 2609, + "src": "5611:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14658,18 +15771,18 @@ "typeString": "address" } ], - "id": 2550, + "id": 2634, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "4566:7:16", + "referencedDeclaration": 884, + "src": "5603:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2552, + "id": 2636, "isConstant": false, "isLValue": false, "isPure": false, @@ -14677,27 +15790,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4566:15:16", + "src": "5603:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2553, + "id": 2637, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "repayBorrowBehalf", "nodeType": "MemberAccess", - "referencedDeclaration": 778, - "src": "4566:33:16", + "referencedDeclaration": 791, + "src": "5603:33:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) external returns (uint256)" } }, - "id": 2556, + "id": 2640, "isConstant": false, "isLValue": false, "isPure": false, @@ -14705,7 +15818,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4566:52:16", + "src": "5603:52:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14716,14 +15829,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2557, + "id": 2641, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4622:1:16", + "src": "5659:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -14731,7 +15844,7 @@ }, "value": "0" }, - "src": "4566:57:16", + "src": "5603:57:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -14740,14 +15853,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d7265706179626568616c662d6661696c6564", - "id": 2559, + "id": 2643, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4625:37:16", + "src": "5678:37:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_9271b3f440bc756bcf9d9edd637efa6f47cc4a3fa7de577dc2c93368fcac9e79", @@ -14767,21 +15880,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-repaybehalf-failed\"" } ], - "id": 2549, + "id": 2633, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "4558:7:16", + "referencedDeclaration": 7822, + "src": "5578:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2560, + "id": 2644, "isConstant": false, "isLValue": false, "isPure": false, @@ -14789,25 +15902,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4558:105:16", + "src": "5578:151:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2561, + "id": 2645, "nodeType": "ExpressionStatement", - "src": "4558:105:16" + "src": "5578:151:16" } ] }, - "id": 2563, + "id": 2647, "nodeType": "IfStatement", - "src": "4383:291:16", + "src": "5403:337:16", "trueBody": { - "id": 2543, + "id": 2627, "nodeType": "Block", - "src": "4412:83:16", + "src": "5432:83:16", "statements": [ { "expression": { @@ -14815,12 +15928,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2540, + "id": 2624, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2523, - "src": "4474:9:16", + "referencedDeclaration": 2607, + "src": "5494:9:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14837,12 +15950,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2538, + "id": 2622, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2527, - "src": "4466:6:16", + "referencedDeclaration": 2611, + "src": "5486:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -14863,12 +15976,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2534, + "id": 2618, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2525, - "src": "4434:6:16", + "referencedDeclaration": 2609, + "src": "5454:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -14882,18 +15995,18 @@ "typeString": "address" } ], - "id": 2533, + "id": 2617, "name": "ICEther", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 732, - "src": "4426:7:16", + "referencedDeclaration": 745, + "src": "5446:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICEther_$732_$", + "typeIdentifier": "t_type$_t_contract$_ICEther_$745_$", "typeString": "type(contract ICEther)" } }, - "id": 2535, + "id": 2619, "isConstant": false, "isLValue": false, "isPure": false, @@ -14901,13 +16014,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4426:15:16", + "src": "5446:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICEther_$732", + "typeIdentifier": "t_contract$_ICEther_$745", "typeString": "contract ICEther" } }, - "id": 2536, + "id": 2620, "isConstant": false, "isLValue": false, "isPure": false, @@ -14915,13 +16028,13 @@ "memberName": "repayBorrowBehalf", "nodeType": "MemberAccess", "referencedDeclaration": 703, - "src": "4426:33:16", + "src": "5446:33:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$returns$__$", "typeString": "function (address) payable external" } }, - "id": 2537, + "id": 2621, "isConstant": false, "isLValue": false, "isPure": false, @@ -14929,13 +16042,13 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4426:39:16", + "src": "5446:39:16", "typeDescriptions": { "typeIdentifier": "t_function_setvalue_pure$_t_uint256_$returns$_t_function_external_payable$_t_address_$returns$__$value_$", "typeString": "function (uint256) pure returns (function (address) payable external)" } }, - "id": 2539, + "id": 2623, "isConstant": false, "isLValue": false, "isPure": false, @@ -14943,13 +16056,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4426:47:16", + "src": "5446:47:16", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$returns$__$value", "typeString": "function (address) payable external" } }, - "id": 2541, + "id": 2625, "isConstant": false, "isLValue": false, "isPure": false, @@ -14957,15 +16070,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4426:58:16", + "src": "5446:58:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2542, + "id": 2626, "nodeType": "ExpressionStatement", - "src": "4426:58:16" + "src": "5446:58:16" } ] } @@ -14973,23 +16086,23 @@ ] }, "documentation": null, - "id": 2565, + "id": 2649, "implemented": true, "kind": "function", "modifiers": [], "name": "repayBorrowBehalf", "nodeType": "FunctionDefinition", "parameters": { - "id": 2528, + "id": 2612, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2523, + "id": 2607, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 2565, - "src": "4310:17:16", + "scope": 2649, + "src": "5306:17:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14997,10 +16110,10 @@ "typeString": "address" }, "typeName": { - "id": 2522, + "id": 2606, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4310:7:16", + "src": "5306:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -15012,11 +16125,11 @@ }, { "constant": false, - "id": 2525, + "id": 2609, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2565, - "src": "4329:14:16", + "scope": 2649, + "src": "5333:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15024,10 +16137,10 @@ "typeString": "address" }, "typeName": { - "id": 2524, + "id": 2608, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4329:7:16", + "src": "5333:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -15039,11 +16152,11 @@ }, { "constant": false, - "id": 2527, + "id": 2611, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2565, - "src": "4345:11:16", + "scope": 2649, + "src": "5357:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15051,10 +16164,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2526, - "name": "uint", + "id": 2610, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "4345:4:16", + "src": "5357:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15064,25 +16177,25 @@ "visibility": "internal" } ], - "src": "4309:48:16" + "src": "5296:81:16" }, "returnParameters": { - "id": 2529, + "id": 2613, "nodeType": "ParameterList", "parameters": [], - "src": "4373:0:16" + "src": "5393:0:16" }, - "scope": 2785, - "src": "4283:397:16", + "scope": 2837, + "src": "5270:476:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2584, + "id": 2668, "nodeType": "Block", - "src": "4752:101:16", + "src": "5821:135:16", "statements": [ { "expression": { @@ -15094,7 +16207,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2580, + "id": 2664, "isConstant": false, "isLValue": false, "isPure": false, @@ -15104,12 +16217,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2577, + "id": 2661, "name": "redeemTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2569, - "src": "4793:12:16", + "referencedDeclaration": 2653, + "src": "5875:12:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15128,12 +16241,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2574, + "id": 2658, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2567, - "src": "4778:6:16", + "referencedDeclaration": 2651, + "src": "5860:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15147,18 +16260,18 @@ "typeString": "address" } ], - "id": 2573, + "id": 2657, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "4770:7:16", + "referencedDeclaration": 884, + "src": "5852:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2575, + "id": 2659, "isConstant": false, "isLValue": false, "isPure": false, @@ -15166,27 +16279,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4770:15:16", + "src": "5852:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2576, + "id": 2660, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "redeem", "nodeType": "MemberAccess", - "referencedDeclaration": 748, - "src": "4770:22:16", + "referencedDeclaration": 761, + "src": "5852:22:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 2578, + "id": 2662, "isConstant": false, "isLValue": false, "isPure": false, @@ -15194,7 +16307,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4770:36:16", + "src": "5852:36:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15205,14 +16318,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2579, + "id": 2663, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4810:1:16", + "src": "5892:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -15220,7 +16333,7 @@ }, "value": "0" }, - "src": "4770:41:16", + "src": "5852:41:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -15229,14 +16342,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d72656465656d2d6661696c6564", - "id": 2581, + "id": 2665, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "4813:32:16", + "src": "5907:32:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_3f3b4acbdfd19ecca99167853c0ab7e48a16390e2bcd8ee493e05b1ffaf7c80a", @@ -15256,21 +16369,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-redeem-failed\"" } ], - "id": 2572, + "id": 2656, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "4762:7:16", + "referencedDeclaration": 7822, + "src": "5831:7:16", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2582, + "id": 2666, "isConstant": false, "isLValue": false, "isPure": false, @@ -15278,36 +16391,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4762:84:16", + "src": "5831:118:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2583, + "id": 2667, "nodeType": "ExpressionStatement", - "src": "4762:84:16" + "src": "5831:118:16" } ] }, "documentation": null, - "id": 2585, + "id": 2669, "implemented": true, "kind": "function", "modifiers": [], "name": "redeem", "nodeType": "FunctionDefinition", "parameters": { - "id": 2570, + "id": 2654, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2567, + "id": 2651, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2585, - "src": "4702:14:16", + "scope": 2669, + "src": "5768:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15315,10 +16428,10 @@ "typeString": "address" }, "typeName": { - "id": 2566, + "id": 2650, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4702:7:16", + "src": "5768:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -15330,11 +16443,11 @@ }, { "constant": false, - "id": 2569, + "id": 2653, "name": "redeemTokens", "nodeType": "VariableDeclaration", - "scope": 2585, - "src": "4718:17:16", + "scope": 2669, + "src": "5784:20:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15342,10 +16455,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2568, - "name": "uint", + "id": 2652, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "4718:4:16", + "src": "5784:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15355,25 +16468,25 @@ "visibility": "internal" } ], - "src": "4701:35:16" + "src": "5767:38:16" }, "returnParameters": { - "id": 2571, + "id": 2655, "nodeType": "ParameterList", "parameters": [], - "src": "4752:0:16" + "src": "5821:0:16" }, - "scope": 2785, - "src": "4686:167:16", + "scope": 2837, + "src": "5752:204:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2604, + "id": 2688, "nodeType": "Block", - "src": "4935:122:16", + "src": "6061:156:16", "statements": [ { "expression": { @@ -15385,7 +16498,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 2600, + "id": 2684, "isConstant": false, "isLValue": false, "isPure": false, @@ -15395,12 +16508,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2597, + "id": 2681, "name": "redeemTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2589, - "src": "4986:12:16", + "referencedDeclaration": 2673, + "src": "6125:12:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15419,12 +16532,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2594, + "id": 2678, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2587, - "src": "4961:6:16", + "referencedDeclaration": 2671, + "src": "6100:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15438,18 +16551,18 @@ "typeString": "address" } ], - "id": 2593, + "id": 2677, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "4953:7:16", + "referencedDeclaration": 884, + "src": "6092:7:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 2595, + "id": 2679, "isConstant": false, "isLValue": false, "isPure": false, @@ -15457,27 +16570,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4953:15:16", + "src": "6092:15:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 2596, + "id": 2680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "redeemUnderlying", "nodeType": "MemberAccess", - "referencedDeclaration": 755, - "src": "4953:32:16", + "referencedDeclaration": 768, + "src": "6092:32:16", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 2598, + "id": 2682, "isConstant": false, "isLValue": false, "isPure": false, @@ -15485,7 +16598,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4953:46:16", + "src": "6092:46:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15496,14 +16609,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 2599, + "id": 2683, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "5003:1:16", + "src": "6142:1:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -15511,7 +16624,7 @@ }, "value": "0" }, - "src": "4953:51:16", + "src": "6092:51:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -15520,14 +16633,14 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79696e672d6661696c6564", - "id": 2601, + "id": 2685, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "5006:43:16", + "src": "6157:43:16", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_422f21513af86bee962b3ccca9c32226e776b380fb2ed292445c5cf781b3f1f1", @@ -15545,286 +16658,23 @@ { "typeIdentifier": "t_stringliteral_422f21513af86bee962b3ccca9c32226e776b380fb2ed292445c5cf781b3f1f1", "typeString": "literal_string \"cmpnd-mgr-ctoken-redeem-underlying-failed\"" - } - ], - "id": 2592, - "name": "require", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 7830, - 7831 - ], - "referencedDeclaration": 7831, - "src": "4945:7:16", - "typeDescriptions": { - "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", - "typeString": "function (bool,string memory) pure" - } - }, - "id": 2602, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "4945:105:16", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 2603, - "nodeType": "ExpressionStatement", - "src": "4945:105:16" - } - ] - }, - "documentation": null, - "id": 2605, - "implemented": true, - "kind": "function", - "modifiers": [], - "name": "redeemUnderlying", - "nodeType": "FunctionDefinition", - "parameters": { - "id": 2590, - "nodeType": "ParameterList", - "parameters": [ - { - "constant": false, - "id": 2587, - "name": "cToken", - "nodeType": "VariableDeclaration", - "scope": 2605, - "src": "4885:14:16", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 2586, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "4885:7:16", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 2589, - "name": "redeemTokens", - "nodeType": "VariableDeclaration", - "scope": 2605, - "src": "4901:17:16", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 2588, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "4901:4:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - } - ], - "src": "4884:35:16" - }, - "returnParameters": { - "id": 2591, - "nodeType": "ParameterList", - "parameters": [], - "src": "4935:0:16" - }, - "scope": 2785, - "src": "4859:198:16", - "stateMutability": "payable", - "superFunction": null, - "visibility": "public" - }, - { - "body": { - "id": 2664, - "nodeType": "Block", - "src": "5358:596:16", - "statements": [ - { - "assignments": [ - 2613 - ], - "declarations": [ - { - "constant": false, - "id": 2613, - "name": "initialBal", - "nodeType": "VariableDeclaration", - "scope": 2664, - "src": "5407:15:16", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 2612, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "5407:4:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 2622, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2619, - "name": "this", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7877, - "src": "5459:4:16", - "typeDescriptions": { - "typeIdentifier": "t_contract$_CompoundBase_$2785", - "typeString": "contract CompoundBase" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_contract$_CompoundBase_$2785", - "typeString": "contract CompoundBase" - } - ], - "id": 2618, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "5451:7:16", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_address_$", - "typeString": "type(address)" - }, - "typeName": "address" - }, - "id": 2620, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5451:13:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2615, - "name": "cToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2607, - "src": "5433:6:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 2614, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "5425:7:16", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 2616, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5425:15:16", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 2617, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "balanceOf", - "nodeType": "MemberAccess", - "referencedDeclaration": 821, - "src": "5425:25:16", + } + ], + "id": 2676, + "name": "require", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 7821, + 7822 + ], + "referencedDeclaration": 7822, + "src": "6071:7:16", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", - "typeString": "function (address) view external returns (uint256)" + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" } }, - "id": 2621, + "id": 2686, "isConstant": false, "isLValue": false, "isPure": false, @@ -15832,15 +16682,103 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5425:40:16", + "src": "6071:139:16", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 2687, + "nodeType": "ExpressionStatement", + "src": "6071:139:16" + } + ] + }, + "documentation": null, + "id": 2689, + "implemented": true, + "kind": "function", + "modifiers": [], + "name": "redeemUnderlying", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 2674, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 2671, + "name": "cToken", + "nodeType": "VariableDeclaration", + "scope": 2689, + "src": "5988:14:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 2670, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "5988:7:16", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 2673, + "name": "redeemTokens", + "nodeType": "VariableDeclaration", + "scope": 2689, + "src": "6004:20:16", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 2672, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "6004:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "nodeType": "VariableDeclarationStatement", - "src": "5407:58:16" - }, + "value": null, + "visibility": "internal" + } + ], + "src": "5987:38:16" + }, + "returnParameters": { + "id": 2675, + "nodeType": "ParameterList", + "parameters": [], + "src": "6061:0:16" + }, + "scope": 2837, + "src": "5962:255:16", + "stateMutability": "payable", + "superFunction": null, + "visibility": "public" + }, + { + "body": { + "id": 2716, + "nodeType": "Block", + "src": "6499:168:16", + "statements": [ { "condition": { "argumentTypes": null, @@ -15848,19 +16786,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2625, + "id": 2698, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2623, + "id": 2696, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2607, - "src": "5639:6:16", + "referencedDeclaration": 2691, + "src": "6513:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15870,31 +16808,31 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 2624, + "id": 2697, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "5649:13:16", + "referencedDeclaration": 2180, + "src": "6523:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "5639:23:16", + "src": "6513:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2637, + "id": 2710, "nodeType": "IfStatement", - "src": "5635:110:16", + "src": "6509:120:16", "trueBody": { - "id": 2636, + "id": 2709, "nodeType": "Block", - "src": "5664:81:16", + "src": "6538:91:16", "statements": [ { "expression": { @@ -15904,18 +16842,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2627, + "id": 2700, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "5692:3:16", + "referencedDeclaration": 7818, + "src": "6576:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2628, + "id": 2701, "isConstant": false, "isLValue": false, "isPure": false, @@ -15923,7 +16861,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "5692:10:16", + "src": "6576:10:16", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -15934,14 +16872,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2630, + "id": 2703, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7877, - "src": "5712:4:16", + "referencedDeclaration": 7868, + "src": "6596:4:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } } @@ -15949,360 +16887,114 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } ], - "id": 2629, + "id": 2702, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "5704:7:16", + "src": "6588:7:16", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 2631, + "id": 2704, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5704:13:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 2632, - "name": "cToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2607, - "src": "5719:6:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 2633, - "name": "amount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2609, - "src": "5727:6:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - }, - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 2626, - "name": "_transferFrom", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2207, - "src": "5678:13:16", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,address,address,uint256)" - } - }, - "id": 2634, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5678:56:16", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 2635, - "nodeType": "ExpressionStatement", - "src": "5678:56:16" - } - ] - } - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2639, - "name": "cToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2607, - "src": "5761:6:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 2640, - "name": "amount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2609, - "src": "5769:6:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 2638, - "name": "supply", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2423, - "src": "5754:6:16", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" - } - }, - "id": 2641, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5754:22:16", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 2642, - "nodeType": "ExpressionStatement", - "src": "5754:22:16" - }, - { - "assignments": [ - 2644 - ], - "declarations": [ - { - "constant": false, - "id": 2644, - "name": "finalBal", - "nodeType": "VariableDeclaration", - "scope": 2664, - "src": "5824:13:16", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 2643, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "5824:4:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 2653, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2650, - "name": "this", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7877, - "src": "5874:4:16", - "typeDescriptions": { - "typeIdentifier": "t_contract$_CompoundBase_$2785", - "typeString": "contract CompoundBase" - } - } - ], - "expression": { - "argumentTypes": [ + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "6588:13:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 2705, + "name": "cToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2691, + "src": "6603:6:16", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, { - "typeIdentifier": "t_contract$_CompoundBase_$2785", - "typeString": "contract CompoundBase" + "argumentTypes": null, + "id": 2706, + "name": "amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2693, + "src": "6611:6:16", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } } ], - "id": 2649, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "5866:7:16", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_address_$", - "typeString": "type(address)" - }, - "typeName": "address" - }, - "id": 2651, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5866:13:16", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2646, - "name": "cToken", + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 2699, + "name": "_transferFromUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2607, - "src": "5848:6:16", + "referencedDeclaration": 2270, + "src": "6552:23:16", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,address,address,uint256)" } - ], - "id": 2645, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "5840:7:16", + }, + "id": 2707, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "6552:66:16", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" } }, - "id": 2647, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5840:15:16", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 2648, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "balanceOf", - "nodeType": "MemberAccess", - "referencedDeclaration": 821, - "src": "5840:25:16", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", - "typeString": "function (address) view external returns (uint256)" + "id": 2708, + "nodeType": "ExpressionStatement", + "src": "6552:66:16" } - }, - "id": 2652, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5840:40:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "5824:56:16" + ] + } }, { "expression": { @@ -16310,12 +17002,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2655, + "id": 2712, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2607, - "src": "5901:6:16", + "referencedDeclaration": 2691, + "src": "6645:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16323,94 +17015,12 @@ }, { "argumentTypes": null, - "expression": { - "argumentTypes": null, - "id": 2656, - "name": "msg", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "5909:3:16", - "typeDescriptions": { - "typeIdentifier": "t_magic_message", - "typeString": "msg" - } - }, - "id": 2657, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "sender", - "nodeType": "MemberAccess", - "referencedDeclaration": null, - "src": "5909:10:16", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - } - }, - { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 2659, - "name": "finalBal", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2644, - "src": "5925:8:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - { - "argumentTypes": null, - "id": 2660, - "name": "initialBal", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2613, - "src": "5935:10:16", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 2658, - "name": "sub", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2175, - "src": "5921:3:16", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (uint256,uint256) pure returns (uint256)" - } - }, - "id": 2661, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5921:25:16", + "id": 2713, + "name": "amount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2693, + "src": "6653:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16423,27 +17033,23 @@ "typeIdentifier": "t_address", "typeString": "address" }, - { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - }, { "typeIdentifier": "t_uint256", "typeString": "uint256" } ], - "id": 2654, - "name": "_transfer", + "id": 2711, + "name": "supply", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2248, - "src": "5891:9:16", + "referencedDeclaration": 2507, + "src": "6638:6:16", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,address,uint256)" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" } }, - "id": 2662, + "id": 2714, "isConstant": false, "isLValue": false, "isPure": false, @@ -16451,36 +17057,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5891:56:16", + "src": "6638:22:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2663, + "id": 2715, "nodeType": "ExpressionStatement", - "src": "5891:56:16" + "src": "6638:22:16" } ] }, "documentation": null, - "id": 2665, + "id": 2717, "implemented": true, "kind": "function", "modifiers": [], "name": "supplyThroughProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 2610, + "id": 2694, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2607, + "id": 2691, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2665, - "src": "5301:14:16", + "scope": 2717, + "src": "6452:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16488,10 +17094,10 @@ "typeString": "address" }, "typeName": { - "id": 2606, + "id": 2690, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5301:7:16", + "src": "6452:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16503,11 +17109,11 @@ }, { "constant": false, - "id": 2609, + "id": 2693, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2665, - "src": "5325:11:16", + "scope": 2717, + "src": "6468:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16515,10 +17121,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2608, - "name": "uint", + "id": 2692, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "5325:4:16", + "src": "6468:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16528,25 +17134,25 @@ "visibility": "internal" } ], - "src": "5291:51:16" + "src": "6451:32:16" }, "returnParameters": { - "id": 2611, + "id": 2695, "nodeType": "ParameterList", "parameters": [], - "src": "5358:0:16" + "src": "6499:0:16" }, - "scope": 2785, - "src": "5264:690:16", + "scope": 2837, + "src": "6424:243:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2692, + "id": 2744, "nodeType": "Block", - "src": "6037:163:16", + "src": "6773:173:16", "statements": [ { "condition": { @@ -16555,19 +17161,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2674, + "id": 2726, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2672, + "id": 2724, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2667, - "src": "6051:6:16", + "referencedDeclaration": 2719, + "src": "6787:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16577,31 +17183,31 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 2673, + "id": 2725, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "6061:13:16", + "referencedDeclaration": 2180, + "src": "6797:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "6051:23:16", + "src": "6787:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2686, + "id": 2738, "nodeType": "IfStatement", - "src": "6047:110:16", + "src": "6783:120:16", "trueBody": { - "id": 2685, + "id": 2737, "nodeType": "Block", - "src": "6076:81:16", + "src": "6812:91:16", "statements": [ { "expression": { @@ -16611,18 +17217,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2676, + "id": 2728, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "6104:3:16", + "referencedDeclaration": 7818, + "src": "6850:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2677, + "id": 2729, "isConstant": false, "isLValue": false, "isPure": false, @@ -16630,7 +17236,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6104:10:16", + "src": "6850:10:16", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -16641,14 +17247,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2679, + "id": 2731, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7877, - "src": "6124:4:16", + "referencedDeclaration": 7868, + "src": "6870:4:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } } @@ -16656,24 +17262,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } ], - "id": 2678, + "id": 2730, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "6116:7:16", + "src": "6862:7:16", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 2680, + "id": 2732, "isConstant": false, "isLValue": false, "isPure": false, @@ -16681,7 +17287,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6116:13:16", + "src": "6862:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16689,12 +17295,12 @@ }, { "argumentTypes": null, - "id": 2681, + "id": 2733, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2667, - "src": "6131:6:16", + "referencedDeclaration": 2719, + "src": "6877:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16702,12 +17308,12 @@ }, { "argumentTypes": null, - "id": 2682, + "id": 2734, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2669, - "src": "6139:6:16", + "referencedDeclaration": 2721, + "src": "6885:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16733,18 +17339,18 @@ "typeString": "uint256" } ], - "id": 2675, - "name": "_transferFrom", + "id": 2727, + "name": "_transferFromUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2207, - "src": "6090:13:16", + "referencedDeclaration": 2270, + "src": "6826:23:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,address,uint256)" } }, - "id": 2683, + "id": 2735, "isConstant": false, "isLValue": false, "isPure": false, @@ -16752,15 +17358,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6090:56:16", + "src": "6826:66:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2684, + "id": 2736, "nodeType": "ExpressionStatement", - "src": "6090:56:16" + "src": "6826:66:16" } ] } @@ -16771,12 +17377,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2688, + "id": 2740, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2667, - "src": "6178:6:16", + "referencedDeclaration": 2719, + "src": "6924:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16784,12 +17390,12 @@ }, { "argumentTypes": null, - "id": 2689, + "id": 2741, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2669, - "src": "6186:6:16", + "referencedDeclaration": 2721, + "src": "6932:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16807,18 +17413,18 @@ "typeString": "uint256" } ], - "id": 2687, + "id": 2739, "name": "repayBorrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2521, - "src": "6166:11:16", + "referencedDeclaration": 2605, + "src": "6912:11:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2690, + "id": 2742, "isConstant": false, "isLValue": false, "isPure": false, @@ -16826,36 +17432,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6166:27:16", + "src": "6912:27:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2691, + "id": 2743, "nodeType": "ExpressionStatement", - "src": "6166:27:16" + "src": "6912:27:16" } ] }, "documentation": null, - "id": 2693, + "id": 2745, "implemented": true, "kind": "function", "modifiers": [], "name": "repayBorrowThroughProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 2670, + "id": 2722, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2667, + "id": 2719, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2693, - "src": "5993:14:16", + "scope": 2745, + "src": "6706:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16863,10 +17469,10 @@ "typeString": "address" }, "typeName": { - "id": 2666, + "id": 2718, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5993:7:16", + "src": "6706:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16878,11 +17484,11 @@ }, { "constant": false, - "id": 2669, + "id": 2721, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2693, - "src": "6009:11:16", + "scope": 2745, + "src": "6722:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16890,10 +17496,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2668, - "name": "uint", + "id": 2720, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6009:4:16", + "src": "6722:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16903,25 +17509,25 @@ "visibility": "internal" } ], - "src": "5992:29:16" + "src": "6705:32:16" }, "returnParameters": { - "id": 2671, + "id": 2723, "nodeType": "ParameterList", "parameters": [], - "src": "6037:0:16" + "src": "6773:0:16" }, - "scope": 2785, - "src": "5960:240:16", + "scope": 2837, + "src": "6673:273:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2723, + "id": 2775, "nodeType": "Block", - "src": "6308:180:16", + "src": "7087:190:16", "statements": [ { "condition": { @@ -16930,19 +17536,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2704, + "id": 2756, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2702, + "id": 2754, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2697, - "src": "6322:6:16", + "referencedDeclaration": 2749, + "src": "7101:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -16952,31 +17558,31 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 2703, + "id": 2755, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2150, - "src": "6332:13:16", + "referencedDeclaration": 2180, + "src": "7111:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "6322:23:16", + "src": "7101:23:16", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 2716, + "id": 2768, "nodeType": "IfStatement", - "src": "6318:110:16", + "src": "7097:120:16", "trueBody": { - "id": 2715, + "id": 2767, "nodeType": "Block", - "src": "6347:81:16", + "src": "7126:91:16", "statements": [ { "expression": { @@ -16986,18 +17592,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2706, + "id": 2758, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "6375:3:16", + "referencedDeclaration": 7818, + "src": "7164:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2707, + "id": 2759, "isConstant": false, "isLValue": false, "isPure": false, @@ -17005,7 +17611,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6375:10:16", + "src": "7164:10:16", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -17016,14 +17622,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2709, + "id": 2761, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7877, - "src": "6395:4:16", + "referencedDeclaration": 7868, + "src": "7184:4:16", "typeDescriptions": { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } } @@ -17031,24 +17637,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } ], - "id": 2708, + "id": 2760, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "6387:7:16", + "src": "7176:7:16", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 2710, + "id": 2762, "isConstant": false, "isLValue": false, "isPure": false, @@ -17056,7 +17662,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6387:13:16", + "src": "7176:13:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17064,12 +17670,12 @@ }, { "argumentTypes": null, - "id": 2711, + "id": 2763, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2697, - "src": "6402:6:16", + "referencedDeclaration": 2749, + "src": "7191:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17077,12 +17683,12 @@ }, { "argumentTypes": null, - "id": 2712, + "id": 2764, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2699, - "src": "6410:6:16", + "referencedDeclaration": 2751, + "src": "7199:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17108,18 +17714,18 @@ "typeString": "uint256" } ], - "id": 2705, - "name": "_transferFrom", + "id": 2757, + "name": "_transferFromUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2207, - "src": "6361:13:16", + "referencedDeclaration": 2270, + "src": "7140:23:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,address,uint256)" } }, - "id": 2713, + "id": 2765, "isConstant": false, "isLValue": false, "isPure": false, @@ -17127,15 +17733,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6361:56:16", + "src": "7140:66:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2714, + "id": 2766, "nodeType": "ExpressionStatement", - "src": "6361:56:16" + "src": "7140:66:16" } ] } @@ -17146,12 +17752,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2718, + "id": 2770, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2695, - "src": "6455:9:16", + "referencedDeclaration": 2747, + "src": "7244:9:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17159,12 +17765,12 @@ }, { "argumentTypes": null, - "id": 2719, + "id": 2771, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2697, - "src": "6466:6:16", + "referencedDeclaration": 2749, + "src": "7255:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17172,12 +17778,12 @@ }, { "argumentTypes": null, - "id": 2720, + "id": 2772, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2699, - "src": "6474:6:16", + "referencedDeclaration": 2751, + "src": "7263:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17199,18 +17805,18 @@ "typeString": "uint256" } ], - "id": 2717, + "id": 2769, "name": "repayBorrowBehalf", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2565, - "src": "6437:17:16", + "referencedDeclaration": 2649, + "src": "7226:17:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 2721, + "id": 2773, "isConstant": false, "isLValue": false, "isPure": false, @@ -17218,36 +17824,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6437:44:16", + "src": "7226:44:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2722, + "id": 2774, "nodeType": "ExpressionStatement", - "src": "6437:44:16" + "src": "7226:44:16" } ] }, "documentation": null, - "id": 2724, + "id": 2776, "implemented": true, "kind": "function", "modifiers": [], "name": "repayBorrowBehalfThroughProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 2700, + "id": 2752, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2695, + "id": 2747, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 2724, - "src": "6245:17:16", + "scope": 2776, + "src": "7000:17:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17255,10 +17861,10 @@ "typeString": "address" }, "typeName": { - "id": 2694, + "id": 2746, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6245:7:16", + "src": "7000:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -17270,11 +17876,11 @@ }, { "constant": false, - "id": 2697, + "id": 2749, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2724, - "src": "6264:14:16", + "scope": 2776, + "src": "7027:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17282,10 +17888,10 @@ "typeString": "address" }, "typeName": { - "id": 2696, + "id": 2748, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6264:7:16", + "src": "7027:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -17297,11 +17903,11 @@ }, { "constant": false, - "id": 2699, + "id": 2751, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2724, - "src": "6280:11:16", + "scope": 2776, + "src": "7051:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17309,10 +17915,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2698, - "name": "uint", + "id": 2750, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6280:4:16", + "src": "7051:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17322,25 +17928,25 @@ "visibility": "internal" } ], - "src": "6244:48:16" + "src": "6990:81:16" }, "returnParameters": { - "id": 2701, + "id": 2753, "nodeType": "ParameterList", "parameters": [], - "src": "6308:0:16" + "src": "7087:0:16" }, - "scope": 2785, - "src": "6206:282:16", + "scope": 2837, + "src": "6952:325:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2743, + "id": 2795, "nodeType": "Block", - "src": "6558:86:16", + "src": "7350:96:16", "statements": [ { "expression": { @@ -17348,12 +17954,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2732, + "id": 2784, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2726, - "src": "6575:6:16", + "referencedDeclaration": 2778, + "src": "7367:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17361,12 +17967,12 @@ }, { "argumentTypes": null, - "id": 2733, + "id": 2785, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2728, - "src": "6583:6:16", + "referencedDeclaration": 2780, + "src": "7375:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17384,18 +17990,18 @@ "typeString": "uint256" } ], - "id": 2731, + "id": 2783, "name": "borrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "6568:6:16", + "referencedDeclaration": 2527, + "src": "7360:6:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2734, + "id": 2786, "isConstant": false, "isLValue": false, "isPure": false, @@ -17403,15 +18009,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6568:22:16", + "src": "7360:22:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2735, + "id": 2787, "nodeType": "ExpressionStatement", - "src": "6568:22:16" + "src": "7360:22:16" }, { "expression": { @@ -17419,12 +18025,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2737, + "id": 2789, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2726, - "src": "6610:6:16", + "referencedDeclaration": 2778, + "src": "7412:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17434,18 +18040,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2738, + "id": 2790, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "6618:3:16", + "referencedDeclaration": 7818, + "src": "7420:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2739, + "id": 2791, "isConstant": false, "isLValue": false, "isPure": false, @@ -17453,7 +18059,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6618:10:16", + "src": "7420:10:16", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -17461,12 +18067,12 @@ }, { "argumentTypes": null, - "id": 2740, + "id": 2792, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2728, - "src": "6630:6:16", + "referencedDeclaration": 2780, + "src": "7432:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17488,18 +18094,18 @@ "typeString": "uint256" } ], - "id": 2736, - "name": "_transfer", + "id": 2788, + "name": "_transferUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2248, - "src": "6600:9:16", + "referencedDeclaration": 2311, + "src": "7392:19:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 2741, + "id": 2793, "isConstant": false, "isLValue": false, "isPure": false, @@ -17507,36 +18113,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6600:37:16", + "src": "7392:47:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2742, + "id": 2794, "nodeType": "ExpressionStatement", - "src": "6600:37:16" + "src": "7392:47:16" } ] }, "documentation": null, - "id": 2744, + "id": 2796, "implemented": true, "kind": "function", "modifiers": [], "name": "borrowThroughProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 2729, + "id": 2781, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2726, + "id": 2778, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2744, - "src": "6522:14:16", + "scope": 2796, + "src": "7311:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17544,10 +18150,10 @@ "typeString": "address" }, "typeName": { - "id": 2725, + "id": 2777, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6522:7:16", + "src": "7311:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -17559,11 +18165,11 @@ }, { "constant": false, - "id": 2728, + "id": 2780, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2744, - "src": "6538:11:16", + "scope": 2796, + "src": "7327:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17571,10 +18177,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2727, - "name": "uint", + "id": 2779, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6538:4:16", + "src": "7327:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17584,25 +18190,25 @@ "visibility": "internal" } ], - "src": "6521:29:16" + "src": "7310:32:16" }, "returnParameters": { - "id": 2730, + "id": 2782, "nodeType": "ParameterList", "parameters": [], - "src": "6558:0:16" + "src": "7350:0:16" }, - "scope": 2785, - "src": "6494:150:16", + "scope": 2837, + "src": "7283:163:16", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2763, + "id": 2815, "nodeType": "Block", - "src": "6744:86:16", + "src": "7527:96:16", "statements": [ { "expression": { @@ -17610,12 +18216,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2752, + "id": 2804, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2746, - "src": "6761:6:16", + "referencedDeclaration": 2798, + "src": "7544:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17623,12 +18229,12 @@ }, { "argumentTypes": null, - "id": 2753, + "id": 2805, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2748, - "src": "6769:6:16", + "referencedDeclaration": 2800, + "src": "7552:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17646,18 +18252,18 @@ "typeString": "uint256" } ], - "id": 2751, + "id": 2803, "name": "redeem", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2585, - "src": "6754:6:16", + "referencedDeclaration": 2669, + "src": "7537:6:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2754, + "id": 2806, "isConstant": false, "isLValue": false, "isPure": false, @@ -17665,15 +18271,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6754:22:16", + "src": "7537:22:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2755, + "id": 2807, "nodeType": "ExpressionStatement", - "src": "6754:22:16" + "src": "7537:22:16" }, { "expression": { @@ -17681,12 +18287,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2757, + "id": 2809, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2746, - "src": "6796:6:16", + "referencedDeclaration": 2798, + "src": "7589:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17696,18 +18302,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2758, + "id": 2810, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "6804:3:16", + "referencedDeclaration": 7818, + "src": "7597:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2759, + "id": 2811, "isConstant": false, "isLValue": false, "isPure": false, @@ -17715,7 +18321,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "6804:10:16", + "src": "7597:10:16", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -17723,12 +18329,12 @@ }, { "argumentTypes": null, - "id": 2760, + "id": 2812, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2748, - "src": "6816:6:16", + "referencedDeclaration": 2800, + "src": "7609:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17750,18 +18356,18 @@ "typeString": "uint256" } ], - "id": 2756, - "name": "_transfer", + "id": 2808, + "name": "_transferUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2248, - "src": "6786:9:16", + "referencedDeclaration": 2311, + "src": "7569:19:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 2761, + "id": 2813, "isConstant": false, "isLValue": false, "isPure": false, @@ -17769,36 +18375,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6786:37:16", + "src": "7569:47:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2762, + "id": 2814, "nodeType": "ExpressionStatement", - "src": "6786:37:16" + "src": "7569:47:16" } ] }, "documentation": null, - "id": 2764, + "id": 2816, "implemented": true, "kind": "function", "modifiers": [], "name": "redeemThroughProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 2749, + "id": 2801, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2746, + "id": 2798, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2764, - "src": "6687:14:16", + "scope": 2816, + "src": "7480:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17806,10 +18412,10 @@ "typeString": "address" }, "typeName": { - "id": 2745, + "id": 2797, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6687:7:16", + "src": "7480:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -17821,11 +18427,11 @@ }, { "constant": false, - "id": 2748, + "id": 2800, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2764, - "src": "6711:11:16", + "scope": 2816, + "src": "7496:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -17833,10 +18439,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2747, - "name": "uint", + "id": 2799, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6711:4:16", + "src": "7496:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17846,25 +18452,25 @@ "visibility": "internal" } ], - "src": "6677:51:16" + "src": "7479:32:16" }, "returnParameters": { - "id": 2750, + "id": 2802, "nodeType": "ParameterList", "parameters": [], - "src": "6744:0:16" + "src": "7527:0:16" }, - "scope": 2785, - "src": "6650:180:16", + "scope": 2837, + "src": "7452:171:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 2783, + "id": 2835, "nodeType": "Block", - "src": "6940:96:16", + "src": "7734:106:16", "statements": [ { "expression": { @@ -17872,12 +18478,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2772, + "id": 2824, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2766, - "src": "6967:6:16", + "referencedDeclaration": 2818, + "src": "7761:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17885,12 +18491,12 @@ }, { "argumentTypes": null, - "id": 2773, + "id": 2825, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2768, - "src": "6975:6:16", + "referencedDeclaration": 2820, + "src": "7769:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -17908,18 +18514,18 @@ "typeString": "uint256" } ], - "id": 2771, + "id": 2823, "name": "redeemUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2605, - "src": "6950:16:16", + "referencedDeclaration": 2689, + "src": "7744:16:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 2774, + "id": 2826, "isConstant": false, "isLValue": false, "isPure": false, @@ -17927,15 +18533,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6950:32:16", + "src": "7744:32:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2775, + "id": 2827, "nodeType": "ExpressionStatement", - "src": "6950:32:16" + "src": "7744:32:16" }, { "expression": { @@ -17943,12 +18549,12 @@ "arguments": [ { "argumentTypes": null, - "id": 2777, + "id": 2829, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2766, - "src": "7002:6:16", + "referencedDeclaration": 2818, + "src": "7806:6:16", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17958,18 +18564,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2778, + "id": 2830, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, - "src": "7010:3:16", + "referencedDeclaration": 7818, + "src": "7814:3:16", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2779, + "id": 2831, "isConstant": false, "isLValue": false, "isPure": false, @@ -17977,7 +18583,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "7010:10:16", + "src": "7814:10:16", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -17985,12 +18591,12 @@ }, { "argumentTypes": null, - "id": 2780, + "id": 2832, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2768, - "src": "7022:6:16", + "referencedDeclaration": 2820, + "src": "7826:6:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18012,18 +18618,18 @@ "typeString": "uint256" } ], - "id": 2776, - "name": "_transfer", + "id": 2828, + "name": "_transferUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2248, - "src": "6992:9:16", + "referencedDeclaration": 2311, + "src": "7786:19:16", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 2781, + "id": 2833, "isConstant": false, "isLValue": false, "isPure": false, @@ -18031,36 +18637,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6992:37:16", + "src": "7786:47:16", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 2782, + "id": 2834, "nodeType": "ExpressionStatement", - "src": "6992:37:16" + "src": "7786:47:16" } ] }, "documentation": null, - "id": 2784, + "id": 2836, "implemented": true, "kind": "function", "modifiers": [], "name": "redeemUnderlyingThroughProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 2769, + "id": 2821, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2766, + "id": 2818, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 2784, - "src": "6883:14:16", + "scope": 2836, + "src": "7667:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18068,10 +18674,10 @@ "typeString": "address" }, "typeName": { - "id": 2765, + "id": 2817, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6883:7:16", + "src": "7667:7:16", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18083,11 +18689,11 @@ }, { "constant": false, - "id": 2768, + "id": 2820, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 2784, - "src": "6907:11:16", + "scope": 2836, + "src": "7683:14:16", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18095,10 +18701,10 @@ "typeString": "uint256" }, "typeName": { - "id": 2767, - "name": "uint", + "id": 2819, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6907:4:16", + "src": "7683:7:16", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18108,26 +18714,26 @@ "visibility": "internal" } ], - "src": "6873:51:16" + "src": "7666:32:16" }, "returnParameters": { - "id": 2770, + "id": 2822, "nodeType": "ParameterList", "parameters": [], - "src": "6940:0:16" + "src": "7734:0:16" }, - "scope": 2785, - "src": "6836:200:16", + "scope": 2837, + "src": "7629:211:16", "stateMutability": "payable", "superFunction": null, "visibility": "public" } ], - "scope": 2786, - "src": "343:6695:16" + "scope": 2838, + "src": "396:7446:16" } ], - "src": "129:6910:16" + "src": "129:7714:16" }, "compiler": { "name": "solc", @@ -18135,7 +18741,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.482Z", + "updatedAt": "2020-04-08T12:21:13.707Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DACProxy.json b/packages/smart-contracts/artifacts/DACProxy.json index 1c3ebe4..6fb737b 100644 --- a/packages/smart-contracts/artifacts/DACProxy.json +++ b/packages/smart-contracts/artifacts/DACProxy.json @@ -297,14 +297,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol", "exportedSymbols": { "DACProxy": [ - 7244 + 7235 ] }, - "id": 7245, + "id": 7236, "nodeType": "SourceUnit", "nodes": [ { - "id": 7079, + "id": 7070, "literals": [ "solidity", "0.5", @@ -314,7 +314,7 @@ "src": "109:23:29" }, { - "id": 7080, + "id": 7071, "literals": [ "experimental", "ABIEncoderV2" @@ -325,10 +325,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/BytesLib.sol", "file": "../lib/BytesLib.sol", - "id": 7081, + "id": 7072, "nodeType": "ImportDirective", - "scope": 7245, - "sourceUnit": 2036, + "scope": 7236, + "sourceUnit": 2062, "src": "168:29:29", "symbolAliases": [], "unitAlias": "" @@ -336,10 +336,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/aave/FlashLoanReceiverBase.sol", "file": "../lib/aave/FlashLoanReceiverBase.sol", - "id": 7082, + "id": 7073, "nodeType": "ImportDirective", - "scope": 7245, - "sourceUnit": 2139, + "scope": 7236, + "sourceUnit": 2165, "src": "198:47:29", "symbolAliases": [], "unitAlias": "" @@ -347,10 +347,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol", "file": "../lib/dapphub/Proxy.sol", - "id": 7083, + "id": 7074, "nodeType": "ImportDirective", - "scope": 7245, - "sourceUnit": 3789, + "scope": 7236, + "sourceUnit": 3841, "src": "246:34:29", "symbolAliases": [], "unitAlias": "" @@ -358,9 +358,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../interfaces/IERC20.sol", - "id": 7084, + "id": 7075, "nodeType": "ImportDirective", - "scope": 7245, + "scope": 7236, "sourceUnit": 121, "src": "282:34:29", "symbolAliases": [], @@ -376,7 +376,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 7087, + "id": 7078, "isConstant": false, "isLValue": false, "isPure": true, @@ -399,7 +399,7 @@ "typeString": "int_const 1" } ], - "id": 7086, + "id": 7077, "isConstant": false, "isLValue": false, "isPure": true, @@ -412,7 +412,7 @@ }, "typeName": "address" }, - "id": 7088, + "id": 7079, "isConstant": false, "isLValue": false, "isPure": true, @@ -429,17 +429,17 @@ ], "baseName": { "contractScope": null, - "id": 7085, + "id": 7076, "name": "DSProxy", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "343:7:29", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } }, - "id": 7089, + "id": 7080, "nodeType": "InheritanceSpecifier", "src": "343:19:29" }, @@ -447,17 +447,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 7090, + "id": 7081, "name": "FlashLoanReceiverBase", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2138, + "referencedDeclaration": 2164, "src": "368:21:29", "typeDescriptions": { - "typeIdentifier": "t_contract$_FlashLoanReceiverBase_$2138", + "typeIdentifier": "t_contract$_FlashLoanReceiverBase_$2164", "typeString": "contract FlashLoanReceiverBase" } }, - "id": 7091, + "id": 7082, "nodeType": "InheritanceSpecifier", "src": "368:21:29" }, @@ -465,53 +465,53 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 7092, + "id": 7083, "name": "BytesLibLite", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2035, + "referencedDeclaration": 2061, "src": "395:12:29", "typeDescriptions": { - "typeIdentifier": "t_contract$_BytesLibLite_$2035", + "typeIdentifier": "t_contract$_BytesLibLite_$2061", "typeString": "contract BytesLibLite" } }, - "id": 7093, + "id": 7084, "nodeType": "InheritanceSpecifier", "src": "395:12:29" } ], "contractDependencies": [ 354, - 2035, - 2138, - 2808, - 2924, - 3542, - 3660 + 2061, + 2164, + 2860, + 2976, + 3594, + 3712 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 7244, + "id": 7235, "linearizedBaseContracts": [ - 7244, - 2035, - 2138, + 7235, + 2061, + 2164, 354, - 3660, - 3542, - 2924, - 2808 + 3712, + 3594, + 2976, + 2860 ], "name": "DACProxy", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 7096, + "id": 7087, "name": "protocolFeePayoutAddress1", "nodeType": "VariableDeclaration", - "scope": 7244, + "scope": 7235, "src": "445:95:29", "stateVariable": true, "storageLocation": "default", @@ -520,7 +520,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7094, + "id": 7085, "name": "address", "nodeType": "ElementaryTypeName", "src": "445:15:29", @@ -533,7 +533,7 @@ "value": { "argumentTypes": null, "hexValue": "307837373343436246423432323835303631374135363830443430423132363034323264303732663431", - "id": 7095, + "id": 7086, "isConstant": false, "isLValue": false, "isPure": true, @@ -552,10 +552,10 @@ }, { "constant": true, - "id": 7099, + "id": 7090, "name": "protocolFeePayoutAddress2", "nodeType": "VariableDeclaration", - "scope": 7244, + "scope": 7235, "src": "546:95:29", "stateVariable": true, "storageLocation": "default", @@ -564,7 +564,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7097, + "id": 7088, "name": "address", "nodeType": "ElementaryTypeName", "src": "546:15:29", @@ -577,7 +577,7 @@ "value": { "argumentTypes": null, "hexValue": "307841626343423866306133633230364262303436384335324343633230663362383130373734313742", - "id": 7098, + "id": 7089, "isConstant": false, "isLValue": false, "isPure": true, @@ -596,7 +596,7 @@ }, { "body": { - "id": 7108, + "id": 7099, "nodeType": "Block", "src": "687:37:29", "statements": [ @@ -606,11 +606,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7105, + "id": 7096, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7101, + "referencedDeclaration": 7092, "src": "706:10:29", "typeDescriptions": { "typeIdentifier": "t_address", @@ -625,18 +625,18 @@ "typeString": "address" } ], - "id": 7104, + "id": 7095, "name": "setCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3659, + "referencedDeclaration": 3711, "src": "697:8:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_bool_$", "typeString": "function (address) returns (bool)" } }, - "id": 7106, + "id": 7097, "isConstant": false, "isLValue": false, "isPure": false, @@ -650,29 +650,29 @@ "typeString": "bool" } }, - "id": 7107, + "id": 7098, "nodeType": "ExpressionStatement", "src": "697:20:29" } ] }, "documentation": null, - "id": 7109, + "id": 7100, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 7102, + "id": 7093, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7101, + "id": 7092, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 7109, + "scope": 7100, "src": "660:18:29", "stateVariable": false, "storageLocation": "default", @@ -681,7 +681,7 @@ "typeString": "address" }, "typeName": { - "id": 7100, + "id": 7091, "name": "address", "nodeType": "ElementaryTypeName", "src": "660:7:29", @@ -698,12 +698,12 @@ "src": "659:20:29" }, "returnParameters": { - "id": 7103, + "id": 7094, "nodeType": "ParameterList", "parameters": [], "src": "687:0:29" }, - "scope": 7244, + "scope": 7235, "src": "648:76:29", "stateMutability": "nonpayable", "superFunction": null, @@ -711,53 +711,53 @@ }, { "body": { - "id": 7112, + "id": 7103, "nodeType": "Block", "src": "758:2:29", "statements": [] }, "documentation": null, - "id": 7113, + "id": 7104, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 7110, + "id": 7101, "nodeType": "ParameterList", "parameters": [], "src": "738:2:29" }, "returnParameters": { - "id": 7111, + "id": 7102, "nodeType": "ParameterList", "parameters": [], "src": "758:0:29" }, - "scope": 7244, + "scope": 7235, "src": "730:30:29", "stateMutability": "payable", - "superFunction": 2058, + "superFunction": 2084, "visibility": "external" }, { "body": { - "id": 7242, + "id": 7233, "nodeType": "Block", "src": "964:2252:29", "statements": [ { "assignments": [ - 7127 + 7118 ], "declarations": [ { "constant": false, - "id": 7127, + "id": 7118, "name": "protocolFee", "nodeType": "VariableDeclaration", - "scope": 7242, + "scope": 7233, "src": "1125:16:29", "stateVariable": false, "storageLocation": "default", @@ -766,7 +766,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7126, + "id": 7117, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1125:4:29", @@ -779,14 +779,14 @@ "visibility": "internal" } ], - "id": 7132, + "id": 7123, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "32", - "id": 7130, + "id": 7121, "isConstant": false, "isLValue": false, "isPure": true, @@ -811,32 +811,32 @@ ], "expression": { "argumentTypes": null, - "id": 7128, + "id": 7119, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7119, + "referencedDeclaration": 7110, "src": "1144:4:29", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 7129, + "id": 7120, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 7670, + "referencedDeclaration": 7661, "src": "1144:8:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 7131, + "id": 7122, "isConstant": false, "isLValue": false, "isPure": false, @@ -855,15 +855,15 @@ }, { "assignments": [ - 7134 + 7125 ], "declarations": [ { "constant": false, - "id": 7134, + "id": 7125, "name": "targetAddress", "nodeType": "VariableDeclaration", - "scope": 7242, + "scope": 7233, "src": "2122:21:29", "stateVariable": false, "storageLocation": "default", @@ -872,7 +872,7 @@ "typeString": "address" }, "typeName": { - "id": 7133, + "id": 7124, "name": "address", "nodeType": "ElementaryTypeName", "src": "2122:7:29", @@ -886,17 +886,17 @@ "visibility": "internal" } ], - "id": 7139, + "id": 7130, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 7136, + "id": 7127, "name": "_params", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7121, + "referencedDeclaration": 7112, "src": "2161:7:29", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -906,7 +906,7 @@ { "argumentTypes": null, "hexValue": "3132", - "id": 7137, + "id": 7128, "isConstant": false, "isLValue": false, "isPure": true, @@ -933,18 +933,18 @@ "typeString": "int_const 12" } ], - "id": 7135, + "id": 7126, "name": "bytesToAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2034, + "referencedDeclaration": 2060, "src": "2146:14:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$_t_uint256_$returns$_t_address_$", "typeString": "function (bytes memory,uint256) pure returns (address)" } }, - "id": 7138, + "id": 7129, "isConstant": false, "isLValue": false, "isPure": false, @@ -963,15 +963,15 @@ }, { "assignments": [ - 7141 + 7132 ], "declarations": [ { "constant": false, - "id": 7141, + "id": 7132, "name": "fSig", "nodeType": "VariableDeclaration", - "scope": 7242, + "scope": 7233, "src": "2183:17:29", "stateVariable": false, "storageLocation": "memory", @@ -980,7 +980,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7140, + "id": 7131, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "2183:5:29", @@ -993,17 +993,17 @@ "visibility": "internal" } ], - "id": 7147, + "id": 7138, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 7143, + "id": 7134, "name": "_params", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7121, + "referencedDeclaration": 7112, "src": "2213:7:29", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -1013,7 +1013,7 @@ { "argumentTypes": null, "hexValue": "3332", - "id": 7144, + "id": 7135, "isConstant": false, "isLValue": false, "isPure": true, @@ -1031,7 +1031,7 @@ { "argumentTypes": null, "hexValue": "34", - "id": 7145, + "id": 7136, "isConstant": false, "isLValue": false, "isPure": true, @@ -1062,18 +1062,18 @@ "typeString": "int_const 4" } ], - "id": 7142, + "id": 7133, "name": "slice", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2007, + "referencedDeclaration": 2033, "src": "2207:5:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$_t_uint256_$_t_uint256_$returns$_t_bytes_memory_ptr_$", "typeString": "function (bytes memory,uint256,uint256) pure returns (bytes memory)" } }, - "id": 7146, + "id": 7137, "isConstant": false, "isLValue": false, "isPure": false, @@ -1092,15 +1092,15 @@ }, { "assignments": [ - 7149 + 7140 ], "declarations": [ { "constant": false, - "id": 7149, + "id": 7140, "name": "data", "nodeType": "VariableDeclaration", - "scope": 7242, + "scope": 7233, "src": "2238:17:29", "stateVariable": false, "storageLocation": "memory", @@ -1109,7 +1109,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7148, + "id": 7139, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "2238:5:29", @@ -1122,17 +1122,17 @@ "visibility": "internal" } ], - "id": 7154, + "id": 7145, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 7151, + "id": 7142, "name": "_params", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7121, + "referencedDeclaration": 7112, "src": "2273:7:29", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -1142,7 +1142,7 @@ { "argumentTypes": null, "hexValue": "313332", - "id": 7152, + "id": 7143, "isConstant": false, "isLValue": false, "isPure": true, @@ -1169,18 +1169,18 @@ "typeString": "int_const 132" } ], - "id": 7150, + "id": 7141, "name": "sliceToEnd", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1978, + "referencedDeclaration": 2004, "src": "2262:10:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$_t_uint256_$returns$_t_bytes_memory_ptr_$", "typeString": "function (bytes memory,uint256) pure returns (bytes memory)" } }, - "id": 7153, + "id": 7144, "isConstant": false, "isLValue": false, "isPure": false, @@ -1199,15 +1199,15 @@ }, { "assignments": [ - 7156 + 7147 ], "declarations": [ { "constant": false, - "id": 7156, + "id": 7147, "name": "newData", "nodeType": "VariableDeclaration", - "scope": 7242, + "scope": 7233, "src": "2408:20:29", "stateVariable": false, "storageLocation": "memory", @@ -1216,7 +1216,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7155, + "id": 7146, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "2408:5:29", @@ -1229,17 +1229,17 @@ "visibility": "internal" } ], - "id": 7174, + "id": 7165, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 7159, + "id": 7150, "name": "fSig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7141, + "referencedDeclaration": 7132, "src": "2461:4:29", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -1251,11 +1251,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7162, + "id": 7153, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7117, + "referencedDeclaration": 7108, "src": "2490:7:29", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1272,18 +1272,18 @@ ], "expression": { "argumentTypes": null, - "id": 7160, + "id": 7151, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "2479:3:29", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 7161, + "id": 7152, "isConstant": false, "isLValue": false, "isPure": true, @@ -1297,7 +1297,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 7163, + "id": 7154, "isConstant": false, "isLValue": false, "isPure": false, @@ -1316,11 +1316,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7166, + "id": 7157, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7119, + "referencedDeclaration": 7110, "src": "2523:4:29", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1337,18 +1337,18 @@ ], "expression": { "argumentTypes": null, - "id": 7164, + "id": 7155, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "2512:3:29", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 7165, + "id": 7156, "isConstant": false, "isLValue": false, "isPure": true, @@ -1362,7 +1362,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 7167, + "id": 7158, "isConstant": false, "isLValue": false, "isPure": false, @@ -1381,11 +1381,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7170, + "id": 7161, "name": "protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7127, + "referencedDeclaration": 7118, "src": "2553:11:29", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1402,18 +1402,18 @@ ], "expression": { "argumentTypes": null, - "id": 7168, + "id": 7159, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "2542:3:29", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 7169, + "id": 7160, "isConstant": false, "isLValue": false, "isPure": true, @@ -1427,7 +1427,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 7171, + "id": 7162, "isConstant": false, "isLValue": false, "isPure": false, @@ -1443,11 +1443,11 @@ }, { "argumentTypes": null, - "id": 7172, + "id": 7163, "name": "data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7149, + "referencedDeclaration": 7140, "src": "2579:4:29", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -1480,18 +1480,18 @@ ], "expression": { "argumentTypes": null, - "id": 7157, + "id": 7148, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "2431:3:29", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 7158, + "id": 7149, "isConstant": false, "isLValue": false, "isPure": true, @@ -1505,7 +1505,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 7173, + "id": 7164, "isConstant": false, "isLValue": false, "isPure": false, @@ -1528,11 +1528,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7176, + "id": 7167, "name": "targetAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7134, + "referencedDeclaration": 7125, "src": "2643:13:29", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1541,11 +1541,11 @@ }, { "argumentTypes": null, - "id": 7177, + "id": 7168, "name": "newData", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7156, + "referencedDeclaration": 7147, "src": "2658:7:29", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -1564,21 +1564,21 @@ "typeString": "bytes memory" } ], - "id": 7175, + "id": 7166, "name": "execute", "nodeType": "Identifier", "overloadedDeclarations": [ - 3606, - 3630 + 3658, + 3682 ], - "referencedDeclaration": 3630, + "referencedDeclaration": 3682, "src": "2635:7:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$", "typeString": "function (address,bytes memory) returns (bytes memory)" } }, - "id": 7178, + "id": 7169, "isConstant": false, "isLValue": false, "isPure": false, @@ -1592,7 +1592,7 @@ "typeString": "bytes memory" } }, - "id": 7179, + "id": 7170, "nodeType": "ExpressionStatement", "src": "2635:31:29" }, @@ -1603,18 +1603,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 7182, + "id": 7173, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7180, + "id": 7171, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7115, + "referencedDeclaration": 7106, "src": "2712:8:29", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1626,7 +1626,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "307845656565654565656545654565654565456545656545454565656565456565656565656545456545", - "id": 7181, + "id": 7172, "isConstant": false, "isLValue": false, "isPure": true, @@ -1648,7 +1648,7 @@ } }, "falseBody": { - "id": 7232, + "id": 7223, "nodeType": "Block", "src": "2933:183:29", "statements": [ @@ -1658,11 +1658,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7214, + "id": 7205, "name": "protocolFeePayoutAddress1", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7096, + "referencedDeclaration": 7087, "src": "2973:25:29", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -1675,7 +1675,7 @@ { "argumentTypes": null, "hexValue": "32", - "id": 7217, + "id": 7208, "isConstant": false, "isLValue": false, "isPure": true, @@ -1700,32 +1700,32 @@ ], "expression": { "argumentTypes": null, - "id": 7215, + "id": 7206, "name": "protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7127, + "referencedDeclaration": 7118, "src": "3000:11:29", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 7216, + "id": 7207, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 7670, + "referencedDeclaration": 7661, "src": "3000:15:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 7218, + "id": 7209, "isConstant": false, "isLValue": false, "isPure": false, @@ -1756,11 +1756,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7211, + "id": 7202, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7115, + "referencedDeclaration": 7106, "src": "2954:8:29", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1775,7 +1775,7 @@ "typeString": "address" } ], - "id": 7210, + "id": 7201, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1786,7 +1786,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 7212, + "id": 7203, "isConstant": false, "isLValue": false, "isPure": false, @@ -1800,7 +1800,7 @@ "typeString": "contract IERC20" } }, - "id": 7213, + "id": 7204, "isConstant": false, "isLValue": false, "isPure": false, @@ -1814,7 +1814,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 7219, + "id": 7210, "isConstant": false, "isLValue": false, "isPure": false, @@ -1828,7 +1828,7 @@ "typeString": "bool" } }, - "id": 7220, + "id": 7211, "nodeType": "ExpressionStatement", "src": "2947:72:29" }, @@ -1838,11 +1838,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7225, + "id": 7216, "name": "protocolFeePayoutAddress2", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7099, + "referencedDeclaration": 7090, "src": "3059:25:29", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -1855,7 +1855,7 @@ { "argumentTypes": null, "hexValue": "32", - "id": 7228, + "id": 7219, "isConstant": false, "isLValue": false, "isPure": true, @@ -1880,32 +1880,32 @@ ], "expression": { "argumentTypes": null, - "id": 7226, + "id": 7217, "name": "protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7127, + "referencedDeclaration": 7118, "src": "3086:11:29", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 7227, + "id": 7218, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 7670, + "referencedDeclaration": 7661, "src": "3086:15:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 7229, + "id": 7220, "isConstant": false, "isLValue": false, "isPure": false, @@ -1936,11 +1936,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7222, + "id": 7213, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7115, + "referencedDeclaration": 7106, "src": "3040:8:29", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1955,7 +1955,7 @@ "typeString": "address" } ], - "id": 7221, + "id": 7212, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1966,7 +1966,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 7223, + "id": 7214, "isConstant": false, "isLValue": false, "isPure": false, @@ -1980,7 +1980,7 @@ "typeString": "contract IERC20" } }, - "id": 7224, + "id": 7215, "isConstant": false, "isLValue": false, "isPure": false, @@ -1994,7 +1994,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 7230, + "id": 7221, "isConstant": false, "isLValue": false, "isPure": false, @@ -2008,17 +2008,17 @@ "typeString": "bool" } }, - "id": 7231, + "id": 7222, "nodeType": "ExpressionStatement", "src": "3033:72:29" } ] }, - "id": 7233, + "id": 7224, "nodeType": "IfStatement", "src": "2708:408:29", "trueBody": { - "id": 7209, + "id": 7200, "nodeType": "Block", "src": "2768:159:29", "statements": [ @@ -2029,7 +2029,7 @@ { "argumentTypes": null, "hexValue": "", - "id": 7193, + "id": 7184, "isConstant": false, "isLValue": false, "isPure": true, @@ -2059,7 +2059,7 @@ { "argumentTypes": null, "hexValue": "32", - "id": 7190, + "id": 7181, "isConstant": false, "isLValue": false, "isPure": true, @@ -2084,32 +2084,32 @@ ], "expression": { "argumentTypes": null, - "id": 7188, + "id": 7179, "name": "protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7127, + "referencedDeclaration": 7118, "src": "2819:11:29", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 7189, + "id": 7180, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 7670, + "referencedDeclaration": 7661, "src": "2819:15:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 7191, + "id": 7182, "isConstant": false, "isLValue": false, "isPure": false, @@ -2135,18 +2135,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7183, + "id": 7174, "name": "protocolFeePayoutAddress1", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7096, + "referencedDeclaration": 7087, "src": "2782:25:29", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "id": 7186, + "id": 7177, "isConstant": false, "isLValue": false, "isPure": false, @@ -2160,7 +2160,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 7187, + "id": 7178, "isConstant": false, "isLValue": false, "isPure": false, @@ -2174,7 +2174,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 7192, + "id": 7183, "isConstant": false, "isLValue": false, "isPure": false, @@ -2188,7 +2188,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 7194, + "id": 7185, "isConstant": false, "isLValue": false, "isPure": false, @@ -2202,7 +2202,7 @@ "typeString": "tuple(bool,bytes memory)" } }, - "id": 7195, + "id": 7186, "nodeType": "ExpressionStatement", "src": "2782:60:29" }, @@ -2213,7 +2213,7 @@ { "argumentTypes": null, "hexValue": "", - "id": 7206, + "id": 7197, "isConstant": false, "isLValue": false, "isPure": true, @@ -2243,7 +2243,7 @@ { "argumentTypes": null, "hexValue": "32", - "id": 7203, + "id": 7194, "isConstant": false, "isLValue": false, "isPure": true, @@ -2268,32 +2268,32 @@ ], "expression": { "argumentTypes": null, - "id": 7201, + "id": 7192, "name": "protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7127, + "referencedDeclaration": 7118, "src": "2893:11:29", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 7202, + "id": 7193, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 7670, + "referencedDeclaration": 7661, "src": "2893:15:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 7204, + "id": 7195, "isConstant": false, "isLValue": false, "isPure": false, @@ -2319,18 +2319,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7196, + "id": 7187, "name": "protocolFeePayoutAddress2", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7099, + "referencedDeclaration": 7090, "src": "2856:25:29", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "id": 7199, + "id": 7190, "isConstant": false, "isLValue": false, "isPure": false, @@ -2344,7 +2344,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 7200, + "id": 7191, "isConstant": false, "isLValue": false, "isPure": false, @@ -2358,7 +2358,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 7205, + "id": 7196, "isConstant": false, "isLValue": false, "isPure": false, @@ -2372,7 +2372,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 7207, + "id": 7198, "isConstant": false, "isLValue": false, "isPure": false, @@ -2386,7 +2386,7 @@ "typeString": "tuple(bool,bytes memory)" } }, - "id": 7208, + "id": 7199, "nodeType": "ExpressionStatement", "src": "2856:60:29" } @@ -2399,11 +2399,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7235, + "id": 7226, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7115, + "referencedDeclaration": 7106, "src": "3181:8:29", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2415,11 +2415,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7238, + "id": 7229, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7119, + "referencedDeclaration": 7110, "src": "3203:4:29", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2436,32 +2436,32 @@ ], "expression": { "argumentTypes": null, - "id": 7236, + "id": 7227, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7117, + "referencedDeclaration": 7108, "src": "3191:7:29", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 7237, + "id": 7228, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 7577, + "referencedDeclaration": 7568, "src": "3191:11:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 7239, + "id": 7230, "isConstant": false, "isLValue": false, "isPure": false, @@ -2487,18 +2487,18 @@ "typeString": "uint256" } ], - "id": 7234, + "id": 7225, "name": "transferFundsBackToPoolInternal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2078, + "referencedDeclaration": 2104, "src": "3149:31:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 7240, + "id": 7231, "isConstant": false, "isLValue": false, "isPure": false, @@ -2512,27 +2512,27 @@ "typeString": "tuple()" } }, - "id": 7241, + "id": 7232, "nodeType": "ExpressionStatement", "src": "3149:60:29" } ] }, "documentation": null, - "id": 7243, + "id": 7234, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 7124, + "id": 7115, "modifierName": { "argumentTypes": null, - "id": 7123, + "id": 7114, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "955:4:29", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2546,15 +2546,15 @@ "name": "executeOperation", "nodeType": "FunctionDefinition", "parameters": { - "id": 7122, + "id": 7113, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7115, + "id": 7106, "name": "_reserve", "nodeType": "VariableDeclaration", - "scope": 7243, + "scope": 7234, "src": "836:16:29", "stateVariable": false, "storageLocation": "default", @@ -2563,7 +2563,7 @@ "typeString": "address" }, "typeName": { - "id": 7114, + "id": 7105, "name": "address", "nodeType": "ElementaryTypeName", "src": "836:7:29", @@ -2578,10 +2578,10 @@ }, { "constant": false, - "id": 7117, + "id": 7108, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 7243, + "scope": 7234, "src": "862:15:29", "stateVariable": false, "storageLocation": "default", @@ -2590,7 +2590,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7116, + "id": 7107, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "862:7:29", @@ -2604,10 +2604,10 @@ }, { "constant": false, - "id": 7119, + "id": 7110, "name": "_fee", "nodeType": "VariableDeclaration", - "scope": 7243, + "scope": 7234, "src": "887:12:29", "stateVariable": false, "storageLocation": "default", @@ -2616,7 +2616,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7118, + "id": 7109, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "887:7:29", @@ -2630,10 +2630,10 @@ }, { "constant": false, - "id": 7121, + "id": 7112, "name": "_params", "nodeType": "VariableDeclaration", - "scope": 7243, + "scope": 7234, "src": "909:22:29", "stateVariable": false, "storageLocation": "calldata", @@ -2642,7 +2642,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7120, + "id": 7111, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "909:5:29", @@ -2658,19 +2658,19 @@ "src": "826:111:29" }, "returnParameters": { - "id": 7125, + "id": 7116, "nodeType": "ParameterList", "parameters": [], "src": "964:0:29" }, - "scope": 7244, + "scope": 7235, "src": "801:2415:29", "stateMutability": "nonpayable", "superFunction": 353, "visibility": "external" } ], - "scope": 7245, + "scope": 7236, "src": "318:2900:29" } ], @@ -2680,14 +2680,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol", "exportedSymbols": { "DACProxy": [ - 7244 + 7235 ] }, - "id": 7245, + "id": 7236, "nodeType": "SourceUnit", "nodes": [ { - "id": 7079, + "id": 7070, "literals": [ "solidity", "0.5", @@ -2697,7 +2697,7 @@ "src": "109:23:29" }, { - "id": 7080, + "id": 7071, "literals": [ "experimental", "ABIEncoderV2" @@ -2708,10 +2708,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/BytesLib.sol", "file": "../lib/BytesLib.sol", - "id": 7081, + "id": 7072, "nodeType": "ImportDirective", - "scope": 7245, - "sourceUnit": 2036, + "scope": 7236, + "sourceUnit": 2062, "src": "168:29:29", "symbolAliases": [], "unitAlias": "" @@ -2719,10 +2719,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/aave/FlashLoanReceiverBase.sol", "file": "../lib/aave/FlashLoanReceiverBase.sol", - "id": 7082, + "id": 7073, "nodeType": "ImportDirective", - "scope": 7245, - "sourceUnit": 2139, + "scope": 7236, + "sourceUnit": 2165, "src": "198:47:29", "symbolAliases": [], "unitAlias": "" @@ -2730,10 +2730,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol", "file": "../lib/dapphub/Proxy.sol", - "id": 7083, + "id": 7074, "nodeType": "ImportDirective", - "scope": 7245, - "sourceUnit": 3789, + "scope": 7236, + "sourceUnit": 3841, "src": "246:34:29", "symbolAliases": [], "unitAlias": "" @@ -2741,9 +2741,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../interfaces/IERC20.sol", - "id": 7084, + "id": 7075, "nodeType": "ImportDirective", - "scope": 7245, + "scope": 7236, "sourceUnit": 121, "src": "282:34:29", "symbolAliases": [], @@ -2759,7 +2759,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 7087, + "id": 7078, "isConstant": false, "isLValue": false, "isPure": true, @@ -2782,7 +2782,7 @@ "typeString": "int_const 1" } ], - "id": 7086, + "id": 7077, "isConstant": false, "isLValue": false, "isPure": true, @@ -2795,7 +2795,7 @@ }, "typeName": "address" }, - "id": 7088, + "id": 7079, "isConstant": false, "isLValue": false, "isPure": true, @@ -2812,17 +2812,17 @@ ], "baseName": { "contractScope": null, - "id": 7085, + "id": 7076, "name": "DSProxy", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "343:7:29", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } }, - "id": 7089, + "id": 7080, "nodeType": "InheritanceSpecifier", "src": "343:19:29" }, @@ -2830,17 +2830,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 7090, + "id": 7081, "name": "FlashLoanReceiverBase", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2138, + "referencedDeclaration": 2164, "src": "368:21:29", "typeDescriptions": { - "typeIdentifier": "t_contract$_FlashLoanReceiverBase_$2138", + "typeIdentifier": "t_contract$_FlashLoanReceiverBase_$2164", "typeString": "contract FlashLoanReceiverBase" } }, - "id": 7091, + "id": 7082, "nodeType": "InheritanceSpecifier", "src": "368:21:29" }, @@ -2848,53 +2848,53 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 7092, + "id": 7083, "name": "BytesLibLite", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2035, + "referencedDeclaration": 2061, "src": "395:12:29", "typeDescriptions": { - "typeIdentifier": "t_contract$_BytesLibLite_$2035", + "typeIdentifier": "t_contract$_BytesLibLite_$2061", "typeString": "contract BytesLibLite" } }, - "id": 7093, + "id": 7084, "nodeType": "InheritanceSpecifier", "src": "395:12:29" } ], "contractDependencies": [ 354, - 2035, - 2138, - 2808, - 2924, - 3542, - 3660 + 2061, + 2164, + 2860, + 2976, + 3594, + 3712 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 7244, + "id": 7235, "linearizedBaseContracts": [ - 7244, - 2035, - 2138, + 7235, + 2061, + 2164, 354, - 3660, - 3542, - 2924, - 2808 + 3712, + 3594, + 2976, + 2860 ], "name": "DACProxy", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 7096, + "id": 7087, "name": "protocolFeePayoutAddress1", "nodeType": "VariableDeclaration", - "scope": 7244, + "scope": 7235, "src": "445:95:29", "stateVariable": true, "storageLocation": "default", @@ -2903,7 +2903,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7094, + "id": 7085, "name": "address", "nodeType": "ElementaryTypeName", "src": "445:15:29", @@ -2916,7 +2916,7 @@ "value": { "argumentTypes": null, "hexValue": "307837373343436246423432323835303631374135363830443430423132363034323264303732663431", - "id": 7095, + "id": 7086, "isConstant": false, "isLValue": false, "isPure": true, @@ -2935,10 +2935,10 @@ }, { "constant": true, - "id": 7099, + "id": 7090, "name": "protocolFeePayoutAddress2", "nodeType": "VariableDeclaration", - "scope": 7244, + "scope": 7235, "src": "546:95:29", "stateVariable": true, "storageLocation": "default", @@ -2947,7 +2947,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7097, + "id": 7088, "name": "address", "nodeType": "ElementaryTypeName", "src": "546:15:29", @@ -2960,7 +2960,7 @@ "value": { "argumentTypes": null, "hexValue": "307841626343423866306133633230364262303436384335324343633230663362383130373734313742", - "id": 7098, + "id": 7089, "isConstant": false, "isLValue": false, "isPure": true, @@ -2979,7 +2979,7 @@ }, { "body": { - "id": 7108, + "id": 7099, "nodeType": "Block", "src": "687:37:29", "statements": [ @@ -2989,11 +2989,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7105, + "id": 7096, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7101, + "referencedDeclaration": 7092, "src": "706:10:29", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3008,18 +3008,18 @@ "typeString": "address" } ], - "id": 7104, + "id": 7095, "name": "setCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3659, + "referencedDeclaration": 3711, "src": "697:8:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_bool_$", "typeString": "function (address) returns (bool)" } }, - "id": 7106, + "id": 7097, "isConstant": false, "isLValue": false, "isPure": false, @@ -3033,29 +3033,29 @@ "typeString": "bool" } }, - "id": 7107, + "id": 7098, "nodeType": "ExpressionStatement", "src": "697:20:29" } ] }, "documentation": null, - "id": 7109, + "id": 7100, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 7102, + "id": 7093, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7101, + "id": 7092, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 7109, + "scope": 7100, "src": "660:18:29", "stateVariable": false, "storageLocation": "default", @@ -3064,7 +3064,7 @@ "typeString": "address" }, "typeName": { - "id": 7100, + "id": 7091, "name": "address", "nodeType": "ElementaryTypeName", "src": "660:7:29", @@ -3081,12 +3081,12 @@ "src": "659:20:29" }, "returnParameters": { - "id": 7103, + "id": 7094, "nodeType": "ParameterList", "parameters": [], "src": "687:0:29" }, - "scope": 7244, + "scope": 7235, "src": "648:76:29", "stateMutability": "nonpayable", "superFunction": null, @@ -3094,53 +3094,53 @@ }, { "body": { - "id": 7112, + "id": 7103, "nodeType": "Block", "src": "758:2:29", "statements": [] }, "documentation": null, - "id": 7113, + "id": 7104, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 7110, + "id": 7101, "nodeType": "ParameterList", "parameters": [], "src": "738:2:29" }, "returnParameters": { - "id": 7111, + "id": 7102, "nodeType": "ParameterList", "parameters": [], "src": "758:0:29" }, - "scope": 7244, + "scope": 7235, "src": "730:30:29", "stateMutability": "payable", - "superFunction": 2058, + "superFunction": 2084, "visibility": "external" }, { "body": { - "id": 7242, + "id": 7233, "nodeType": "Block", "src": "964:2252:29", "statements": [ { "assignments": [ - 7127 + 7118 ], "declarations": [ { "constant": false, - "id": 7127, + "id": 7118, "name": "protocolFee", "nodeType": "VariableDeclaration", - "scope": 7242, + "scope": 7233, "src": "1125:16:29", "stateVariable": false, "storageLocation": "default", @@ -3149,7 +3149,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7126, + "id": 7117, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1125:4:29", @@ -3162,14 +3162,14 @@ "visibility": "internal" } ], - "id": 7132, + "id": 7123, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "32", - "id": 7130, + "id": 7121, "isConstant": false, "isLValue": false, "isPure": true, @@ -3194,32 +3194,32 @@ ], "expression": { "argumentTypes": null, - "id": 7128, + "id": 7119, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7119, + "referencedDeclaration": 7110, "src": "1144:4:29", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 7129, + "id": 7120, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 7670, + "referencedDeclaration": 7661, "src": "1144:8:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 7131, + "id": 7122, "isConstant": false, "isLValue": false, "isPure": false, @@ -3238,15 +3238,15 @@ }, { "assignments": [ - 7134 + 7125 ], "declarations": [ { "constant": false, - "id": 7134, + "id": 7125, "name": "targetAddress", "nodeType": "VariableDeclaration", - "scope": 7242, + "scope": 7233, "src": "2122:21:29", "stateVariable": false, "storageLocation": "default", @@ -3255,7 +3255,7 @@ "typeString": "address" }, "typeName": { - "id": 7133, + "id": 7124, "name": "address", "nodeType": "ElementaryTypeName", "src": "2122:7:29", @@ -3269,17 +3269,17 @@ "visibility": "internal" } ], - "id": 7139, + "id": 7130, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 7136, + "id": 7127, "name": "_params", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7121, + "referencedDeclaration": 7112, "src": "2161:7:29", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -3289,7 +3289,7 @@ { "argumentTypes": null, "hexValue": "3132", - "id": 7137, + "id": 7128, "isConstant": false, "isLValue": false, "isPure": true, @@ -3316,18 +3316,18 @@ "typeString": "int_const 12" } ], - "id": 7135, + "id": 7126, "name": "bytesToAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2034, + "referencedDeclaration": 2060, "src": "2146:14:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$_t_uint256_$returns$_t_address_$", "typeString": "function (bytes memory,uint256) pure returns (address)" } }, - "id": 7138, + "id": 7129, "isConstant": false, "isLValue": false, "isPure": false, @@ -3346,15 +3346,15 @@ }, { "assignments": [ - 7141 + 7132 ], "declarations": [ { "constant": false, - "id": 7141, + "id": 7132, "name": "fSig", "nodeType": "VariableDeclaration", - "scope": 7242, + "scope": 7233, "src": "2183:17:29", "stateVariable": false, "storageLocation": "memory", @@ -3363,7 +3363,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7140, + "id": 7131, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "2183:5:29", @@ -3376,17 +3376,17 @@ "visibility": "internal" } ], - "id": 7147, + "id": 7138, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 7143, + "id": 7134, "name": "_params", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7121, + "referencedDeclaration": 7112, "src": "2213:7:29", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -3396,7 +3396,7 @@ { "argumentTypes": null, "hexValue": "3332", - "id": 7144, + "id": 7135, "isConstant": false, "isLValue": false, "isPure": true, @@ -3414,7 +3414,7 @@ { "argumentTypes": null, "hexValue": "34", - "id": 7145, + "id": 7136, "isConstant": false, "isLValue": false, "isPure": true, @@ -3445,18 +3445,18 @@ "typeString": "int_const 4" } ], - "id": 7142, + "id": 7133, "name": "slice", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2007, + "referencedDeclaration": 2033, "src": "2207:5:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$_t_uint256_$_t_uint256_$returns$_t_bytes_memory_ptr_$", "typeString": "function (bytes memory,uint256,uint256) pure returns (bytes memory)" } }, - "id": 7146, + "id": 7137, "isConstant": false, "isLValue": false, "isPure": false, @@ -3475,15 +3475,15 @@ }, { "assignments": [ - 7149 + 7140 ], "declarations": [ { "constant": false, - "id": 7149, + "id": 7140, "name": "data", "nodeType": "VariableDeclaration", - "scope": 7242, + "scope": 7233, "src": "2238:17:29", "stateVariable": false, "storageLocation": "memory", @@ -3492,7 +3492,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7148, + "id": 7139, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "2238:5:29", @@ -3505,17 +3505,17 @@ "visibility": "internal" } ], - "id": 7154, + "id": 7145, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 7151, + "id": 7142, "name": "_params", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7121, + "referencedDeclaration": 7112, "src": "2273:7:29", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -3525,7 +3525,7 @@ { "argumentTypes": null, "hexValue": "313332", - "id": 7152, + "id": 7143, "isConstant": false, "isLValue": false, "isPure": true, @@ -3552,18 +3552,18 @@ "typeString": "int_const 132" } ], - "id": 7150, + "id": 7141, "name": "sliceToEnd", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1978, + "referencedDeclaration": 2004, "src": "2262:10:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_bytes_memory_ptr_$_t_uint256_$returns$_t_bytes_memory_ptr_$", "typeString": "function (bytes memory,uint256) pure returns (bytes memory)" } }, - "id": 7153, + "id": 7144, "isConstant": false, "isLValue": false, "isPure": false, @@ -3582,15 +3582,15 @@ }, { "assignments": [ - 7156 + 7147 ], "declarations": [ { "constant": false, - "id": 7156, + "id": 7147, "name": "newData", "nodeType": "VariableDeclaration", - "scope": 7242, + "scope": 7233, "src": "2408:20:29", "stateVariable": false, "storageLocation": "memory", @@ -3599,7 +3599,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7155, + "id": 7146, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "2408:5:29", @@ -3612,17 +3612,17 @@ "visibility": "internal" } ], - "id": 7174, + "id": 7165, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 7159, + "id": 7150, "name": "fSig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7141, + "referencedDeclaration": 7132, "src": "2461:4:29", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3634,11 +3634,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7162, + "id": 7153, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7117, + "referencedDeclaration": 7108, "src": "2490:7:29", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3655,18 +3655,18 @@ ], "expression": { "argumentTypes": null, - "id": 7160, + "id": 7151, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "2479:3:29", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 7161, + "id": 7152, "isConstant": false, "isLValue": false, "isPure": true, @@ -3680,7 +3680,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 7163, + "id": 7154, "isConstant": false, "isLValue": false, "isPure": false, @@ -3699,11 +3699,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7166, + "id": 7157, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7119, + "referencedDeclaration": 7110, "src": "2523:4:29", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3720,18 +3720,18 @@ ], "expression": { "argumentTypes": null, - "id": 7164, + "id": 7155, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "2512:3:29", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 7165, + "id": 7156, "isConstant": false, "isLValue": false, "isPure": true, @@ -3745,7 +3745,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 7167, + "id": 7158, "isConstant": false, "isLValue": false, "isPure": false, @@ -3764,11 +3764,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7170, + "id": 7161, "name": "protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7127, + "referencedDeclaration": 7118, "src": "2553:11:29", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3785,18 +3785,18 @@ ], "expression": { "argumentTypes": null, - "id": 7168, + "id": 7159, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "2542:3:29", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 7169, + "id": 7160, "isConstant": false, "isLValue": false, "isPure": true, @@ -3810,7 +3810,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 7171, + "id": 7162, "isConstant": false, "isLValue": false, "isPure": false, @@ -3826,11 +3826,11 @@ }, { "argumentTypes": null, - "id": 7172, + "id": 7163, "name": "data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7149, + "referencedDeclaration": 7140, "src": "2579:4:29", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3863,18 +3863,18 @@ ], "expression": { "argumentTypes": null, - "id": 7157, + "id": 7148, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "2431:3:29", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 7158, + "id": 7149, "isConstant": false, "isLValue": false, "isPure": true, @@ -3888,7 +3888,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 7173, + "id": 7164, "isConstant": false, "isLValue": false, "isPure": false, @@ -3911,11 +3911,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7176, + "id": 7167, "name": "targetAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7134, + "referencedDeclaration": 7125, "src": "2643:13:29", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3924,11 +3924,11 @@ }, { "argumentTypes": null, - "id": 7177, + "id": 7168, "name": "newData", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7156, + "referencedDeclaration": 7147, "src": "2658:7:29", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3947,21 +3947,21 @@ "typeString": "bytes memory" } ], - "id": 7175, + "id": 7166, "name": "execute", "nodeType": "Identifier", "overloadedDeclarations": [ - 3606, - 3630 + 3658, + 3682 ], - "referencedDeclaration": 3630, + "referencedDeclaration": 3682, "src": "2635:7:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$", "typeString": "function (address,bytes memory) returns (bytes memory)" } }, - "id": 7178, + "id": 7169, "isConstant": false, "isLValue": false, "isPure": false, @@ -3975,7 +3975,7 @@ "typeString": "bytes memory" } }, - "id": 7179, + "id": 7170, "nodeType": "ExpressionStatement", "src": "2635:31:29" }, @@ -3986,18 +3986,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 7182, + "id": 7173, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7180, + "id": 7171, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7115, + "referencedDeclaration": 7106, "src": "2712:8:29", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4009,7 +4009,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "307845656565654565656545654565654565456545656545454565656565456565656565656545456545", - "id": 7181, + "id": 7172, "isConstant": false, "isLValue": false, "isPure": true, @@ -4031,7 +4031,7 @@ } }, "falseBody": { - "id": 7232, + "id": 7223, "nodeType": "Block", "src": "2933:183:29", "statements": [ @@ -4041,11 +4041,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7214, + "id": 7205, "name": "protocolFeePayoutAddress1", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7096, + "referencedDeclaration": 7087, "src": "2973:25:29", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -4058,7 +4058,7 @@ { "argumentTypes": null, "hexValue": "32", - "id": 7217, + "id": 7208, "isConstant": false, "isLValue": false, "isPure": true, @@ -4083,32 +4083,32 @@ ], "expression": { "argumentTypes": null, - "id": 7215, + "id": 7206, "name": "protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7127, + "referencedDeclaration": 7118, "src": "3000:11:29", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 7216, + "id": 7207, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 7670, + "referencedDeclaration": 7661, "src": "3000:15:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 7218, + "id": 7209, "isConstant": false, "isLValue": false, "isPure": false, @@ -4139,11 +4139,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7211, + "id": 7202, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7115, + "referencedDeclaration": 7106, "src": "2954:8:29", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4158,7 +4158,7 @@ "typeString": "address" } ], - "id": 7210, + "id": 7201, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -4169,7 +4169,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 7212, + "id": 7203, "isConstant": false, "isLValue": false, "isPure": false, @@ -4183,7 +4183,7 @@ "typeString": "contract IERC20" } }, - "id": 7213, + "id": 7204, "isConstant": false, "isLValue": false, "isPure": false, @@ -4197,7 +4197,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 7219, + "id": 7210, "isConstant": false, "isLValue": false, "isPure": false, @@ -4211,7 +4211,7 @@ "typeString": "bool" } }, - "id": 7220, + "id": 7211, "nodeType": "ExpressionStatement", "src": "2947:72:29" }, @@ -4221,11 +4221,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7225, + "id": 7216, "name": "protocolFeePayoutAddress2", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7099, + "referencedDeclaration": 7090, "src": "3059:25:29", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -4238,7 +4238,7 @@ { "argumentTypes": null, "hexValue": "32", - "id": 7228, + "id": 7219, "isConstant": false, "isLValue": false, "isPure": true, @@ -4263,32 +4263,32 @@ ], "expression": { "argumentTypes": null, - "id": 7226, + "id": 7217, "name": "protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7127, + "referencedDeclaration": 7118, "src": "3086:11:29", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 7227, + "id": 7218, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 7670, + "referencedDeclaration": 7661, "src": "3086:15:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 7229, + "id": 7220, "isConstant": false, "isLValue": false, "isPure": false, @@ -4319,11 +4319,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7222, + "id": 7213, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7115, + "referencedDeclaration": 7106, "src": "3040:8:29", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4338,7 +4338,7 @@ "typeString": "address" } ], - "id": 7221, + "id": 7212, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -4349,7 +4349,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 7223, + "id": 7214, "isConstant": false, "isLValue": false, "isPure": false, @@ -4363,7 +4363,7 @@ "typeString": "contract IERC20" } }, - "id": 7224, + "id": 7215, "isConstant": false, "isLValue": false, "isPure": false, @@ -4377,7 +4377,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 7230, + "id": 7221, "isConstant": false, "isLValue": false, "isPure": false, @@ -4391,17 +4391,17 @@ "typeString": "bool" } }, - "id": 7231, + "id": 7222, "nodeType": "ExpressionStatement", "src": "3033:72:29" } ] }, - "id": 7233, + "id": 7224, "nodeType": "IfStatement", "src": "2708:408:29", "trueBody": { - "id": 7209, + "id": 7200, "nodeType": "Block", "src": "2768:159:29", "statements": [ @@ -4412,7 +4412,7 @@ { "argumentTypes": null, "hexValue": "", - "id": 7193, + "id": 7184, "isConstant": false, "isLValue": false, "isPure": true, @@ -4442,7 +4442,7 @@ { "argumentTypes": null, "hexValue": "32", - "id": 7190, + "id": 7181, "isConstant": false, "isLValue": false, "isPure": true, @@ -4467,32 +4467,32 @@ ], "expression": { "argumentTypes": null, - "id": 7188, + "id": 7179, "name": "protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7127, + "referencedDeclaration": 7118, "src": "2819:11:29", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 7189, + "id": 7180, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 7670, + "referencedDeclaration": 7661, "src": "2819:15:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 7191, + "id": 7182, "isConstant": false, "isLValue": false, "isPure": false, @@ -4518,18 +4518,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7183, + "id": 7174, "name": "protocolFeePayoutAddress1", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7096, + "referencedDeclaration": 7087, "src": "2782:25:29", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "id": 7186, + "id": 7177, "isConstant": false, "isLValue": false, "isPure": false, @@ -4543,7 +4543,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 7187, + "id": 7178, "isConstant": false, "isLValue": false, "isPure": false, @@ -4557,7 +4557,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 7192, + "id": 7183, "isConstant": false, "isLValue": false, "isPure": false, @@ -4571,7 +4571,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 7194, + "id": 7185, "isConstant": false, "isLValue": false, "isPure": false, @@ -4585,7 +4585,7 @@ "typeString": "tuple(bool,bytes memory)" } }, - "id": 7195, + "id": 7186, "nodeType": "ExpressionStatement", "src": "2782:60:29" }, @@ -4596,7 +4596,7 @@ { "argumentTypes": null, "hexValue": "", - "id": 7206, + "id": 7197, "isConstant": false, "isLValue": false, "isPure": true, @@ -4626,7 +4626,7 @@ { "argumentTypes": null, "hexValue": "32", - "id": 7203, + "id": 7194, "isConstant": false, "isLValue": false, "isPure": true, @@ -4651,32 +4651,32 @@ ], "expression": { "argumentTypes": null, - "id": 7201, + "id": 7192, "name": "protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7127, + "referencedDeclaration": 7118, "src": "2893:11:29", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 7202, + "id": 7193, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 7670, + "referencedDeclaration": 7661, "src": "2893:15:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 7204, + "id": 7195, "isConstant": false, "isLValue": false, "isPure": false, @@ -4702,18 +4702,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7196, + "id": 7187, "name": "protocolFeePayoutAddress2", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7099, + "referencedDeclaration": 7090, "src": "2856:25:29", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "id": 7199, + "id": 7190, "isConstant": false, "isLValue": false, "isPure": false, @@ -4727,7 +4727,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 7200, + "id": 7191, "isConstant": false, "isLValue": false, "isPure": false, @@ -4741,7 +4741,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 7205, + "id": 7196, "isConstant": false, "isLValue": false, "isPure": false, @@ -4755,7 +4755,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 7207, + "id": 7198, "isConstant": false, "isLValue": false, "isPure": false, @@ -4769,7 +4769,7 @@ "typeString": "tuple(bool,bytes memory)" } }, - "id": 7208, + "id": 7199, "nodeType": "ExpressionStatement", "src": "2856:60:29" } @@ -4782,11 +4782,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7235, + "id": 7226, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7115, + "referencedDeclaration": 7106, "src": "3181:8:29", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4798,11 +4798,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7238, + "id": 7229, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7119, + "referencedDeclaration": 7110, "src": "3203:4:29", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4819,32 +4819,32 @@ ], "expression": { "argumentTypes": null, - "id": 7236, + "id": 7227, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7117, + "referencedDeclaration": 7108, "src": "3191:7:29", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 7237, + "id": 7228, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 7577, + "referencedDeclaration": 7568, "src": "3191:11:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 7239, + "id": 7230, "isConstant": false, "isLValue": false, "isPure": false, @@ -4870,18 +4870,18 @@ "typeString": "uint256" } ], - "id": 7234, + "id": 7225, "name": "transferFundsBackToPoolInternal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2078, + "referencedDeclaration": 2104, "src": "3149:31:29", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 7240, + "id": 7231, "isConstant": false, "isLValue": false, "isPure": false, @@ -4895,27 +4895,27 @@ "typeString": "tuple()" } }, - "id": 7241, + "id": 7232, "nodeType": "ExpressionStatement", "src": "3149:60:29" } ] }, "documentation": null, - "id": 7243, + "id": 7234, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 7124, + "id": 7115, "modifierName": { "argumentTypes": null, - "id": 7123, + "id": 7114, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "955:4:29", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -4929,15 +4929,15 @@ "name": "executeOperation", "nodeType": "FunctionDefinition", "parameters": { - "id": 7122, + "id": 7113, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7115, + "id": 7106, "name": "_reserve", "nodeType": "VariableDeclaration", - "scope": 7243, + "scope": 7234, "src": "836:16:29", "stateVariable": false, "storageLocation": "default", @@ -4946,7 +4946,7 @@ "typeString": "address" }, "typeName": { - "id": 7114, + "id": 7105, "name": "address", "nodeType": "ElementaryTypeName", "src": "836:7:29", @@ -4961,10 +4961,10 @@ }, { "constant": false, - "id": 7117, + "id": 7108, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 7243, + "scope": 7234, "src": "862:15:29", "stateVariable": false, "storageLocation": "default", @@ -4973,7 +4973,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7116, + "id": 7107, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "862:7:29", @@ -4987,10 +4987,10 @@ }, { "constant": false, - "id": 7119, + "id": 7110, "name": "_fee", "nodeType": "VariableDeclaration", - "scope": 7243, + "scope": 7234, "src": "887:12:29", "stateVariable": false, "storageLocation": "default", @@ -4999,7 +4999,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7118, + "id": 7109, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "887:7:29", @@ -5013,10 +5013,10 @@ }, { "constant": false, - "id": 7121, + "id": 7112, "name": "_params", "nodeType": "VariableDeclaration", - "scope": 7243, + "scope": 7234, "src": "909:22:29", "stateVariable": false, "storageLocation": "calldata", @@ -5025,7 +5025,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7120, + "id": 7111, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "909:5:29", @@ -5041,19 +5041,19 @@ "src": "826:111:29" }, "returnParameters": { - "id": 7125, + "id": 7116, "nodeType": "ParameterList", "parameters": [], "src": "964:0:29" }, - "scope": 7244, + "scope": 7235, "src": "801:2415:29", "stateMutability": "nonpayable", "superFunction": 353, "visibility": "external" } ], - "scope": 7245, + "scope": 7236, "src": "318:2900:29" } ], @@ -5065,7 +5065,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.645Z", + "updatedAt": "2020-04-08T12:21:13.924Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DACProxyFactory.json b/packages/smart-contracts/artifacts/DACProxyFactory.json index f31212c..581a84d 100644 --- a/packages/smart-contracts/artifacts/DACProxyFactory.json +++ b/packages/smart-contracts/artifacts/DACProxyFactory.json @@ -194,14 +194,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxyFactory.sol", "exportedSymbols": { "DACProxyFactory": [ - 7490 + 7481 ] }, - "id": 7491, + "id": 7482, "nodeType": "SourceUnit", "nodes": [ { - "id": 7246, + "id": 7237, "literals": [ "solidity", "0.5", @@ -213,10 +213,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol", "file": "./DACProxy.sol", - "id": 7247, + "id": 7238, "nodeType": "ImportDirective", - "scope": 7491, - "sourceUnit": 7245, + "scope": 7482, + "sourceUnit": 7236, "src": "25:24:30", "symbolAliases": [], "unitAlias": "" @@ -224,10 +224,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "file": "../lib/dapphub/Guard.sol", - "id": 7248, + "id": 7239, "nodeType": "ImportDirective", - "scope": 7491, - "sourceUnit": 3196, + "scope": 7482, + "sourceUnit": 3248, "src": "51:34:30", "symbolAliases": [], "unitAlias": "" @@ -235,10 +235,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", "file": "../interfaces/compound/IComptroller.sol", - "id": 7249, + "id": 7240, "nodeType": "ImportDirective", - "scope": 7491, - "sourceUnit": 1097, + "scope": 7482, + "sourceUnit": 1123, "src": "87:49:30", "symbolAliases": [], "unitAlias": "" @@ -246,16 +246,16 @@ { "baseContracts": [], "contractDependencies": [ - 3195, - 3788, - 7244 + 3247, + 3840, + 7235 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 7490, + "id": 7481, "linearizedBaseContracts": [ - 7490 + 7481 ], "name": "DACProxyFactory", "nodeType": "ContractDefinition", @@ -263,20 +263,20 @@ { "anonymous": false, "documentation": null, - "id": 7259, + "id": 7250, "name": "Created", "nodeType": "EventDefinition", "parameters": { - "id": 7258, + "id": 7249, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7251, + "id": 7242, "indexed": true, "name": "sender", "nodeType": "VariableDeclaration", - "scope": 7259, + "scope": 7250, "src": "183:22:30", "stateVariable": false, "storageLocation": "default", @@ -285,7 +285,7 @@ "typeString": "address" }, "typeName": { - "id": 7250, + "id": 7241, "name": "address", "nodeType": "ElementaryTypeName", "src": "183:7:30", @@ -300,11 +300,11 @@ }, { "constant": false, - "id": 7253, + "id": 7244, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 7259, + "scope": 7250, "src": "207:21:30", "stateVariable": false, "storageLocation": "default", @@ -313,7 +313,7 @@ "typeString": "address" }, "typeName": { - "id": 7252, + "id": 7243, "name": "address", "nodeType": "ElementaryTypeName", "src": "207:7:30", @@ -328,11 +328,11 @@ }, { "constant": false, - "id": 7255, + "id": 7246, "indexed": false, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 7259, + "scope": 7250, "src": "230:13:30", "stateVariable": false, "storageLocation": "default", @@ -341,7 +341,7 @@ "typeString": "address" }, "typeName": { - "id": 7254, + "id": 7245, "name": "address", "nodeType": "ElementaryTypeName", "src": "230:7:30", @@ -356,11 +356,11 @@ }, { "constant": false, - "id": 7257, + "id": 7248, "indexed": false, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 7259, + "scope": 7250, "src": "245:13:30", "stateVariable": false, "storageLocation": "default", @@ -369,7 +369,7 @@ "typeString": "address" }, "typeName": { - "id": 7256, + "id": 7247, "name": "address", "nodeType": "ElementaryTypeName", "src": "245:7:30", @@ -389,10 +389,10 @@ }, { "constant": false, - "id": 7263, + "id": 7254, "name": "proxies", "nodeType": "VariableDeclaration", - "scope": 7490, + "scope": 7481, "src": "266:40:30", "stateVariable": true, "storageLocation": "default", @@ -401,9 +401,9 @@ "typeString": "mapping(address => address)" }, "typeName": { - "id": 7262, + "id": 7253, "keyType": { - "id": 7260, + "id": 7251, "name": "address", "nodeType": "ElementaryTypeName", "src": "274:7:30", @@ -419,7 +419,7 @@ "typeString": "mapping(address => address)" }, "valueType": { - "id": 7261, + "id": 7252, "name": "address", "nodeType": "ElementaryTypeName", "src": "283:7:30", @@ -435,26 +435,26 @@ }, { "constant": false, - "id": 7265, + "id": 7256, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 7490, + "scope": 7481, "src": "313:25:30", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 7264, + "id": 7255, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "313:12:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -463,26 +463,26 @@ }, { "constant": false, - "id": 7267, + "id": 7258, "name": "dsGuardFactory", "nodeType": "VariableDeclaration", - "scope": 7490, + "scope": 7481, "src": "344:36:30", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" }, "typeName": { "contractScope": null, - "id": 7266, + "id": 7257, "name": "DSGuardFactory", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3195, + "referencedDeclaration": 3247, "src": "344:14:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } }, @@ -491,28 +491,28 @@ }, { "body": { - "id": 7282, + "id": 7273, "nodeType": "Block", "src": "408:90:30", "statements": [ { "expression": { "argumentTypes": null, - "id": 7274, + "id": 7265, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 7270, + "id": 7261, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7265, + "referencedDeclaration": 7256, "src": "418:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -523,7 +523,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 7272, + "id": 7263, "isConstant": false, "isLValue": false, "isPure": false, @@ -531,23 +531,23 @@ "nodeType": "NewExpression", "src": "426:16:30", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3840_$", "typeString": "function () returns (contract DSProxyCache)" }, "typeName": { "contractScope": null, - "id": 7271, + "id": 7262, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "430:12:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } }, - "id": 7273, + "id": 7264, "isConstant": false, "isLValue": false, "isPure": false, @@ -557,38 +557,38 @@ "nodeType": "FunctionCall", "src": "426:18:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "418:26:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 7275, + "id": 7266, "nodeType": "ExpressionStatement", "src": "418:26:30" }, { "expression": { "argumentTypes": null, - "id": 7280, + "id": 7271, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 7276, + "id": 7267, "name": "dsGuardFactory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7267, + "referencedDeclaration": 7258, "src": "454:14:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } }, @@ -599,7 +599,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 7278, + "id": 7269, "isConstant": false, "isLValue": false, "isPure": false, @@ -607,23 +607,23 @@ "nodeType": "NewExpression", "src": "471:18:30", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuardFactory_$3195_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuardFactory_$3247_$", "typeString": "function () returns (contract DSGuardFactory)" }, "typeName": { "contractScope": null, - "id": 7277, + "id": 7268, "name": "DSGuardFactory", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3195, + "referencedDeclaration": 3247, "src": "475:14:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } } }, - "id": 7279, + "id": 7270, "isConstant": false, "isLValue": false, "isPure": false, @@ -633,42 +633,42 @@ "nodeType": "FunctionCall", "src": "471:20:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } }, "src": "454:37:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } }, - "id": 7281, + "id": 7272, "nodeType": "ExpressionStatement", "src": "454:37:30" } ] }, "documentation": null, - "id": 7283, + "id": 7274, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 7268, + "id": 7259, "nodeType": "ParameterList", "parameters": [], "src": "398:2:30" }, "returnParameters": { - "id": 7269, + "id": 7260, "nodeType": "ParameterList", "parameters": [], "src": "408:0:30" }, - "scope": 7490, + "scope": 7481, "src": "387:111:30", "stateMutability": "nonpayable", "superFunction": null, @@ -676,25 +676,25 @@ }, { "body": { - "id": 7295, + "id": 7286, "nodeType": "Block", "src": "633:42:30", "statements": [ { "expression": { "argumentTypes": null, - "id": 7293, + "id": 7284, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 7288, + "id": 7279, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7286, + "referencedDeclaration": 7277, "src": "643:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -710,18 +710,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7290, + "id": 7281, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "657:3:30", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 7291, + "id": 7282, "isConstant": false, "isLValue": false, "isPure": false, @@ -743,21 +743,21 @@ "typeString": "address payable" } ], - "id": 7289, + "id": 7280, "name": "build", "nodeType": "Identifier", "overloadedDeclarations": [ - 7296, - 7378 + 7287, + 7369 ], - "referencedDeclaration": 7378, + "referencedDeclaration": 7369, "src": "651:5:30", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_address_payable_$", "typeString": "function (address) returns (address payable)" } }, - "id": 7292, + "id": 7283, "isConstant": false, "isLValue": false, "isPure": false, @@ -777,35 +777,35 @@ "typeString": "address payable" } }, - "id": 7294, + "id": 7285, "nodeType": "ExpressionStatement", "src": "643:25:30" } ] }, "documentation": null, - "id": 7296, + "id": 7287, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 7284, + "id": 7275, "nodeType": "ParameterList", "parameters": [], "src": "591:2:30" }, "returnParameters": { - "id": 7287, + "id": 7278, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7286, + "id": 7277, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 7296, + "scope": 7287, "src": "610:21:30", "stateVariable": false, "storageLocation": "default", @@ -814,7 +814,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7285, + "id": 7276, "name": "address", "nodeType": "ElementaryTypeName", "src": "610:15:30", @@ -830,7 +830,7 @@ ], "src": "609:23:30" }, - "scope": 7490, + "scope": 7481, "src": "577:98:30", "stateMutability": "nonpayable", "superFunction": null, @@ -838,7 +838,7 @@ }, { "body": { - "id": 7377, + "id": 7368, "nodeType": "Block", "src": "841:578:30", "statements": [ @@ -849,7 +849,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 7309, + "id": 7300, "isConstant": false, "isLValue": false, "isPure": false, @@ -858,25 +858,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 7303, + "id": 7294, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7263, + "referencedDeclaration": 7254, "src": "921:7:30", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 7305, + "id": 7296, "indexExpression": { "argumentTypes": null, - "id": 7304, + "id": 7295, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7298, + "referencedDeclaration": 7289, "src": "929:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -902,7 +902,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 7307, + "id": 7298, "isConstant": false, "isLValue": false, "isPure": true, @@ -925,7 +925,7 @@ "typeString": "int_const 0" } ], - "id": 7306, + "id": 7297, "isConstant": false, "isLValue": false, "isPure": true, @@ -938,7 +938,7 @@ }, "typeName": "address" }, - "id": 7308, + "id": 7299, "isConstant": false, "isLValue": false, "isPure": true, @@ -959,11 +959,11 @@ } }, "falseBody": null, - "id": 7319, + "id": 7310, "nodeType": "IfStatement", "src": "917:98:30", "trueBody": { - "id": 7318, + "id": 7309, "nodeType": "Block", "src": "951:64:30", "statements": [ @@ -978,25 +978,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 7312, + "id": 7303, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7263, + "referencedDeclaration": 7254, "src": "988:7:30", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 7314, + "id": 7305, "indexExpression": { "argumentTypes": null, - "id": 7313, + "id": 7304, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7298, + "referencedDeclaration": 7289, "src": "996:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1022,7 +1022,7 @@ "typeString": "address" } ], - "id": 7311, + "id": 7302, "isConstant": false, "isLValue": false, "isPure": true, @@ -1035,7 +1035,7 @@ }, "typeName": "uint160" }, - "id": 7315, + "id": 7306, "isConstant": false, "isLValue": false, "isPure": false, @@ -1057,7 +1057,7 @@ "typeString": "uint160" } ], - "id": 7310, + "id": 7301, "isConstant": false, "isLValue": false, "isPure": true, @@ -1070,7 +1070,7 @@ }, "typeName": "address" }, - "id": 7316, + "id": 7307, "isConstant": false, "isLValue": false, "isPure": false, @@ -1084,8 +1084,8 @@ "typeString": "address payable" } }, - "functionReturnParameters": 7302, - "id": 7317, + "functionReturnParameters": 7293, + "id": 7308, "nodeType": "Return", "src": "965:39:30" } @@ -1094,15 +1094,15 @@ }, { "assignments": [ - 7321 + 7312 ], "declarations": [ { "constant": false, - "id": 7321, + "id": 7312, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 7377, + "scope": 7368, "src": "1025:21:30", "stateVariable": false, "storageLocation": "default", @@ -1111,7 +1111,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7320, + "id": 7311, "name": "address", "nodeType": "ElementaryTypeName", "src": "1025:15:30", @@ -1125,7 +1125,7 @@ "visibility": "internal" } ], - "id": 7330, + "id": 7321, "initialValue": { "argumentTypes": null, "arguments": [ @@ -1137,14 +1137,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7326, + "id": 7317, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7265, + "referencedDeclaration": 7256, "src": "1078:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -1152,11 +1152,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 7325, + "id": 7316, "isConstant": false, "isLValue": false, "isPure": true, @@ -1169,7 +1169,7 @@ }, "typeName": "address" }, - "id": 7327, + "id": 7318, "isConstant": false, "isLValue": false, "isPure": false, @@ -1191,7 +1191,7 @@ "typeString": "address" } ], - "id": 7324, + "id": 7315, "isConstant": false, "isLValue": false, "isPure": false, @@ -1199,23 +1199,23 @@ "nodeType": "NewExpression", "src": "1057:12:30", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DACProxy_$7235_$", "typeString": "function (address) returns (contract DACProxy)" }, "typeName": { "contractScope": null, - "id": 7323, + "id": 7314, "name": "DACProxy", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1061:8:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } } }, - "id": 7328, + "id": 7319, "isConstant": false, "isLValue": false, "isPure": false, @@ -1225,7 +1225,7 @@ "nodeType": "FunctionCall", "src": "1057:28:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } } @@ -1233,11 +1233,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } ], - "id": 7322, + "id": 7313, "isConstant": false, "isLValue": false, "isPure": true, @@ -1250,7 +1250,7 @@ }, "typeName": "address" }, - "id": 7329, + "id": 7320, "isConstant": false, "isLValue": false, "isPure": false, @@ -1275,18 +1275,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7332, + "id": 7323, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1109:3:30", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 7333, + "id": 7324, "isConstant": false, "isLValue": false, "isPure": false, @@ -1302,11 +1302,11 @@ }, { "argumentTypes": null, - "id": 7334, + "id": 7325, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7298, + "referencedDeclaration": 7289, "src": "1121:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1318,11 +1318,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7336, + "id": 7327, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7321, + "referencedDeclaration": 7312, "src": "1136:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -1337,7 +1337,7 @@ "typeString": "address payable" } ], - "id": 7335, + "id": 7326, "isConstant": false, "isLValue": false, "isPure": true, @@ -1350,7 +1350,7 @@ }, "typeName": "address" }, - "id": 7337, + "id": 7328, "isConstant": false, "isLValue": false, "isPure": false, @@ -1369,14 +1369,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7339, + "id": 7330, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7265, + "referencedDeclaration": 7256, "src": "1152:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -1384,11 +1384,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 7338, + "id": 7329, "isConstant": false, "isLValue": false, "isPure": true, @@ -1401,7 +1401,7 @@ }, "typeName": "address" }, - "id": 7340, + "id": 7331, "isConstant": false, "isLValue": false, "isPure": false, @@ -1435,18 +1435,18 @@ "typeString": "address" } ], - "id": 7331, + "id": 7322, "name": "Created", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7259, + "referencedDeclaration": 7250, "src": "1101:7:30", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_address_$returns$__$", "typeString": "function (address,address,address,address)" } }, - "id": 7341, + "id": 7332, "isConstant": false, "isLValue": false, "isPure": false, @@ -1460,37 +1460,37 @@ "typeString": "tuple()" } }, - "id": 7342, + "id": 7333, "nodeType": "EmitStatement", "src": "1096:63:30" }, { "assignments": [ - 7344 + 7335 ], "declarations": [ { "constant": false, - "id": 7344, + "id": 7335, "name": "guard", "nodeType": "VariableDeclaration", - "scope": 7377, + "scope": 7368, "src": "1170:13:30", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" }, "typeName": { "contractScope": null, - "id": 7343, + "id": 7334, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1170:7:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -1498,7 +1498,7 @@ "visibility": "internal" } ], - "id": 7348, + "id": 7339, "initialValue": { "argumentTypes": null, "arguments": [], @@ -1506,32 +1506,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 7345, + "id": 7336, "name": "dsGuardFactory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7267, + "referencedDeclaration": 7258, "src": "1186:14:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } }, - "id": 7346, + "id": 7337, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "newGuard", "nodeType": "MemberAccess", - "referencedDeclaration": 3194, + "referencedDeclaration": 3246, "src": "1186:23:30", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_DSGuard_$3215_$", "typeString": "function () external returns (contract DSGuard)" } }, - "id": 7347, + "id": 7338, "isConstant": false, "isLValue": false, "isPure": false, @@ -1541,7 +1541,7 @@ "nodeType": "FunctionCall", "src": "1186:25:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -1554,11 +1554,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7352, + "id": 7343, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7321, + "referencedDeclaration": 7312, "src": "1236:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -1575,32 +1575,32 @@ ], "expression": { "argumentTypes": null, - "id": 7349, + "id": 7340, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7344, + "referencedDeclaration": 7335, "src": "1221:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 7351, + "id": 7342, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "1221:14:30", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 7353, + "id": 7344, "isConstant": false, "isLValue": false, "isPure": false, @@ -1614,7 +1614,7 @@ "typeString": "tuple()" } }, - "id": 7354, + "id": 7345, "nodeType": "ExpressionStatement", "src": "1221:21:30" }, @@ -1624,14 +1624,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7359, + "id": 7350, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7344, + "referencedDeclaration": 7335, "src": "1309:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } @@ -1639,7 +1639,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } ], @@ -1648,11 +1648,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7356, + "id": 7347, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7321, + "referencedDeclaration": 7312, "src": "1289:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -1667,18 +1667,18 @@ "typeString": "address payable" } ], - "id": 7355, + "id": 7346, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1280:8:30", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 7357, + "id": 7348, "isConstant": false, "isLValue": false, "isPure": false, @@ -1688,25 +1688,25 @@ "nodeType": "FunctionCall", "src": "1280:15:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 7358, + "id": 7349, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setAuthority", "nodeType": "MemberAccess", - "referencedDeclaration": 2862, + "referencedDeclaration": 2914, "src": "1280:28:30", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$_t_contract$_DSAuthority_$2799_$returns$__$", + "typeIdentifier": "t_function_external_nonpayable$_t_contract$_DSAuthority_$2851_$returns$__$", "typeString": "function (contract DSAuthority) external" } }, - "id": 7360, + "id": 7351, "isConstant": false, "isLValue": false, "isPure": false, @@ -1720,7 +1720,7 @@ "typeString": "tuple()" } }, - "id": 7361, + "id": 7352, "nodeType": "ExpressionStatement", "src": "1280:35:30" }, @@ -1730,11 +1730,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7366, + "id": 7357, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7298, + "referencedDeclaration": 7289, "src": "1350:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1754,11 +1754,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7363, + "id": 7354, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7321, + "referencedDeclaration": 7312, "src": "1334:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -1773,18 +1773,18 @@ "typeString": "address payable" } ], - "id": 7362, + "id": 7353, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1325:8:30", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 7364, + "id": 7355, "isConstant": false, "isLValue": false, "isPure": false, @@ -1794,25 +1794,25 @@ "nodeType": "FunctionCall", "src": "1325:15:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 7365, + "id": 7356, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "1325:24:30", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 7367, + "id": 7358, "isConstant": false, "isLValue": false, "isPure": false, @@ -1826,14 +1826,14 @@ "typeString": "tuple()" } }, - "id": 7368, + "id": 7359, "nodeType": "ExpressionStatement", "src": "1325:31:30" }, { "expression": { "argumentTypes": null, - "id": 7373, + "id": 7364, "isConstant": false, "isLValue": false, "isPure": false, @@ -1842,25 +1842,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 7369, + "id": 7360, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7263, + "referencedDeclaration": 7254, "src": "1367:7:30", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 7371, + "id": 7362, "indexExpression": { "argumentTypes": null, - "id": 7370, + "id": 7361, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7298, + "referencedDeclaration": 7289, "src": "1375:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1882,11 +1882,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 7372, + "id": 7363, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7321, + "referencedDeclaration": 7312, "src": "1384:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -1899,48 +1899,48 @@ "typeString": "address" } }, - "id": 7374, + "id": 7365, "nodeType": "ExpressionStatement", "src": "1367:22:30" }, { "expression": { "argumentTypes": null, - "id": 7375, + "id": 7366, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7321, + "referencedDeclaration": 7312, "src": "1407:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "functionReturnParameters": 7302, - "id": 7376, + "functionReturnParameters": 7293, + "id": 7367, "nodeType": "Return", "src": "1400:12:30" } ] }, "documentation": null, - "id": 7378, + "id": 7369, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 7299, + "id": 7290, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7298, + "id": 7289, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 7378, + "scope": 7369, "src": "793:13:30", "stateVariable": false, "storageLocation": "default", @@ -1949,7 +1949,7 @@ "typeString": "address" }, "typeName": { - "id": 7297, + "id": 7288, "name": "address", "nodeType": "ElementaryTypeName", "src": "793:7:30", @@ -1966,15 +1966,15 @@ "src": "792:15:30" }, "returnParameters": { - "id": 7302, + "id": 7293, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7301, + "id": 7292, "name": "", "nodeType": "VariableDeclaration", - "scope": 7378, + "scope": 7369, "src": "824:15:30", "stateVariable": false, "storageLocation": "default", @@ -1983,7 +1983,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7300, + "id": 7291, "name": "address", "nodeType": "ElementaryTypeName", "src": "824:15:30", @@ -1999,7 +1999,7 @@ ], "src": "823:17:30" }, - "scope": 7490, + "scope": 7481, "src": "778:641:30", "stateMutability": "nonpayable", "superFunction": null, @@ -2007,7 +2007,7 @@ }, { "body": { - "id": 7394, + "id": 7385, "nodeType": "Block", "src": "1679:99:30", "statements": [ @@ -2019,18 +2019,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7388, + "id": 7379, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1717:3:30", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 7389, + "id": 7380, "isConstant": false, "isLValue": false, "isPure": false, @@ -2046,11 +2046,11 @@ }, { "argumentTypes": null, - "id": 7390, + "id": 7381, "name": "dedgeCompoundManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7380, + "referencedDeclaration": 7371, "src": "1729:20:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2059,11 +2059,11 @@ }, { "argumentTypes": null, - "id": 7391, + "id": 7382, "name": "enterMarketCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7382, + "referencedDeclaration": 7373, "src": "1751:19:30", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -2086,21 +2086,21 @@ "typeString": "bytes memory" } ], - "id": 7387, + "id": 7378, "name": "buildAndEnterMarkets", "nodeType": "Identifier", "overloadedDeclarations": [ - 7395, - 7489 + 7386, + 7480 ], - "referencedDeclaration": 7489, + "referencedDeclaration": 7480, "src": "1696:20:30", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_bytes_memory_ptr_$returns$_t_address_payable_$", "typeString": "function (address,address,bytes memory) returns (address payable)" } }, - "id": 7392, + "id": 7383, "isConstant": false, "isLValue": false, "isPure": false, @@ -2114,30 +2114,30 @@ "typeString": "address payable" } }, - "functionReturnParameters": 7386, - "id": 7393, + "functionReturnParameters": 7377, + "id": 7384, "nodeType": "Return", "src": "1689:82:30" } ] }, "documentation": null, - "id": 7395, + "id": 7386, "implemented": true, "kind": "function", "modifiers": [], "name": "buildAndEnterMarkets", "nodeType": "FunctionDefinition", "parameters": { - "id": 7383, + "id": 7374, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7380, + "id": 7371, "name": "dedgeCompoundManager", "nodeType": "VariableDeclaration", - "scope": 7395, + "scope": 7386, "src": "1569:28:30", "stateVariable": false, "storageLocation": "default", @@ -2146,7 +2146,7 @@ "typeString": "address" }, "typeName": { - "id": 7379, + "id": 7370, "name": "address", "nodeType": "ElementaryTypeName", "src": "1569:7:30", @@ -2161,10 +2161,10 @@ }, { "constant": false, - "id": 7382, + "id": 7373, "name": "enterMarketCalldata", "nodeType": "VariableDeclaration", - "scope": 7395, + "scope": 7386, "src": "1607:32:30", "stateVariable": false, "storageLocation": "memory", @@ -2173,7 +2173,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7381, + "id": 7372, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1607:5:30", @@ -2189,15 +2189,15 @@ "src": "1559:86:30" }, "returnParameters": { - "id": 7386, + "id": 7377, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7385, + "id": 7376, "name": "", "nodeType": "VariableDeclaration", - "scope": 7395, + "scope": 7386, "src": "1662:15:30", "stateVariable": false, "storageLocation": "default", @@ -2206,7 +2206,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7384, + "id": 7375, "name": "address", "nodeType": "ElementaryTypeName", "src": "1662:15:30", @@ -2222,7 +2222,7 @@ ], "src": "1661:17:30" }, - "scope": 7490, + "scope": 7481, "src": "1530:248:30", "stateMutability": "nonpayable", "superFunction": null, @@ -2230,7 +2230,7 @@ }, { "body": { - "id": 7488, + "id": 7479, "nodeType": "Block", "src": "1956:724:30", "statements": [ @@ -2241,7 +2241,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 7412, + "id": 7403, "isConstant": false, "isLValue": false, "isPure": false, @@ -2250,25 +2250,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 7406, + "id": 7397, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7263, + "referencedDeclaration": 7254, "src": "2036:7:30", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 7408, + "id": 7399, "indexExpression": { "argumentTypes": null, - "id": 7407, + "id": 7398, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7397, + "referencedDeclaration": 7388, "src": "2044:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2294,7 +2294,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 7410, + "id": 7401, "isConstant": false, "isLValue": false, "isPure": true, @@ -2317,7 +2317,7 @@ "typeString": "int_const 0" } ], - "id": 7409, + "id": 7400, "isConstant": false, "isLValue": false, "isPure": true, @@ -2330,7 +2330,7 @@ }, "typeName": "address" }, - "id": 7411, + "id": 7402, "isConstant": false, "isLValue": false, "isPure": true, @@ -2351,11 +2351,11 @@ } }, "falseBody": null, - "id": 7422, + "id": 7413, "nodeType": "IfStatement", "src": "2032:98:30", "trueBody": { - "id": 7421, + "id": 7412, "nodeType": "Block", "src": "2066:64:30", "statements": [ @@ -2370,25 +2370,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 7415, + "id": 7406, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7263, + "referencedDeclaration": 7254, "src": "2103:7:30", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 7417, + "id": 7408, "indexExpression": { "argumentTypes": null, - "id": 7416, + "id": 7407, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7397, + "referencedDeclaration": 7388, "src": "2111:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2414,7 +2414,7 @@ "typeString": "address" } ], - "id": 7414, + "id": 7405, "isConstant": false, "isLValue": false, "isPure": true, @@ -2427,7 +2427,7 @@ }, "typeName": "uint160" }, - "id": 7418, + "id": 7409, "isConstant": false, "isLValue": false, "isPure": false, @@ -2449,7 +2449,7 @@ "typeString": "uint160" } ], - "id": 7413, + "id": 7404, "isConstant": false, "isLValue": false, "isPure": true, @@ -2462,7 +2462,7 @@ }, "typeName": "address" }, - "id": 7419, + "id": 7410, "isConstant": false, "isLValue": false, "isPure": false, @@ -2476,8 +2476,8 @@ "typeString": "address payable" } }, - "functionReturnParameters": 7405, - "id": 7420, + "functionReturnParameters": 7396, + "id": 7411, "nodeType": "Return", "src": "2080:39:30" } @@ -2486,15 +2486,15 @@ }, { "assignments": [ - 7424 + 7415 ], "declarations": [ { "constant": false, - "id": 7424, + "id": 7415, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 7488, + "scope": 7479, "src": "2140:21:30", "stateVariable": false, "storageLocation": "default", @@ -2503,7 +2503,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7423, + "id": 7414, "name": "address", "nodeType": "ElementaryTypeName", "src": "2140:15:30", @@ -2517,7 +2517,7 @@ "visibility": "internal" } ], - "id": 7433, + "id": 7424, "initialValue": { "argumentTypes": null, "arguments": [ @@ -2529,14 +2529,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7429, + "id": 7420, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7265, + "referencedDeclaration": 7256, "src": "2193:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -2544,11 +2544,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 7428, + "id": 7419, "isConstant": false, "isLValue": false, "isPure": true, @@ -2561,7 +2561,7 @@ }, "typeName": "address" }, - "id": 7430, + "id": 7421, "isConstant": false, "isLValue": false, "isPure": false, @@ -2583,7 +2583,7 @@ "typeString": "address" } ], - "id": 7427, + "id": 7418, "isConstant": false, "isLValue": false, "isPure": false, @@ -2591,23 +2591,23 @@ "nodeType": "NewExpression", "src": "2172:12:30", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DACProxy_$7235_$", "typeString": "function (address) returns (contract DACProxy)" }, "typeName": { "contractScope": null, - "id": 7426, + "id": 7417, "name": "DACProxy", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "2176:8:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } } }, - "id": 7431, + "id": 7422, "isConstant": false, "isLValue": false, "isPure": false, @@ -2617,7 +2617,7 @@ "nodeType": "FunctionCall", "src": "2172:28:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } } @@ -2625,11 +2625,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } ], - "id": 7425, + "id": 7416, "isConstant": false, "isLValue": false, "isPure": true, @@ -2642,7 +2642,7 @@ }, "typeName": "address" }, - "id": 7432, + "id": 7423, "isConstant": false, "isLValue": false, "isPure": false, @@ -2667,18 +2667,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7435, + "id": 7426, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "2224:3:30", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 7436, + "id": 7427, "isConstant": false, "isLValue": false, "isPure": false, @@ -2694,11 +2694,11 @@ }, { "argumentTypes": null, - "id": 7437, + "id": 7428, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7397, + "referencedDeclaration": 7388, "src": "2236:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2710,11 +2710,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7439, + "id": 7430, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2251:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2729,7 +2729,7 @@ "typeString": "address payable" } ], - "id": 7438, + "id": 7429, "isConstant": false, "isLValue": false, "isPure": true, @@ -2742,7 +2742,7 @@ }, "typeName": "address" }, - "id": 7440, + "id": 7431, "isConstant": false, "isLValue": false, "isPure": false, @@ -2761,14 +2761,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7442, + "id": 7433, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7265, + "referencedDeclaration": 7256, "src": "2267:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -2776,11 +2776,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 7441, + "id": 7432, "isConstant": false, "isLValue": false, "isPure": true, @@ -2793,7 +2793,7 @@ }, "typeName": "address" }, - "id": 7443, + "id": 7434, "isConstant": false, "isLValue": false, "isPure": false, @@ -2827,18 +2827,18 @@ "typeString": "address" } ], - "id": 7434, + "id": 7425, "name": "Created", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7259, + "referencedDeclaration": 7250, "src": "2216:7:30", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_address_$returns$__$", "typeString": "function (address,address,address,address)" } }, - "id": 7444, + "id": 7435, "isConstant": false, "isLValue": false, "isPure": false, @@ -2852,37 +2852,37 @@ "typeString": "tuple()" } }, - "id": 7445, + "id": 7436, "nodeType": "EmitStatement", "src": "2211:63:30" }, { "assignments": [ - 7447 + 7438 ], "declarations": [ { "constant": false, - "id": 7447, + "id": 7438, "name": "guard", "nodeType": "VariableDeclaration", - "scope": 7488, + "scope": 7479, "src": "2285:13:30", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" }, "typeName": { "contractScope": null, - "id": 7446, + "id": 7437, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2285:7:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -2890,7 +2890,7 @@ "visibility": "internal" } ], - "id": 7451, + "id": 7442, "initialValue": { "argumentTypes": null, "arguments": [], @@ -2898,32 +2898,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 7448, + "id": 7439, "name": "dsGuardFactory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7267, + "referencedDeclaration": 7258, "src": "2301:14:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } }, - "id": 7449, + "id": 7440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "newGuard", "nodeType": "MemberAccess", - "referencedDeclaration": 3194, + "referencedDeclaration": 3246, "src": "2301:23:30", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_DSGuard_$3215_$", "typeString": "function () external returns (contract DSGuard)" } }, - "id": 7450, + "id": 7441, "isConstant": false, "isLValue": false, "isPure": false, @@ -2933,7 +2933,7 @@ "nodeType": "FunctionCall", "src": "2301:25:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -2946,11 +2946,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7455, + "id": 7446, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2351:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2967,32 +2967,32 @@ ], "expression": { "argumentTypes": null, - "id": 7452, + "id": 7443, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7447, + "referencedDeclaration": 7438, "src": "2336:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 7454, + "id": 7445, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "2336:14:30", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 7456, + "id": 7447, "isConstant": false, "isLValue": false, "isPure": false, @@ -3006,7 +3006,7 @@ "typeString": "tuple()" } }, - "id": 7457, + "id": 7448, "nodeType": "ExpressionStatement", "src": "2336:21:30" }, @@ -3016,11 +3016,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7462, + "id": 7453, "name": "dedgeCompoundManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7399, + "referencedDeclaration": 7390, "src": "2467:20:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3029,11 +3029,11 @@ }, { "argumentTypes": null, - "id": 7463, + "id": 7454, "name": "enterMarketCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7401, + "referencedDeclaration": 7392, "src": "2501:19:30", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3057,11 +3057,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7459, + "id": 7450, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2439:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3076,18 +3076,18 @@ "typeString": "address payable" } ], - "id": 7458, + "id": 7449, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "2430:8:30", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 7460, + "id": 7451, "isConstant": false, "isLValue": false, "isPure": false, @@ -3097,25 +3097,25 @@ "nodeType": "FunctionCall", "src": "2430:15:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 7461, + "id": 7452, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "execute", "nodeType": "MemberAccess", - "referencedDeclaration": 3630, + "referencedDeclaration": 3682, "src": "2430:23:30", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$", "typeString": "function (address,bytes memory) payable external returns (bytes memory)" } }, - "id": 7464, + "id": 7455, "isConstant": false, "isLValue": false, "isPure": false, @@ -3129,7 +3129,7 @@ "typeString": "bytes memory" } }, - "id": 7465, + "id": 7456, "nodeType": "ExpressionStatement", "src": "2430:100:30" }, @@ -3139,14 +3139,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7470, + "id": 7461, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7447, + "referencedDeclaration": 7438, "src": "2570:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } @@ -3154,7 +3154,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } ], @@ -3163,11 +3163,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7467, + "id": 7458, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2550:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3182,18 +3182,18 @@ "typeString": "address payable" } ], - "id": 7466, + "id": 7457, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "2541:8:30", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 7468, + "id": 7459, "isConstant": false, "isLValue": false, "isPure": false, @@ -3203,25 +3203,25 @@ "nodeType": "FunctionCall", "src": "2541:15:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 7469, + "id": 7460, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setAuthority", "nodeType": "MemberAccess", - "referencedDeclaration": 2862, + "referencedDeclaration": 2914, "src": "2541:28:30", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$_t_contract$_DSAuthority_$2799_$returns$__$", + "typeIdentifier": "t_function_external_nonpayable$_t_contract$_DSAuthority_$2851_$returns$__$", "typeString": "function (contract DSAuthority) external" } }, - "id": 7471, + "id": 7462, "isConstant": false, "isLValue": false, "isPure": false, @@ -3235,7 +3235,7 @@ "typeString": "tuple()" } }, - "id": 7472, + "id": 7463, "nodeType": "ExpressionStatement", "src": "2541:35:30" }, @@ -3245,11 +3245,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7477, + "id": 7468, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7397, + "referencedDeclaration": 7388, "src": "2611:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3269,11 +3269,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7474, + "id": 7465, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2595:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3288,18 +3288,18 @@ "typeString": "address payable" } ], - "id": 7473, + "id": 7464, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "2586:8:30", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 7475, + "id": 7466, "isConstant": false, "isLValue": false, "isPure": false, @@ -3309,25 +3309,25 @@ "nodeType": "FunctionCall", "src": "2586:15:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 7476, + "id": 7467, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "2586:24:30", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 7478, + "id": 7469, "isConstant": false, "isLValue": false, "isPure": false, @@ -3341,14 +3341,14 @@ "typeString": "tuple()" } }, - "id": 7479, + "id": 7470, "nodeType": "ExpressionStatement", "src": "2586:31:30" }, { "expression": { "argumentTypes": null, - "id": 7484, + "id": 7475, "isConstant": false, "isLValue": false, "isPure": false, @@ -3357,25 +3357,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 7480, + "id": 7471, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7263, + "referencedDeclaration": 7254, "src": "2628:7:30", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 7482, + "id": 7473, "indexExpression": { "argumentTypes": null, - "id": 7481, + "id": 7472, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7397, + "referencedDeclaration": 7388, "src": "2636:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3397,11 +3397,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 7483, + "id": 7474, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2645:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3414,48 +3414,48 @@ "typeString": "address" } }, - "id": 7485, + "id": 7476, "nodeType": "ExpressionStatement", "src": "2628:22:30" }, { "expression": { "argumentTypes": null, - "id": 7486, + "id": 7477, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2668:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "functionReturnParameters": 7405, - "id": 7487, + "functionReturnParameters": 7396, + "id": 7478, "nodeType": "Return", "src": "2661:12:30" } ] }, "documentation": null, - "id": 7489, + "id": 7480, "implemented": true, "kind": "function", "modifiers": [], "name": "buildAndEnterMarkets", "nodeType": "FunctionDefinition", "parameters": { - "id": 7402, + "id": 7393, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7397, + "id": 7388, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 7489, + "scope": 7480, "src": "1823:13:30", "stateVariable": false, "storageLocation": "default", @@ -3464,7 +3464,7 @@ "typeString": "address" }, "typeName": { - "id": 7396, + "id": 7387, "name": "address", "nodeType": "ElementaryTypeName", "src": "1823:7:30", @@ -3479,10 +3479,10 @@ }, { "constant": false, - "id": 7399, + "id": 7390, "name": "dedgeCompoundManager", "nodeType": "VariableDeclaration", - "scope": 7489, + "scope": 7480, "src": "1846:28:30", "stateVariable": false, "storageLocation": "default", @@ -3491,7 +3491,7 @@ "typeString": "address" }, "typeName": { - "id": 7398, + "id": 7389, "name": "address", "nodeType": "ElementaryTypeName", "src": "1846:7:30", @@ -3506,10 +3506,10 @@ }, { "constant": false, - "id": 7401, + "id": 7392, "name": "enterMarketCalldata", "nodeType": "VariableDeclaration", - "scope": 7489, + "scope": 7480, "src": "1884:32:30", "stateVariable": false, "storageLocation": "memory", @@ -3518,7 +3518,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7400, + "id": 7391, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1884:5:30", @@ -3534,15 +3534,15 @@ "src": "1813:109:30" }, "returnParameters": { - "id": 7405, + "id": 7396, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7404, + "id": 7395, "name": "", "nodeType": "VariableDeclaration", - "scope": 7489, + "scope": 7480, "src": "1939:15:30", "stateVariable": false, "storageLocation": "default", @@ -3551,7 +3551,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7403, + "id": 7394, "name": "address", "nodeType": "ElementaryTypeName", "src": "1939:15:30", @@ -3567,14 +3567,14 @@ ], "src": "1938:17:30" }, - "scope": 7490, + "scope": 7481, "src": "1784:896:30", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 7491, + "scope": 7482, "src": "138:2544:30" } ], @@ -3584,14 +3584,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxyFactory.sol", "exportedSymbols": { "DACProxyFactory": [ - 7490 + 7481 ] }, - "id": 7491, + "id": 7482, "nodeType": "SourceUnit", "nodes": [ { - "id": 7246, + "id": 7237, "literals": [ "solidity", "0.5", @@ -3603,10 +3603,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol", "file": "./DACProxy.sol", - "id": 7247, + "id": 7238, "nodeType": "ImportDirective", - "scope": 7491, - "sourceUnit": 7245, + "scope": 7482, + "sourceUnit": 7236, "src": "25:24:30", "symbolAliases": [], "unitAlias": "" @@ -3614,10 +3614,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "file": "../lib/dapphub/Guard.sol", - "id": 7248, + "id": 7239, "nodeType": "ImportDirective", - "scope": 7491, - "sourceUnit": 3196, + "scope": 7482, + "sourceUnit": 3248, "src": "51:34:30", "symbolAliases": [], "unitAlias": "" @@ -3625,10 +3625,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", "file": "../interfaces/compound/IComptroller.sol", - "id": 7249, + "id": 7240, "nodeType": "ImportDirective", - "scope": 7491, - "sourceUnit": 1097, + "scope": 7482, + "sourceUnit": 1123, "src": "87:49:30", "symbolAliases": [], "unitAlias": "" @@ -3636,16 +3636,16 @@ { "baseContracts": [], "contractDependencies": [ - 3195, - 3788, - 7244 + 3247, + 3840, + 7235 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 7490, + "id": 7481, "linearizedBaseContracts": [ - 7490 + 7481 ], "name": "DACProxyFactory", "nodeType": "ContractDefinition", @@ -3653,20 +3653,20 @@ { "anonymous": false, "documentation": null, - "id": 7259, + "id": 7250, "name": "Created", "nodeType": "EventDefinition", "parameters": { - "id": 7258, + "id": 7249, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7251, + "id": 7242, "indexed": true, "name": "sender", "nodeType": "VariableDeclaration", - "scope": 7259, + "scope": 7250, "src": "183:22:30", "stateVariable": false, "storageLocation": "default", @@ -3675,7 +3675,7 @@ "typeString": "address" }, "typeName": { - "id": 7250, + "id": 7241, "name": "address", "nodeType": "ElementaryTypeName", "src": "183:7:30", @@ -3690,11 +3690,11 @@ }, { "constant": false, - "id": 7253, + "id": 7244, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 7259, + "scope": 7250, "src": "207:21:30", "stateVariable": false, "storageLocation": "default", @@ -3703,7 +3703,7 @@ "typeString": "address" }, "typeName": { - "id": 7252, + "id": 7243, "name": "address", "nodeType": "ElementaryTypeName", "src": "207:7:30", @@ -3718,11 +3718,11 @@ }, { "constant": false, - "id": 7255, + "id": 7246, "indexed": false, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 7259, + "scope": 7250, "src": "230:13:30", "stateVariable": false, "storageLocation": "default", @@ -3731,7 +3731,7 @@ "typeString": "address" }, "typeName": { - "id": 7254, + "id": 7245, "name": "address", "nodeType": "ElementaryTypeName", "src": "230:7:30", @@ -3746,11 +3746,11 @@ }, { "constant": false, - "id": 7257, + "id": 7248, "indexed": false, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 7259, + "scope": 7250, "src": "245:13:30", "stateVariable": false, "storageLocation": "default", @@ -3759,7 +3759,7 @@ "typeString": "address" }, "typeName": { - "id": 7256, + "id": 7247, "name": "address", "nodeType": "ElementaryTypeName", "src": "245:7:30", @@ -3779,10 +3779,10 @@ }, { "constant": false, - "id": 7263, + "id": 7254, "name": "proxies", "nodeType": "VariableDeclaration", - "scope": 7490, + "scope": 7481, "src": "266:40:30", "stateVariable": true, "storageLocation": "default", @@ -3791,9 +3791,9 @@ "typeString": "mapping(address => address)" }, "typeName": { - "id": 7262, + "id": 7253, "keyType": { - "id": 7260, + "id": 7251, "name": "address", "nodeType": "ElementaryTypeName", "src": "274:7:30", @@ -3809,7 +3809,7 @@ "typeString": "mapping(address => address)" }, "valueType": { - "id": 7261, + "id": 7252, "name": "address", "nodeType": "ElementaryTypeName", "src": "283:7:30", @@ -3825,26 +3825,26 @@ }, { "constant": false, - "id": 7265, + "id": 7256, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 7490, + "scope": 7481, "src": "313:25:30", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 7264, + "id": 7255, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "313:12:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -3853,26 +3853,26 @@ }, { "constant": false, - "id": 7267, + "id": 7258, "name": "dsGuardFactory", "nodeType": "VariableDeclaration", - "scope": 7490, + "scope": 7481, "src": "344:36:30", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" }, "typeName": { "contractScope": null, - "id": 7266, + "id": 7257, "name": "DSGuardFactory", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3195, + "referencedDeclaration": 3247, "src": "344:14:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } }, @@ -3881,28 +3881,28 @@ }, { "body": { - "id": 7282, + "id": 7273, "nodeType": "Block", "src": "408:90:30", "statements": [ { "expression": { "argumentTypes": null, - "id": 7274, + "id": 7265, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 7270, + "id": 7261, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7265, + "referencedDeclaration": 7256, "src": "418:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -3913,7 +3913,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 7272, + "id": 7263, "isConstant": false, "isLValue": false, "isPure": false, @@ -3921,23 +3921,23 @@ "nodeType": "NewExpression", "src": "426:16:30", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3840_$", "typeString": "function () returns (contract DSProxyCache)" }, "typeName": { "contractScope": null, - "id": 7271, + "id": 7262, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "430:12:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } }, - "id": 7273, + "id": 7264, "isConstant": false, "isLValue": false, "isPure": false, @@ -3947,38 +3947,38 @@ "nodeType": "FunctionCall", "src": "426:18:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "418:26:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 7275, + "id": 7266, "nodeType": "ExpressionStatement", "src": "418:26:30" }, { "expression": { "argumentTypes": null, - "id": 7280, + "id": 7271, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 7276, + "id": 7267, "name": "dsGuardFactory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7267, + "referencedDeclaration": 7258, "src": "454:14:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } }, @@ -3989,7 +3989,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 7278, + "id": 7269, "isConstant": false, "isLValue": false, "isPure": false, @@ -3997,23 +3997,23 @@ "nodeType": "NewExpression", "src": "471:18:30", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuardFactory_$3195_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuardFactory_$3247_$", "typeString": "function () returns (contract DSGuardFactory)" }, "typeName": { "contractScope": null, - "id": 7277, + "id": 7268, "name": "DSGuardFactory", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3195, + "referencedDeclaration": 3247, "src": "475:14:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } } }, - "id": 7279, + "id": 7270, "isConstant": false, "isLValue": false, "isPure": false, @@ -4023,42 +4023,42 @@ "nodeType": "FunctionCall", "src": "471:20:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } }, "src": "454:37:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } }, - "id": 7281, + "id": 7272, "nodeType": "ExpressionStatement", "src": "454:37:30" } ] }, "documentation": null, - "id": 7283, + "id": 7274, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 7268, + "id": 7259, "nodeType": "ParameterList", "parameters": [], "src": "398:2:30" }, "returnParameters": { - "id": 7269, + "id": 7260, "nodeType": "ParameterList", "parameters": [], "src": "408:0:30" }, - "scope": 7490, + "scope": 7481, "src": "387:111:30", "stateMutability": "nonpayable", "superFunction": null, @@ -4066,25 +4066,25 @@ }, { "body": { - "id": 7295, + "id": 7286, "nodeType": "Block", "src": "633:42:30", "statements": [ { "expression": { "argumentTypes": null, - "id": 7293, + "id": 7284, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 7288, + "id": 7279, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7286, + "referencedDeclaration": 7277, "src": "643:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -4100,18 +4100,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7290, + "id": 7281, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "657:3:30", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 7291, + "id": 7282, "isConstant": false, "isLValue": false, "isPure": false, @@ -4133,21 +4133,21 @@ "typeString": "address payable" } ], - "id": 7289, + "id": 7280, "name": "build", "nodeType": "Identifier", "overloadedDeclarations": [ - 7296, - 7378 + 7287, + 7369 ], - "referencedDeclaration": 7378, + "referencedDeclaration": 7369, "src": "651:5:30", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_address_payable_$", "typeString": "function (address) returns (address payable)" } }, - "id": 7292, + "id": 7283, "isConstant": false, "isLValue": false, "isPure": false, @@ -4167,35 +4167,35 @@ "typeString": "address payable" } }, - "id": 7294, + "id": 7285, "nodeType": "ExpressionStatement", "src": "643:25:30" } ] }, "documentation": null, - "id": 7296, + "id": 7287, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 7284, + "id": 7275, "nodeType": "ParameterList", "parameters": [], "src": "591:2:30" }, "returnParameters": { - "id": 7287, + "id": 7278, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7286, + "id": 7277, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 7296, + "scope": 7287, "src": "610:21:30", "stateVariable": false, "storageLocation": "default", @@ -4204,7 +4204,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7285, + "id": 7276, "name": "address", "nodeType": "ElementaryTypeName", "src": "610:15:30", @@ -4220,7 +4220,7 @@ ], "src": "609:23:30" }, - "scope": 7490, + "scope": 7481, "src": "577:98:30", "stateMutability": "nonpayable", "superFunction": null, @@ -4228,7 +4228,7 @@ }, { "body": { - "id": 7377, + "id": 7368, "nodeType": "Block", "src": "841:578:30", "statements": [ @@ -4239,7 +4239,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 7309, + "id": 7300, "isConstant": false, "isLValue": false, "isPure": false, @@ -4248,25 +4248,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 7303, + "id": 7294, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7263, + "referencedDeclaration": 7254, "src": "921:7:30", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 7305, + "id": 7296, "indexExpression": { "argumentTypes": null, - "id": 7304, + "id": 7295, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7298, + "referencedDeclaration": 7289, "src": "929:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4292,7 +4292,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 7307, + "id": 7298, "isConstant": false, "isLValue": false, "isPure": true, @@ -4315,7 +4315,7 @@ "typeString": "int_const 0" } ], - "id": 7306, + "id": 7297, "isConstant": false, "isLValue": false, "isPure": true, @@ -4328,7 +4328,7 @@ }, "typeName": "address" }, - "id": 7308, + "id": 7299, "isConstant": false, "isLValue": false, "isPure": true, @@ -4349,11 +4349,11 @@ } }, "falseBody": null, - "id": 7319, + "id": 7310, "nodeType": "IfStatement", "src": "917:98:30", "trueBody": { - "id": 7318, + "id": 7309, "nodeType": "Block", "src": "951:64:30", "statements": [ @@ -4368,25 +4368,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 7312, + "id": 7303, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7263, + "referencedDeclaration": 7254, "src": "988:7:30", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 7314, + "id": 7305, "indexExpression": { "argumentTypes": null, - "id": 7313, + "id": 7304, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7298, + "referencedDeclaration": 7289, "src": "996:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4412,7 +4412,7 @@ "typeString": "address" } ], - "id": 7311, + "id": 7302, "isConstant": false, "isLValue": false, "isPure": true, @@ -4425,7 +4425,7 @@ }, "typeName": "uint160" }, - "id": 7315, + "id": 7306, "isConstant": false, "isLValue": false, "isPure": false, @@ -4447,7 +4447,7 @@ "typeString": "uint160" } ], - "id": 7310, + "id": 7301, "isConstant": false, "isLValue": false, "isPure": true, @@ -4460,7 +4460,7 @@ }, "typeName": "address" }, - "id": 7316, + "id": 7307, "isConstant": false, "isLValue": false, "isPure": false, @@ -4474,8 +4474,8 @@ "typeString": "address payable" } }, - "functionReturnParameters": 7302, - "id": 7317, + "functionReturnParameters": 7293, + "id": 7308, "nodeType": "Return", "src": "965:39:30" } @@ -4484,15 +4484,15 @@ }, { "assignments": [ - 7321 + 7312 ], "declarations": [ { "constant": false, - "id": 7321, + "id": 7312, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 7377, + "scope": 7368, "src": "1025:21:30", "stateVariable": false, "storageLocation": "default", @@ -4501,7 +4501,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7320, + "id": 7311, "name": "address", "nodeType": "ElementaryTypeName", "src": "1025:15:30", @@ -4515,7 +4515,7 @@ "visibility": "internal" } ], - "id": 7330, + "id": 7321, "initialValue": { "argumentTypes": null, "arguments": [ @@ -4527,14 +4527,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7326, + "id": 7317, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7265, + "referencedDeclaration": 7256, "src": "1078:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -4542,11 +4542,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 7325, + "id": 7316, "isConstant": false, "isLValue": false, "isPure": true, @@ -4559,7 +4559,7 @@ }, "typeName": "address" }, - "id": 7327, + "id": 7318, "isConstant": false, "isLValue": false, "isPure": false, @@ -4581,7 +4581,7 @@ "typeString": "address" } ], - "id": 7324, + "id": 7315, "isConstant": false, "isLValue": false, "isPure": false, @@ -4589,23 +4589,23 @@ "nodeType": "NewExpression", "src": "1057:12:30", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DACProxy_$7235_$", "typeString": "function (address) returns (contract DACProxy)" }, "typeName": { "contractScope": null, - "id": 7323, + "id": 7314, "name": "DACProxy", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1061:8:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } } }, - "id": 7328, + "id": 7319, "isConstant": false, "isLValue": false, "isPure": false, @@ -4615,7 +4615,7 @@ "nodeType": "FunctionCall", "src": "1057:28:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } } @@ -4623,11 +4623,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } ], - "id": 7322, + "id": 7313, "isConstant": false, "isLValue": false, "isPure": true, @@ -4640,7 +4640,7 @@ }, "typeName": "address" }, - "id": 7329, + "id": 7320, "isConstant": false, "isLValue": false, "isPure": false, @@ -4665,18 +4665,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7332, + "id": 7323, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1109:3:30", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 7333, + "id": 7324, "isConstant": false, "isLValue": false, "isPure": false, @@ -4692,11 +4692,11 @@ }, { "argumentTypes": null, - "id": 7334, + "id": 7325, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7298, + "referencedDeclaration": 7289, "src": "1121:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4708,11 +4708,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7336, + "id": 7327, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7321, + "referencedDeclaration": 7312, "src": "1136:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -4727,7 +4727,7 @@ "typeString": "address payable" } ], - "id": 7335, + "id": 7326, "isConstant": false, "isLValue": false, "isPure": true, @@ -4740,7 +4740,7 @@ }, "typeName": "address" }, - "id": 7337, + "id": 7328, "isConstant": false, "isLValue": false, "isPure": false, @@ -4759,14 +4759,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7339, + "id": 7330, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7265, + "referencedDeclaration": 7256, "src": "1152:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -4774,11 +4774,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 7338, + "id": 7329, "isConstant": false, "isLValue": false, "isPure": true, @@ -4791,7 +4791,7 @@ }, "typeName": "address" }, - "id": 7340, + "id": 7331, "isConstant": false, "isLValue": false, "isPure": false, @@ -4825,18 +4825,18 @@ "typeString": "address" } ], - "id": 7331, + "id": 7322, "name": "Created", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7259, + "referencedDeclaration": 7250, "src": "1101:7:30", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_address_$returns$__$", "typeString": "function (address,address,address,address)" } }, - "id": 7341, + "id": 7332, "isConstant": false, "isLValue": false, "isPure": false, @@ -4850,37 +4850,37 @@ "typeString": "tuple()" } }, - "id": 7342, + "id": 7333, "nodeType": "EmitStatement", "src": "1096:63:30" }, { "assignments": [ - 7344 + 7335 ], "declarations": [ { "constant": false, - "id": 7344, + "id": 7335, "name": "guard", "nodeType": "VariableDeclaration", - "scope": 7377, + "scope": 7368, "src": "1170:13:30", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" }, "typeName": { "contractScope": null, - "id": 7343, + "id": 7334, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1170:7:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -4888,7 +4888,7 @@ "visibility": "internal" } ], - "id": 7348, + "id": 7339, "initialValue": { "argumentTypes": null, "arguments": [], @@ -4896,32 +4896,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 7345, + "id": 7336, "name": "dsGuardFactory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7267, + "referencedDeclaration": 7258, "src": "1186:14:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } }, - "id": 7346, + "id": 7337, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "newGuard", "nodeType": "MemberAccess", - "referencedDeclaration": 3194, + "referencedDeclaration": 3246, "src": "1186:23:30", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_DSGuard_$3215_$", "typeString": "function () external returns (contract DSGuard)" } }, - "id": 7347, + "id": 7338, "isConstant": false, "isLValue": false, "isPure": false, @@ -4931,7 +4931,7 @@ "nodeType": "FunctionCall", "src": "1186:25:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -4944,11 +4944,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7352, + "id": 7343, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7321, + "referencedDeclaration": 7312, "src": "1236:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -4965,32 +4965,32 @@ ], "expression": { "argumentTypes": null, - "id": 7349, + "id": 7340, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7344, + "referencedDeclaration": 7335, "src": "1221:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 7351, + "id": 7342, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "1221:14:30", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 7353, + "id": 7344, "isConstant": false, "isLValue": false, "isPure": false, @@ -5004,7 +5004,7 @@ "typeString": "tuple()" } }, - "id": 7354, + "id": 7345, "nodeType": "ExpressionStatement", "src": "1221:21:30" }, @@ -5014,14 +5014,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7359, + "id": 7350, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7344, + "referencedDeclaration": 7335, "src": "1309:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } @@ -5029,7 +5029,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } ], @@ -5038,11 +5038,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7356, + "id": 7347, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7321, + "referencedDeclaration": 7312, "src": "1289:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5057,18 +5057,18 @@ "typeString": "address payable" } ], - "id": 7355, + "id": 7346, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1280:8:30", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 7357, + "id": 7348, "isConstant": false, "isLValue": false, "isPure": false, @@ -5078,25 +5078,25 @@ "nodeType": "FunctionCall", "src": "1280:15:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 7358, + "id": 7349, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setAuthority", "nodeType": "MemberAccess", - "referencedDeclaration": 2862, + "referencedDeclaration": 2914, "src": "1280:28:30", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$_t_contract$_DSAuthority_$2799_$returns$__$", + "typeIdentifier": "t_function_external_nonpayable$_t_contract$_DSAuthority_$2851_$returns$__$", "typeString": "function (contract DSAuthority) external" } }, - "id": 7360, + "id": 7351, "isConstant": false, "isLValue": false, "isPure": false, @@ -5110,7 +5110,7 @@ "typeString": "tuple()" } }, - "id": 7361, + "id": 7352, "nodeType": "ExpressionStatement", "src": "1280:35:30" }, @@ -5120,11 +5120,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7366, + "id": 7357, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7298, + "referencedDeclaration": 7289, "src": "1350:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5144,11 +5144,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7363, + "id": 7354, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7321, + "referencedDeclaration": 7312, "src": "1334:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5163,18 +5163,18 @@ "typeString": "address payable" } ], - "id": 7362, + "id": 7353, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1325:8:30", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 7364, + "id": 7355, "isConstant": false, "isLValue": false, "isPure": false, @@ -5184,25 +5184,25 @@ "nodeType": "FunctionCall", "src": "1325:15:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 7365, + "id": 7356, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "1325:24:30", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 7367, + "id": 7358, "isConstant": false, "isLValue": false, "isPure": false, @@ -5216,14 +5216,14 @@ "typeString": "tuple()" } }, - "id": 7368, + "id": 7359, "nodeType": "ExpressionStatement", "src": "1325:31:30" }, { "expression": { "argumentTypes": null, - "id": 7373, + "id": 7364, "isConstant": false, "isLValue": false, "isPure": false, @@ -5232,25 +5232,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 7369, + "id": 7360, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7263, + "referencedDeclaration": 7254, "src": "1367:7:30", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 7371, + "id": 7362, "indexExpression": { "argumentTypes": null, - "id": 7370, + "id": 7361, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7298, + "referencedDeclaration": 7289, "src": "1375:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5272,11 +5272,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 7372, + "id": 7363, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7321, + "referencedDeclaration": 7312, "src": "1384:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5289,48 +5289,48 @@ "typeString": "address" } }, - "id": 7374, + "id": 7365, "nodeType": "ExpressionStatement", "src": "1367:22:30" }, { "expression": { "argumentTypes": null, - "id": 7375, + "id": 7366, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7321, + "referencedDeclaration": 7312, "src": "1407:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "functionReturnParameters": 7302, - "id": 7376, + "functionReturnParameters": 7293, + "id": 7367, "nodeType": "Return", "src": "1400:12:30" } ] }, "documentation": null, - "id": 7378, + "id": 7369, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 7299, + "id": 7290, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7298, + "id": 7289, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 7378, + "scope": 7369, "src": "793:13:30", "stateVariable": false, "storageLocation": "default", @@ -5339,7 +5339,7 @@ "typeString": "address" }, "typeName": { - "id": 7297, + "id": 7288, "name": "address", "nodeType": "ElementaryTypeName", "src": "793:7:30", @@ -5356,15 +5356,15 @@ "src": "792:15:30" }, "returnParameters": { - "id": 7302, + "id": 7293, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7301, + "id": 7292, "name": "", "nodeType": "VariableDeclaration", - "scope": 7378, + "scope": 7369, "src": "824:15:30", "stateVariable": false, "storageLocation": "default", @@ -5373,7 +5373,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7300, + "id": 7291, "name": "address", "nodeType": "ElementaryTypeName", "src": "824:15:30", @@ -5389,7 +5389,7 @@ ], "src": "823:17:30" }, - "scope": 7490, + "scope": 7481, "src": "778:641:30", "stateMutability": "nonpayable", "superFunction": null, @@ -5397,7 +5397,7 @@ }, { "body": { - "id": 7394, + "id": 7385, "nodeType": "Block", "src": "1679:99:30", "statements": [ @@ -5409,18 +5409,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7388, + "id": 7379, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1717:3:30", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 7389, + "id": 7380, "isConstant": false, "isLValue": false, "isPure": false, @@ -5436,11 +5436,11 @@ }, { "argumentTypes": null, - "id": 7390, + "id": 7381, "name": "dedgeCompoundManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7380, + "referencedDeclaration": 7371, "src": "1729:20:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5449,11 +5449,11 @@ }, { "argumentTypes": null, - "id": 7391, + "id": 7382, "name": "enterMarketCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7382, + "referencedDeclaration": 7373, "src": "1751:19:30", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -5476,21 +5476,21 @@ "typeString": "bytes memory" } ], - "id": 7387, + "id": 7378, "name": "buildAndEnterMarkets", "nodeType": "Identifier", "overloadedDeclarations": [ - 7395, - 7489 + 7386, + 7480 ], - "referencedDeclaration": 7489, + "referencedDeclaration": 7480, "src": "1696:20:30", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_bytes_memory_ptr_$returns$_t_address_payable_$", "typeString": "function (address,address,bytes memory) returns (address payable)" } }, - "id": 7392, + "id": 7383, "isConstant": false, "isLValue": false, "isPure": false, @@ -5504,30 +5504,30 @@ "typeString": "address payable" } }, - "functionReturnParameters": 7386, - "id": 7393, + "functionReturnParameters": 7377, + "id": 7384, "nodeType": "Return", "src": "1689:82:30" } ] }, "documentation": null, - "id": 7395, + "id": 7386, "implemented": true, "kind": "function", "modifiers": [], "name": "buildAndEnterMarkets", "nodeType": "FunctionDefinition", "parameters": { - "id": 7383, + "id": 7374, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7380, + "id": 7371, "name": "dedgeCompoundManager", "nodeType": "VariableDeclaration", - "scope": 7395, + "scope": 7386, "src": "1569:28:30", "stateVariable": false, "storageLocation": "default", @@ -5536,7 +5536,7 @@ "typeString": "address" }, "typeName": { - "id": 7379, + "id": 7370, "name": "address", "nodeType": "ElementaryTypeName", "src": "1569:7:30", @@ -5551,10 +5551,10 @@ }, { "constant": false, - "id": 7382, + "id": 7373, "name": "enterMarketCalldata", "nodeType": "VariableDeclaration", - "scope": 7395, + "scope": 7386, "src": "1607:32:30", "stateVariable": false, "storageLocation": "memory", @@ -5563,7 +5563,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7381, + "id": 7372, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1607:5:30", @@ -5579,15 +5579,15 @@ "src": "1559:86:30" }, "returnParameters": { - "id": 7386, + "id": 7377, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7385, + "id": 7376, "name": "", "nodeType": "VariableDeclaration", - "scope": 7395, + "scope": 7386, "src": "1662:15:30", "stateVariable": false, "storageLocation": "default", @@ -5596,7 +5596,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7384, + "id": 7375, "name": "address", "nodeType": "ElementaryTypeName", "src": "1662:15:30", @@ -5612,7 +5612,7 @@ ], "src": "1661:17:30" }, - "scope": 7490, + "scope": 7481, "src": "1530:248:30", "stateMutability": "nonpayable", "superFunction": null, @@ -5620,7 +5620,7 @@ }, { "body": { - "id": 7488, + "id": 7479, "nodeType": "Block", "src": "1956:724:30", "statements": [ @@ -5631,7 +5631,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 7412, + "id": 7403, "isConstant": false, "isLValue": false, "isPure": false, @@ -5640,25 +5640,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 7406, + "id": 7397, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7263, + "referencedDeclaration": 7254, "src": "2036:7:30", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 7408, + "id": 7399, "indexExpression": { "argumentTypes": null, - "id": 7407, + "id": 7398, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7397, + "referencedDeclaration": 7388, "src": "2044:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5684,7 +5684,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 7410, + "id": 7401, "isConstant": false, "isLValue": false, "isPure": true, @@ -5707,7 +5707,7 @@ "typeString": "int_const 0" } ], - "id": 7409, + "id": 7400, "isConstant": false, "isLValue": false, "isPure": true, @@ -5720,7 +5720,7 @@ }, "typeName": "address" }, - "id": 7411, + "id": 7402, "isConstant": false, "isLValue": false, "isPure": true, @@ -5741,11 +5741,11 @@ } }, "falseBody": null, - "id": 7422, + "id": 7413, "nodeType": "IfStatement", "src": "2032:98:30", "trueBody": { - "id": 7421, + "id": 7412, "nodeType": "Block", "src": "2066:64:30", "statements": [ @@ -5760,25 +5760,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 7415, + "id": 7406, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7263, + "referencedDeclaration": 7254, "src": "2103:7:30", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 7417, + "id": 7408, "indexExpression": { "argumentTypes": null, - "id": 7416, + "id": 7407, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7397, + "referencedDeclaration": 7388, "src": "2111:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5804,7 +5804,7 @@ "typeString": "address" } ], - "id": 7414, + "id": 7405, "isConstant": false, "isLValue": false, "isPure": true, @@ -5817,7 +5817,7 @@ }, "typeName": "uint160" }, - "id": 7418, + "id": 7409, "isConstant": false, "isLValue": false, "isPure": false, @@ -5839,7 +5839,7 @@ "typeString": "uint160" } ], - "id": 7413, + "id": 7404, "isConstant": false, "isLValue": false, "isPure": true, @@ -5852,7 +5852,7 @@ }, "typeName": "address" }, - "id": 7419, + "id": 7410, "isConstant": false, "isLValue": false, "isPure": false, @@ -5866,8 +5866,8 @@ "typeString": "address payable" } }, - "functionReturnParameters": 7405, - "id": 7420, + "functionReturnParameters": 7396, + "id": 7411, "nodeType": "Return", "src": "2080:39:30" } @@ -5876,15 +5876,15 @@ }, { "assignments": [ - 7424 + 7415 ], "declarations": [ { "constant": false, - "id": 7424, + "id": 7415, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 7488, + "scope": 7479, "src": "2140:21:30", "stateVariable": false, "storageLocation": "default", @@ -5893,7 +5893,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7423, + "id": 7414, "name": "address", "nodeType": "ElementaryTypeName", "src": "2140:15:30", @@ -5907,7 +5907,7 @@ "visibility": "internal" } ], - "id": 7433, + "id": 7424, "initialValue": { "argumentTypes": null, "arguments": [ @@ -5919,14 +5919,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7429, + "id": 7420, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7265, + "referencedDeclaration": 7256, "src": "2193:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -5934,11 +5934,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 7428, + "id": 7419, "isConstant": false, "isLValue": false, "isPure": true, @@ -5951,7 +5951,7 @@ }, "typeName": "address" }, - "id": 7430, + "id": 7421, "isConstant": false, "isLValue": false, "isPure": false, @@ -5973,7 +5973,7 @@ "typeString": "address" } ], - "id": 7427, + "id": 7418, "isConstant": false, "isLValue": false, "isPure": false, @@ -5981,23 +5981,23 @@ "nodeType": "NewExpression", "src": "2172:12:30", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DACProxy_$7235_$", "typeString": "function (address) returns (contract DACProxy)" }, "typeName": { "contractScope": null, - "id": 7426, + "id": 7417, "name": "DACProxy", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "2176:8:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } } }, - "id": 7431, + "id": 7422, "isConstant": false, "isLValue": false, "isPure": false, @@ -6007,7 +6007,7 @@ "nodeType": "FunctionCall", "src": "2172:28:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } } @@ -6015,11 +6015,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } ], - "id": 7425, + "id": 7416, "isConstant": false, "isLValue": false, "isPure": true, @@ -6032,7 +6032,7 @@ }, "typeName": "address" }, - "id": 7432, + "id": 7423, "isConstant": false, "isLValue": false, "isPure": false, @@ -6057,18 +6057,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 7435, + "id": 7426, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "2224:3:30", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 7436, + "id": 7427, "isConstant": false, "isLValue": false, "isPure": false, @@ -6084,11 +6084,11 @@ }, { "argumentTypes": null, - "id": 7437, + "id": 7428, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7397, + "referencedDeclaration": 7388, "src": "2236:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6100,11 +6100,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7439, + "id": 7430, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2251:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -6119,7 +6119,7 @@ "typeString": "address payable" } ], - "id": 7438, + "id": 7429, "isConstant": false, "isLValue": false, "isPure": true, @@ -6132,7 +6132,7 @@ }, "typeName": "address" }, - "id": 7440, + "id": 7431, "isConstant": false, "isLValue": false, "isPure": false, @@ -6151,14 +6151,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7442, + "id": 7433, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7265, + "referencedDeclaration": 7256, "src": "2267:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -6166,11 +6166,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 7441, + "id": 7432, "isConstant": false, "isLValue": false, "isPure": true, @@ -6183,7 +6183,7 @@ }, "typeName": "address" }, - "id": 7443, + "id": 7434, "isConstant": false, "isLValue": false, "isPure": false, @@ -6217,18 +6217,18 @@ "typeString": "address" } ], - "id": 7434, + "id": 7425, "name": "Created", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7259, + "referencedDeclaration": 7250, "src": "2216:7:30", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_address_$returns$__$", "typeString": "function (address,address,address,address)" } }, - "id": 7444, + "id": 7435, "isConstant": false, "isLValue": false, "isPure": false, @@ -6242,37 +6242,37 @@ "typeString": "tuple()" } }, - "id": 7445, + "id": 7436, "nodeType": "EmitStatement", "src": "2211:63:30" }, { "assignments": [ - 7447 + 7438 ], "declarations": [ { "constant": false, - "id": 7447, + "id": 7438, "name": "guard", "nodeType": "VariableDeclaration", - "scope": 7488, + "scope": 7479, "src": "2285:13:30", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" }, "typeName": { "contractScope": null, - "id": 7446, + "id": 7437, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2285:7:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -6280,7 +6280,7 @@ "visibility": "internal" } ], - "id": 7451, + "id": 7442, "initialValue": { "argumentTypes": null, "arguments": [], @@ -6288,32 +6288,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 7448, + "id": 7439, "name": "dsGuardFactory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7267, + "referencedDeclaration": 7258, "src": "2301:14:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardFactory_$3195", + "typeIdentifier": "t_contract$_DSGuardFactory_$3247", "typeString": "contract DSGuardFactory" } }, - "id": 7449, + "id": 7440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "newGuard", "nodeType": "MemberAccess", - "referencedDeclaration": 3194, + "referencedDeclaration": 3246, "src": "2301:23:30", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_DSGuard_$3215_$", "typeString": "function () external returns (contract DSGuard)" } }, - "id": 7450, + "id": 7441, "isConstant": false, "isLValue": false, "isPure": false, @@ -6323,7 +6323,7 @@ "nodeType": "FunctionCall", "src": "2301:25:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -6336,11 +6336,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7455, + "id": 7446, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2351:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -6357,32 +6357,32 @@ ], "expression": { "argumentTypes": null, - "id": 7452, + "id": 7443, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7447, + "referencedDeclaration": 7438, "src": "2336:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 7454, + "id": 7445, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "2336:14:30", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 7456, + "id": 7447, "isConstant": false, "isLValue": false, "isPure": false, @@ -6396,7 +6396,7 @@ "typeString": "tuple()" } }, - "id": 7457, + "id": 7448, "nodeType": "ExpressionStatement", "src": "2336:21:30" }, @@ -6406,11 +6406,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7462, + "id": 7453, "name": "dedgeCompoundManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7399, + "referencedDeclaration": 7390, "src": "2467:20:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6419,11 +6419,11 @@ }, { "argumentTypes": null, - "id": 7463, + "id": 7454, "name": "enterMarketCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7401, + "referencedDeclaration": 7392, "src": "2501:19:30", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -6447,11 +6447,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7459, + "id": 7450, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2439:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -6466,18 +6466,18 @@ "typeString": "address payable" } ], - "id": 7458, + "id": 7449, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "2430:8:30", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 7460, + "id": 7451, "isConstant": false, "isLValue": false, "isPure": false, @@ -6487,25 +6487,25 @@ "nodeType": "FunctionCall", "src": "2430:15:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 7461, + "id": 7452, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "execute", "nodeType": "MemberAccess", - "referencedDeclaration": 3630, + "referencedDeclaration": 3682, "src": "2430:23:30", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$", "typeString": "function (address,bytes memory) payable external returns (bytes memory)" } }, - "id": 7464, + "id": 7455, "isConstant": false, "isLValue": false, "isPure": false, @@ -6519,7 +6519,7 @@ "typeString": "bytes memory" } }, - "id": 7465, + "id": 7456, "nodeType": "ExpressionStatement", "src": "2430:100:30" }, @@ -6529,14 +6529,14 @@ "arguments": [ { "argumentTypes": null, - "id": 7470, + "id": 7461, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7447, + "referencedDeclaration": 7438, "src": "2570:5:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } @@ -6544,7 +6544,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } ], @@ -6553,11 +6553,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7467, + "id": 7458, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2550:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -6572,18 +6572,18 @@ "typeString": "address payable" } ], - "id": 7466, + "id": 7457, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "2541:8:30", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 7468, + "id": 7459, "isConstant": false, "isLValue": false, "isPure": false, @@ -6593,25 +6593,25 @@ "nodeType": "FunctionCall", "src": "2541:15:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 7469, + "id": 7460, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setAuthority", "nodeType": "MemberAccess", - "referencedDeclaration": 2862, + "referencedDeclaration": 2914, "src": "2541:28:30", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$_t_contract$_DSAuthority_$2799_$returns$__$", + "typeIdentifier": "t_function_external_nonpayable$_t_contract$_DSAuthority_$2851_$returns$__$", "typeString": "function (contract DSAuthority) external" } }, - "id": 7471, + "id": 7462, "isConstant": false, "isLValue": false, "isPure": false, @@ -6625,7 +6625,7 @@ "typeString": "tuple()" } }, - "id": 7472, + "id": 7463, "nodeType": "ExpressionStatement", "src": "2541:35:30" }, @@ -6635,11 +6635,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7477, + "id": 7468, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7397, + "referencedDeclaration": 7388, "src": "2611:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6659,11 +6659,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7474, + "id": 7465, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2595:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -6678,18 +6678,18 @@ "typeString": "address payable" } ], - "id": 7473, + "id": 7464, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "2586:8:30", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 7475, + "id": 7466, "isConstant": false, "isLValue": false, "isPure": false, @@ -6699,25 +6699,25 @@ "nodeType": "FunctionCall", "src": "2586:15:30", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 7476, + "id": 7467, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "2586:24:30", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 7478, + "id": 7469, "isConstant": false, "isLValue": false, "isPure": false, @@ -6731,14 +6731,14 @@ "typeString": "tuple()" } }, - "id": 7479, + "id": 7470, "nodeType": "ExpressionStatement", "src": "2586:31:30" }, { "expression": { "argumentTypes": null, - "id": 7484, + "id": 7475, "isConstant": false, "isLValue": false, "isPure": false, @@ -6747,25 +6747,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 7480, + "id": 7471, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7263, + "referencedDeclaration": 7254, "src": "2628:7:30", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 7482, + "id": 7473, "indexExpression": { "argumentTypes": null, - "id": 7481, + "id": 7472, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7397, + "referencedDeclaration": 7388, "src": "2636:5:30", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6787,11 +6787,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 7483, + "id": 7474, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2645:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -6804,48 +6804,48 @@ "typeString": "address" } }, - "id": 7485, + "id": 7476, "nodeType": "ExpressionStatement", "src": "2628:22:30" }, { "expression": { "argumentTypes": null, - "id": 7486, + "id": 7477, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7424, + "referencedDeclaration": 7415, "src": "2668:5:30", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "functionReturnParameters": 7405, - "id": 7487, + "functionReturnParameters": 7396, + "id": 7478, "nodeType": "Return", "src": "2661:12:30" } ] }, "documentation": null, - "id": 7489, + "id": 7480, "implemented": true, "kind": "function", "modifiers": [], "name": "buildAndEnterMarkets", "nodeType": "FunctionDefinition", "parameters": { - "id": 7402, + "id": 7393, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7397, + "id": 7388, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 7489, + "scope": 7480, "src": "1823:13:30", "stateVariable": false, "storageLocation": "default", @@ -6854,7 +6854,7 @@ "typeString": "address" }, "typeName": { - "id": 7396, + "id": 7387, "name": "address", "nodeType": "ElementaryTypeName", "src": "1823:7:30", @@ -6869,10 +6869,10 @@ }, { "constant": false, - "id": 7399, + "id": 7390, "name": "dedgeCompoundManager", "nodeType": "VariableDeclaration", - "scope": 7489, + "scope": 7480, "src": "1846:28:30", "stateVariable": false, "storageLocation": "default", @@ -6881,7 +6881,7 @@ "typeString": "address" }, "typeName": { - "id": 7398, + "id": 7389, "name": "address", "nodeType": "ElementaryTypeName", "src": "1846:7:30", @@ -6896,10 +6896,10 @@ }, { "constant": false, - "id": 7401, + "id": 7392, "name": "enterMarketCalldata", "nodeType": "VariableDeclaration", - "scope": 7489, + "scope": 7480, "src": "1884:32:30", "stateVariable": false, "storageLocation": "memory", @@ -6908,7 +6908,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7400, + "id": 7391, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1884:5:30", @@ -6924,15 +6924,15 @@ "src": "1813:109:30" }, "returnParameters": { - "id": 7405, + "id": 7396, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7404, + "id": 7395, "name": "", "nodeType": "VariableDeclaration", - "scope": 7489, + "scope": 7480, "src": "1939:15:30", "stateVariable": false, "storageLocation": "default", @@ -6941,7 +6941,7 @@ "typeString": "address payable" }, "typeName": { - "id": 7403, + "id": 7394, "name": "address", "nodeType": "ElementaryTypeName", "src": "1939:15:30", @@ -6957,14 +6957,14 @@ ], "src": "1938:17:30" }, - "scope": 7490, + "scope": 7481, "src": "1784:896:30", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 7491, + "scope": 7482, "src": "138:2544:30" } ], @@ -7015,7 +7015,7 @@ } }, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:28:59.247Z", + "updatedAt": "2020-04-08T12:22:38.503Z", "networkType": "ethereum", "devdoc": { "methods": {} diff --git a/packages/smart-contracts/artifacts/DSAuth.json b/packages/smart-contracts/artifacts/DSAuth.json index 0073a19..2c6e995 100644 --- a/packages/smart-contracts/artifacts/DSAuth.json +++ b/packages/smart-contracts/artifacts/DSAuth.json @@ -105,20 +105,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "exportedSymbols": { "DSAuth": [ - 2924 + 2976 ], "DSAuthEvents": [ - 2808 + 2860 ], "DSAuthority": [ - 2799 + 2851 ] }, - "id": 2925, + "id": 2977, "nodeType": "SourceUnit", "nodes": [ { - "id": 2787, + "id": 2839, "literals": [ "solidity", "0.5", @@ -133,9 +133,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 2799, + "id": 2851, "linearizedBaseContracts": [ - 2799 + 2851 ], "name": "DSAuthority", "nodeType": "ContractDefinition", @@ -143,22 +143,22 @@ { "body": null, "documentation": null, - "id": 2798, + "id": 2850, "implemented": false, "kind": "function", "modifiers": [], "name": "canCall", "nodeType": "FunctionDefinition", "parameters": { - "id": 2794, + "id": 2846, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2789, + "id": 2841, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "721:11:17", "stateVariable": false, "storageLocation": "default", @@ -167,7 +167,7 @@ "typeString": "address" }, "typeName": { - "id": 2788, + "id": 2840, "name": "address", "nodeType": "ElementaryTypeName", "src": "721:7:17", @@ -182,10 +182,10 @@ }, { "constant": false, - "id": 2791, + "id": 2843, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "734:11:17", "stateVariable": false, "storageLocation": "default", @@ -194,7 +194,7 @@ "typeString": "address" }, "typeName": { - "id": 2790, + "id": 2842, "name": "address", "nodeType": "ElementaryTypeName", "src": "734:7:17", @@ -209,10 +209,10 @@ }, { "constant": false, - "id": 2793, + "id": 2845, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "747:10:17", "stateVariable": false, "storageLocation": "default", @@ -221,7 +221,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2792, + "id": 2844, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "747:6:17", @@ -237,15 +237,15 @@ "src": "711:52:17" }, "returnParameters": { - "id": 2797, + "id": 2849, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2796, + "id": 2848, "name": "", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "785:4:17", "stateVariable": false, "storageLocation": "default", @@ -254,7 +254,7 @@ "typeString": "bool" }, "typeName": { - "id": 2795, + "id": 2847, "name": "bool", "nodeType": "ElementaryTypeName", "src": "785:4:17", @@ -269,14 +269,14 @@ ], "src": "784:6:17" }, - "scope": 2799, + "scope": 2851, "src": "695:96:17", "stateMutability": "view", "superFunction": null, "visibility": "public" } ], - "scope": 2925, + "scope": 2977, "src": "668:125:17" }, { @@ -285,9 +285,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2808, + "id": 2860, "linearizedBaseContracts": [ - 2808 + 2860 ], "name": "DSAuthEvents", "nodeType": "ContractDefinition", @@ -295,20 +295,20 @@ { "anonymous": false, "documentation": null, - "id": 2803, + "id": 2855, "name": "LogSetAuthority", "nodeType": "EventDefinition", "parameters": { - "id": 2802, + "id": 2854, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2801, + "id": 2853, "indexed": true, "name": "authority", "nodeType": "VariableDeclaration", - "scope": 2803, + "scope": 2855, "src": "846:25:17", "stateVariable": false, "storageLocation": "default", @@ -317,7 +317,7 @@ "typeString": "address" }, "typeName": { - "id": 2800, + "id": 2852, "name": "address", "nodeType": "ElementaryTypeName", "src": "846:7:17", @@ -338,20 +338,20 @@ { "anonymous": false, "documentation": null, - "id": 2807, + "id": 2859, "name": "LogSetOwner", "nodeType": "EventDefinition", "parameters": { - "id": 2806, + "id": 2858, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2805, + "id": 2857, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2807, + "scope": 2859, "src": "901:21:17", "stateVariable": false, "storageLocation": "default", @@ -360,7 +360,7 @@ "typeString": "address" }, "typeName": { - "id": 2804, + "id": 2856, "name": "address", "nodeType": "ElementaryTypeName", "src": "901:7:17", @@ -379,7 +379,7 @@ "src": "878:46:17" } ], - "scope": 2925, + "scope": 2977, "src": "795:131:17" }, { @@ -388,57 +388,57 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2809, + "id": 2861, "name": "DSAuthEvents", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2808, + "referencedDeclaration": 2860, "src": "947:12:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthEvents_$2808", + "typeIdentifier": "t_contract$_DSAuthEvents_$2860", "typeString": "contract DSAuthEvents" } }, - "id": 2810, + "id": 2862, "nodeType": "InheritanceSpecifier", "src": "947:12:17" } ], "contractDependencies": [ - 2808 + 2860 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2924, + "id": 2976, "linearizedBaseContracts": [ - 2924, - 2808 + 2976, + 2860 ], "name": "DSAuth", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 2812, + "id": 2864, "name": "authority", "nodeType": "VariableDeclaration", - "scope": 2924, + "scope": 2976, "src": "966:30:17", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" }, "typeName": { "contractScope": null, - "id": 2811, + "id": 2863, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "966:11:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -447,10 +447,10 @@ }, { "constant": false, - "id": 2814, + "id": 2866, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2924, + "scope": 2976, "src": "1002:26:17", "stateVariable": true, "storageLocation": "default", @@ -459,7 +459,7 @@ "typeString": "address" }, "typeName": { - "id": 2813, + "id": 2865, "name": "address", "nodeType": "ElementaryTypeName", "src": "1002:7:17", @@ -474,25 +474,25 @@ }, { "body": { - "id": 2827, + "id": 2879, "nodeType": "Block", "src": "1056:73:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2820, + "id": 2872, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2817, + "id": 2869, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1066:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -505,18 +505,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2818, + "id": 2870, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1074:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2819, + "id": 2871, "isConstant": false, "isLValue": false, "isPure": false, @@ -536,7 +536,7 @@ "typeString": "address" } }, - "id": 2821, + "id": 2873, "nodeType": "ExpressionStatement", "src": "1066:18:17" }, @@ -548,18 +548,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2823, + "id": 2875, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1111:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2824, + "id": 2876, "isConstant": false, "isLValue": false, "isPure": false, @@ -581,18 +581,18 @@ "typeString": "address payable" } ], - "id": 2822, + "id": 2874, "name": "LogSetOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2807, + "referencedDeclaration": 2859, "src": "1099:11:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2825, + "id": 2877, "isConstant": false, "isLValue": false, "isPure": false, @@ -606,32 +606,32 @@ "typeString": "tuple()" } }, - "id": 2826, + "id": 2878, "nodeType": "EmitStatement", "src": "1094:28:17" } ] }, "documentation": null, - "id": 2828, + "id": 2880, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 2815, + "id": 2867, "nodeType": "ParameterList", "parameters": [], "src": "1046:2:17" }, "returnParameters": { - "id": 2816, + "id": 2868, "nodeType": "ParameterList", "parameters": [], "src": "1056:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1035:94:17", "stateMutability": "nonpayable", "superFunction": null, @@ -639,25 +639,25 @@ }, { "body": { - "id": 2843, + "id": 2895, "nodeType": "Block", "src": "1201:64:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2837, + "id": 2889, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2835, + "id": 2887, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1211:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -668,11 +668,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2836, + "id": 2888, "name": "owner_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2830, + "referencedDeclaration": 2882, "src": "1219:6:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -685,7 +685,7 @@ "typeString": "address" } }, - "id": 2838, + "id": 2890, "nodeType": "ExpressionStatement", "src": "1211:14:17" }, @@ -695,11 +695,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2840, + "id": 2892, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1252:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -714,18 +714,18 @@ "typeString": "address" } ], - "id": 2839, + "id": 2891, "name": "LogSetOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2807, + "referencedDeclaration": 2859, "src": "1240:11:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2841, + "id": 2893, "isConstant": false, "isLValue": false, "isPure": false, @@ -739,27 +739,27 @@ "typeString": "tuple()" } }, - "id": 2842, + "id": 2894, "nodeType": "EmitStatement", "src": "1235:23:17" } ] }, "documentation": null, - "id": 2844, + "id": 2896, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 2833, + "id": 2885, "modifierName": { "argumentTypes": null, - "id": 2832, + "id": 2884, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1192:4:17", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -773,15 +773,15 @@ "name": "setOwner", "nodeType": "FunctionDefinition", "parameters": { - "id": 2831, + "id": 2883, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2830, + "id": 2882, "name": "owner_", "nodeType": "VariableDeclaration", - "scope": 2844, + "scope": 2896, "src": "1153:14:17", "stateVariable": false, "storageLocation": "default", @@ -790,7 +790,7 @@ "typeString": "address" }, "typeName": { - "id": 2829, + "id": 2881, "name": "address", "nodeType": "ElementaryTypeName", "src": "1153:7:17", @@ -807,12 +807,12 @@ "src": "1152:16:17" }, "returnParameters": { - "id": 2834, + "id": 2886, "nodeType": "ParameterList", "parameters": [], "src": "1201:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1135:130:17", "stateMutability": "nonpayable", "superFunction": null, @@ -820,28 +820,28 @@ }, { "body": { - "id": 2861, + "id": 2913, "nodeType": "Block", "src": "1349:89:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2853, + "id": 2905, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2851, + "id": 2903, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1359:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -849,24 +849,24 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2852, + "id": 2904, "name": "authority_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2846, + "referencedDeclaration": 2898, "src": "1371:10:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, "src": "1359:22:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2854, + "id": 2906, "nodeType": "ExpressionStatement", "src": "1359:22:17" }, @@ -879,14 +879,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2857, + "id": 2909, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1420:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -894,11 +894,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 2856, + "id": 2908, "isConstant": false, "isLValue": false, "isPure": true, @@ -911,7 +911,7 @@ }, "typeName": "address" }, - "id": 2858, + "id": 2910, "isConstant": false, "isLValue": false, "isPure": false, @@ -933,18 +933,18 @@ "typeString": "address" } ], - "id": 2855, + "id": 2907, "name": "LogSetAuthority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2803, + "referencedDeclaration": 2855, "src": "1396:15:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2859, + "id": 2911, "isConstant": false, "isLValue": false, "isPure": false, @@ -958,27 +958,27 @@ "typeString": "tuple()" } }, - "id": 2860, + "id": 2912, "nodeType": "EmitStatement", "src": "1391:40:17" } ] }, "documentation": null, - "id": 2862, + "id": 2914, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 2849, + "id": 2901, "modifierName": { "argumentTypes": null, - "id": 2848, + "id": 2900, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1340:4:17", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -992,31 +992,31 @@ "name": "setAuthority", "nodeType": "FunctionDefinition", "parameters": { - "id": 2847, + "id": 2899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2846, + "id": 2898, "name": "authority_", "nodeType": "VariableDeclaration", - "scope": 2862, + "scope": 2914, "src": "1293:22:17", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" }, "typeName": { "contractScope": null, - "id": 2845, + "id": 2897, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "1293:11:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -1027,12 +1027,12 @@ "src": "1292:24:17" }, "returnParameters": { - "id": 2850, + "id": 2902, "nodeType": "ParameterList", "parameters": [], "src": "1349:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1271:167:17", "stateMutability": "nonpayable", "superFunction": null, @@ -1040,7 +1040,7 @@ }, { "body": { - "id": 2875, + "id": 2927, "nodeType": "Block", "src": "1458:94:17", "statements": [ @@ -1055,18 +1055,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2866, + "id": 2918, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1489:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2867, + "id": 2919, "isConstant": false, "isLValue": false, "isPure": false, @@ -1084,18 +1084,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2868, + "id": 2920, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1501:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2869, + "id": 2921, "isConstant": false, "isLValue": false, "isPure": false, @@ -1121,18 +1121,18 @@ "typeString": "bytes4" } ], - "id": 2865, + "id": 2917, "name": "isAuthorized", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, + "referencedDeclaration": 2975, "src": "1476:12:17", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_bytes4_$returns$_t_bool_$", "typeString": "function (address,bytes4) view returns (bool)" } }, - "id": 2870, + "id": 2922, "isConstant": false, "isLValue": false, "isPure": false, @@ -1149,7 +1149,7 @@ { "argumentTypes": null, "hexValue": "64732d617574682d756e617574686f72697a6564", - "id": 2871, + "id": 2923, "isConstant": false, "isLValue": false, "isPure": true, @@ -1176,21 +1176,21 @@ "typeString": "literal_string \"ds-auth-unauthorized\"" } ], - "id": 2864, + "id": 2916, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1468:7:17", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2872, + "id": 2924, "isConstant": false, "isLValue": false, "isPure": false, @@ -1204,23 +1204,23 @@ "typeString": "tuple()" } }, - "id": 2873, + "id": 2925, "nodeType": "ExpressionStatement", "src": "1468:66:17" }, { - "id": 2874, + "id": 2926, "nodeType": "PlaceholderStatement", "src": "1544:1:17" } ] }, "documentation": null, - "id": 2876, + "id": 2928, "name": "auth", "nodeType": "ModifierDefinition", "parameters": { - "id": 2863, + "id": 2915, "nodeType": "ParameterList", "parameters": [], "src": "1458:0:17" @@ -1230,7 +1230,7 @@ }, { "body": { - "id": 2922, + "id": 2974, "nodeType": "Block", "src": "1634:299:17", "statements": [ @@ -1241,18 +1241,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2889, + "id": 2941, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2885, + "id": 2937, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1648:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1266,14 +1266,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2887, + "id": 2939, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7883, + "referencedDeclaration": 7874, "src": "1663:4:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } } @@ -1281,11 +1281,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } ], - "id": 2886, + "id": 2938, "isConstant": false, "isLValue": false, "isPure": true, @@ -1298,7 +1298,7 @@ }, "typeName": "address" }, - "id": 2888, + "id": 2940, "isConstant": false, "isLValue": false, "isPure": false, @@ -1325,18 +1325,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2895, + "id": 2947, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2893, + "id": 2945, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1716:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1347,11 +1347,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2894, + "id": 2946, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1723:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1371,7 +1371,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2905, + "id": 2957, "isConstant": false, "isLValue": false, "isPure": false, @@ -1381,14 +1381,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2900, + "id": 2952, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1784:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -1396,11 +1396,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 2899, + "id": 2951, "isConstant": false, "isLValue": false, "isPure": true, @@ -1413,7 +1413,7 @@ }, "typeName": "address" }, - "id": 2901, + "id": 2953, "isConstant": false, "isLValue": false, "isPure": false, @@ -1435,7 +1435,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 2903, + "id": 2955, "isConstant": false, "isLValue": false, "isPure": true, @@ -1458,7 +1458,7 @@ "typeString": "int_const 0" } ], - "id": 2902, + "id": 2954, "isConstant": false, "isLValue": false, "isPure": true, @@ -1471,7 +1471,7 @@ }, "typeName": "address" }, - "id": 2904, + "id": 2956, "isConstant": false, "isLValue": false, "isPure": true, @@ -1492,7 +1492,7 @@ } }, "falseBody": { - "id": 2918, + "id": 2970, "nodeType": "Block", "src": "1853:74:17", "statements": [ @@ -1502,11 +1502,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2911, + "id": 2963, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1892:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1518,14 +1518,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2913, + "id": 2965, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7883, + "referencedDeclaration": 7874, "src": "1905:4:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } } @@ -1533,11 +1533,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } ], - "id": 2912, + "id": 2964, "isConstant": false, "isLValue": false, "isPure": true, @@ -1550,7 +1550,7 @@ }, "typeName": "address" }, - "id": 2914, + "id": 2966, "isConstant": false, "isLValue": false, "isPure": false, @@ -1566,11 +1566,11 @@ }, { "argumentTypes": null, - "id": 2915, + "id": 2967, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2880, + "referencedDeclaration": 2932, "src": "1912:3:17", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1595,32 +1595,32 @@ ], "expression": { "argumentTypes": null, - "id": 2909, + "id": 2961, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1874:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2910, + "id": 2962, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "canCall", "nodeType": "MemberAccess", - "referencedDeclaration": 2798, + "referencedDeclaration": 2850, "src": "1874:17:17", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$_t_bytes4_$returns$_t_bool_$", "typeString": "function (address,address,bytes4) view external returns (bool)" } }, - "id": 2916, + "id": 2968, "isConstant": false, "isLValue": false, "isPure": false, @@ -1634,18 +1634,18 @@ "typeString": "bool" } }, - "functionReturnParameters": 2884, - "id": 2917, + "functionReturnParameters": 2936, + "id": 2969, "nodeType": "Return", "src": "1867:49:17" } ] }, - "id": 2919, + "id": 2971, "nodeType": "IfStatement", "src": "1772:155:17", "trueBody": { - "id": 2908, + "id": 2960, "nodeType": "Block", "src": "1810:37:17", "statements": [ @@ -1653,7 +1653,7 @@ "expression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2906, + "id": 2958, "isConstant": false, "isLValue": false, "isPure": true, @@ -1668,19 +1668,19 @@ }, "value": "false" }, - "functionReturnParameters": 2884, - "id": 2907, + "functionReturnParameters": 2936, + "id": 2959, "nodeType": "Return", "src": "1824:12:17" } ] } }, - "id": 2920, + "id": 2972, "nodeType": "IfStatement", "src": "1712:215:17", "trueBody": { - "id": 2898, + "id": 2950, "nodeType": "Block", "src": "1730:36:17", "statements": [ @@ -1688,7 +1688,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2896, + "id": 2948, "isConstant": false, "isLValue": false, "isPure": true, @@ -1703,19 +1703,19 @@ }, "value": "true" }, - "functionReturnParameters": 2884, - "id": 2897, + "functionReturnParameters": 2936, + "id": 2949, "nodeType": "Return", "src": "1744:11:17" } ] } }, - "id": 2921, + "id": 2973, "nodeType": "IfStatement", "src": "1644:283:17", "trueBody": { - "id": 2892, + "id": 2944, "nodeType": "Block", "src": "1670:36:17", "statements": [ @@ -1723,7 +1723,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2890, + "id": 2942, "isConstant": false, "isLValue": false, "isPure": true, @@ -1738,8 +1738,8 @@ }, "value": "true" }, - "functionReturnParameters": 2884, - "id": 2891, + "functionReturnParameters": 2936, + "id": 2943, "nodeType": "Return", "src": "1684:11:17" } @@ -1749,22 +1749,22 @@ ] }, "documentation": null, - "id": 2923, + "id": 2975, "implemented": true, "kind": "function", "modifiers": [], "name": "isAuthorized", "nodeType": "FunctionDefinition", "parameters": { - "id": 2881, + "id": 2933, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2878, + "id": 2930, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1580:11:17", "stateVariable": false, "storageLocation": "default", @@ -1773,7 +1773,7 @@ "typeString": "address" }, "typeName": { - "id": 2877, + "id": 2929, "name": "address", "nodeType": "ElementaryTypeName", "src": "1580:7:17", @@ -1788,10 +1788,10 @@ }, { "constant": false, - "id": 2880, + "id": 2932, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1593:10:17", "stateVariable": false, "storageLocation": "default", @@ -1800,7 +1800,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2879, + "id": 2931, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "1593:6:17", @@ -1816,15 +1816,15 @@ "src": "1579:25:17" }, "returnParameters": { - "id": 2884, + "id": 2936, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2883, + "id": 2935, "name": "", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1628:4:17", "stateVariable": false, "storageLocation": "default", @@ -1833,7 +1833,7 @@ "typeString": "bool" }, "typeName": { - "id": 2882, + "id": 2934, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1628:4:17", @@ -1848,14 +1848,14 @@ ], "src": "1627:6:17" }, - "scope": 2924, + "scope": 2976, "src": "1558:375:17", "stateMutability": "view", "superFunction": null, "visibility": "internal" } ], - "scope": 2925, + "scope": 2977, "src": "928:1007:17" } ], @@ -1865,20 +1865,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "exportedSymbols": { "DSAuth": [ - 2924 + 2976 ], "DSAuthEvents": [ - 2808 + 2860 ], "DSAuthority": [ - 2799 + 2851 ] }, - "id": 2925, + "id": 2977, "nodeType": "SourceUnit", "nodes": [ { - "id": 2787, + "id": 2839, "literals": [ "solidity", "0.5", @@ -1893,9 +1893,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 2799, + "id": 2851, "linearizedBaseContracts": [ - 2799 + 2851 ], "name": "DSAuthority", "nodeType": "ContractDefinition", @@ -1903,22 +1903,22 @@ { "body": null, "documentation": null, - "id": 2798, + "id": 2850, "implemented": false, "kind": "function", "modifiers": [], "name": "canCall", "nodeType": "FunctionDefinition", "parameters": { - "id": 2794, + "id": 2846, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2789, + "id": 2841, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "721:11:17", "stateVariable": false, "storageLocation": "default", @@ -1927,7 +1927,7 @@ "typeString": "address" }, "typeName": { - "id": 2788, + "id": 2840, "name": "address", "nodeType": "ElementaryTypeName", "src": "721:7:17", @@ -1942,10 +1942,10 @@ }, { "constant": false, - "id": 2791, + "id": 2843, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "734:11:17", "stateVariable": false, "storageLocation": "default", @@ -1954,7 +1954,7 @@ "typeString": "address" }, "typeName": { - "id": 2790, + "id": 2842, "name": "address", "nodeType": "ElementaryTypeName", "src": "734:7:17", @@ -1969,10 +1969,10 @@ }, { "constant": false, - "id": 2793, + "id": 2845, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "747:10:17", "stateVariable": false, "storageLocation": "default", @@ -1981,7 +1981,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2792, + "id": 2844, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "747:6:17", @@ -1997,15 +1997,15 @@ "src": "711:52:17" }, "returnParameters": { - "id": 2797, + "id": 2849, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2796, + "id": 2848, "name": "", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "785:4:17", "stateVariable": false, "storageLocation": "default", @@ -2014,7 +2014,7 @@ "typeString": "bool" }, "typeName": { - "id": 2795, + "id": 2847, "name": "bool", "nodeType": "ElementaryTypeName", "src": "785:4:17", @@ -2029,14 +2029,14 @@ ], "src": "784:6:17" }, - "scope": 2799, + "scope": 2851, "src": "695:96:17", "stateMutability": "view", "superFunction": null, "visibility": "public" } ], - "scope": 2925, + "scope": 2977, "src": "668:125:17" }, { @@ -2045,9 +2045,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2808, + "id": 2860, "linearizedBaseContracts": [ - 2808 + 2860 ], "name": "DSAuthEvents", "nodeType": "ContractDefinition", @@ -2055,20 +2055,20 @@ { "anonymous": false, "documentation": null, - "id": 2803, + "id": 2855, "name": "LogSetAuthority", "nodeType": "EventDefinition", "parameters": { - "id": 2802, + "id": 2854, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2801, + "id": 2853, "indexed": true, "name": "authority", "nodeType": "VariableDeclaration", - "scope": 2803, + "scope": 2855, "src": "846:25:17", "stateVariable": false, "storageLocation": "default", @@ -2077,7 +2077,7 @@ "typeString": "address" }, "typeName": { - "id": 2800, + "id": 2852, "name": "address", "nodeType": "ElementaryTypeName", "src": "846:7:17", @@ -2098,20 +2098,20 @@ { "anonymous": false, "documentation": null, - "id": 2807, + "id": 2859, "name": "LogSetOwner", "nodeType": "EventDefinition", "parameters": { - "id": 2806, + "id": 2858, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2805, + "id": 2857, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2807, + "scope": 2859, "src": "901:21:17", "stateVariable": false, "storageLocation": "default", @@ -2120,7 +2120,7 @@ "typeString": "address" }, "typeName": { - "id": 2804, + "id": 2856, "name": "address", "nodeType": "ElementaryTypeName", "src": "901:7:17", @@ -2139,7 +2139,7 @@ "src": "878:46:17" } ], - "scope": 2925, + "scope": 2977, "src": "795:131:17" }, { @@ -2148,57 +2148,57 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2809, + "id": 2861, "name": "DSAuthEvents", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2808, + "referencedDeclaration": 2860, "src": "947:12:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthEvents_$2808", + "typeIdentifier": "t_contract$_DSAuthEvents_$2860", "typeString": "contract DSAuthEvents" } }, - "id": 2810, + "id": 2862, "nodeType": "InheritanceSpecifier", "src": "947:12:17" } ], "contractDependencies": [ - 2808 + 2860 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2924, + "id": 2976, "linearizedBaseContracts": [ - 2924, - 2808 + 2976, + 2860 ], "name": "DSAuth", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 2812, + "id": 2864, "name": "authority", "nodeType": "VariableDeclaration", - "scope": 2924, + "scope": 2976, "src": "966:30:17", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" }, "typeName": { "contractScope": null, - "id": 2811, + "id": 2863, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "966:11:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -2207,10 +2207,10 @@ }, { "constant": false, - "id": 2814, + "id": 2866, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2924, + "scope": 2976, "src": "1002:26:17", "stateVariable": true, "storageLocation": "default", @@ -2219,7 +2219,7 @@ "typeString": "address" }, "typeName": { - "id": 2813, + "id": 2865, "name": "address", "nodeType": "ElementaryTypeName", "src": "1002:7:17", @@ -2234,25 +2234,25 @@ }, { "body": { - "id": 2827, + "id": 2879, "nodeType": "Block", "src": "1056:73:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2820, + "id": 2872, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2817, + "id": 2869, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1066:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2265,18 +2265,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2818, + "id": 2870, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1074:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2819, + "id": 2871, "isConstant": false, "isLValue": false, "isPure": false, @@ -2296,7 +2296,7 @@ "typeString": "address" } }, - "id": 2821, + "id": 2873, "nodeType": "ExpressionStatement", "src": "1066:18:17" }, @@ -2308,18 +2308,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2823, + "id": 2875, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1111:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2824, + "id": 2876, "isConstant": false, "isLValue": false, "isPure": false, @@ -2341,18 +2341,18 @@ "typeString": "address payable" } ], - "id": 2822, + "id": 2874, "name": "LogSetOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2807, + "referencedDeclaration": 2859, "src": "1099:11:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2825, + "id": 2877, "isConstant": false, "isLValue": false, "isPure": false, @@ -2366,32 +2366,32 @@ "typeString": "tuple()" } }, - "id": 2826, + "id": 2878, "nodeType": "EmitStatement", "src": "1094:28:17" } ] }, "documentation": null, - "id": 2828, + "id": 2880, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 2815, + "id": 2867, "nodeType": "ParameterList", "parameters": [], "src": "1046:2:17" }, "returnParameters": { - "id": 2816, + "id": 2868, "nodeType": "ParameterList", "parameters": [], "src": "1056:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1035:94:17", "stateMutability": "nonpayable", "superFunction": null, @@ -2399,25 +2399,25 @@ }, { "body": { - "id": 2843, + "id": 2895, "nodeType": "Block", "src": "1201:64:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2837, + "id": 2889, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2835, + "id": 2887, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1211:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2428,11 +2428,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2836, + "id": 2888, "name": "owner_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2830, + "referencedDeclaration": 2882, "src": "1219:6:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2445,7 +2445,7 @@ "typeString": "address" } }, - "id": 2838, + "id": 2890, "nodeType": "ExpressionStatement", "src": "1211:14:17" }, @@ -2455,11 +2455,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2840, + "id": 2892, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1252:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2474,18 +2474,18 @@ "typeString": "address" } ], - "id": 2839, + "id": 2891, "name": "LogSetOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2807, + "referencedDeclaration": 2859, "src": "1240:11:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2841, + "id": 2893, "isConstant": false, "isLValue": false, "isPure": false, @@ -2499,27 +2499,27 @@ "typeString": "tuple()" } }, - "id": 2842, + "id": 2894, "nodeType": "EmitStatement", "src": "1235:23:17" } ] }, "documentation": null, - "id": 2844, + "id": 2896, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 2833, + "id": 2885, "modifierName": { "argumentTypes": null, - "id": 2832, + "id": 2884, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1192:4:17", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2533,15 +2533,15 @@ "name": "setOwner", "nodeType": "FunctionDefinition", "parameters": { - "id": 2831, + "id": 2883, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2830, + "id": 2882, "name": "owner_", "nodeType": "VariableDeclaration", - "scope": 2844, + "scope": 2896, "src": "1153:14:17", "stateVariable": false, "storageLocation": "default", @@ -2550,7 +2550,7 @@ "typeString": "address" }, "typeName": { - "id": 2829, + "id": 2881, "name": "address", "nodeType": "ElementaryTypeName", "src": "1153:7:17", @@ -2567,12 +2567,12 @@ "src": "1152:16:17" }, "returnParameters": { - "id": 2834, + "id": 2886, "nodeType": "ParameterList", "parameters": [], "src": "1201:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1135:130:17", "stateMutability": "nonpayable", "superFunction": null, @@ -2580,28 +2580,28 @@ }, { "body": { - "id": 2861, + "id": 2913, "nodeType": "Block", "src": "1349:89:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2853, + "id": 2905, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2851, + "id": 2903, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1359:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -2609,24 +2609,24 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2852, + "id": 2904, "name": "authority_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2846, + "referencedDeclaration": 2898, "src": "1371:10:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, "src": "1359:22:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2854, + "id": 2906, "nodeType": "ExpressionStatement", "src": "1359:22:17" }, @@ -2639,14 +2639,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2857, + "id": 2909, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1420:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -2654,11 +2654,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 2856, + "id": 2908, "isConstant": false, "isLValue": false, "isPure": true, @@ -2671,7 +2671,7 @@ }, "typeName": "address" }, - "id": 2858, + "id": 2910, "isConstant": false, "isLValue": false, "isPure": false, @@ -2693,18 +2693,18 @@ "typeString": "address" } ], - "id": 2855, + "id": 2907, "name": "LogSetAuthority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2803, + "referencedDeclaration": 2855, "src": "1396:15:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2859, + "id": 2911, "isConstant": false, "isLValue": false, "isPure": false, @@ -2718,27 +2718,27 @@ "typeString": "tuple()" } }, - "id": 2860, + "id": 2912, "nodeType": "EmitStatement", "src": "1391:40:17" } ] }, "documentation": null, - "id": 2862, + "id": 2914, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 2849, + "id": 2901, "modifierName": { "argumentTypes": null, - "id": 2848, + "id": 2900, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1340:4:17", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2752,31 +2752,31 @@ "name": "setAuthority", "nodeType": "FunctionDefinition", "parameters": { - "id": 2847, + "id": 2899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2846, + "id": 2898, "name": "authority_", "nodeType": "VariableDeclaration", - "scope": 2862, + "scope": 2914, "src": "1293:22:17", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" }, "typeName": { "contractScope": null, - "id": 2845, + "id": 2897, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "1293:11:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -2787,12 +2787,12 @@ "src": "1292:24:17" }, "returnParameters": { - "id": 2850, + "id": 2902, "nodeType": "ParameterList", "parameters": [], "src": "1349:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1271:167:17", "stateMutability": "nonpayable", "superFunction": null, @@ -2800,7 +2800,7 @@ }, { "body": { - "id": 2875, + "id": 2927, "nodeType": "Block", "src": "1458:94:17", "statements": [ @@ -2815,18 +2815,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2866, + "id": 2918, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1489:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2867, + "id": 2919, "isConstant": false, "isLValue": false, "isPure": false, @@ -2844,18 +2844,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2868, + "id": 2920, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1501:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2869, + "id": 2921, "isConstant": false, "isLValue": false, "isPure": false, @@ -2881,18 +2881,18 @@ "typeString": "bytes4" } ], - "id": 2865, + "id": 2917, "name": "isAuthorized", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, + "referencedDeclaration": 2975, "src": "1476:12:17", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_bytes4_$returns$_t_bool_$", "typeString": "function (address,bytes4) view returns (bool)" } }, - "id": 2870, + "id": 2922, "isConstant": false, "isLValue": false, "isPure": false, @@ -2909,7 +2909,7 @@ { "argumentTypes": null, "hexValue": "64732d617574682d756e617574686f72697a6564", - "id": 2871, + "id": 2923, "isConstant": false, "isLValue": false, "isPure": true, @@ -2936,21 +2936,21 @@ "typeString": "literal_string \"ds-auth-unauthorized\"" } ], - "id": 2864, + "id": 2916, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1468:7:17", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2872, + "id": 2924, "isConstant": false, "isLValue": false, "isPure": false, @@ -2964,23 +2964,23 @@ "typeString": "tuple()" } }, - "id": 2873, + "id": 2925, "nodeType": "ExpressionStatement", "src": "1468:66:17" }, { - "id": 2874, + "id": 2926, "nodeType": "PlaceholderStatement", "src": "1544:1:17" } ] }, "documentation": null, - "id": 2876, + "id": 2928, "name": "auth", "nodeType": "ModifierDefinition", "parameters": { - "id": 2863, + "id": 2915, "nodeType": "ParameterList", "parameters": [], "src": "1458:0:17" @@ -2990,7 +2990,7 @@ }, { "body": { - "id": 2922, + "id": 2974, "nodeType": "Block", "src": "1634:299:17", "statements": [ @@ -3001,18 +3001,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2889, + "id": 2941, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2885, + "id": 2937, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1648:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3026,14 +3026,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2887, + "id": 2939, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7883, + "referencedDeclaration": 7874, "src": "1663:4:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } } @@ -3041,11 +3041,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } ], - "id": 2886, + "id": 2938, "isConstant": false, "isLValue": false, "isPure": true, @@ -3058,7 +3058,7 @@ }, "typeName": "address" }, - "id": 2888, + "id": 2940, "isConstant": false, "isLValue": false, "isPure": false, @@ -3085,18 +3085,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2895, + "id": 2947, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2893, + "id": 2945, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1716:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3107,11 +3107,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2894, + "id": 2946, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1723:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3131,7 +3131,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2905, + "id": 2957, "isConstant": false, "isLValue": false, "isPure": false, @@ -3141,14 +3141,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2900, + "id": 2952, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1784:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -3156,11 +3156,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 2899, + "id": 2951, "isConstant": false, "isLValue": false, "isPure": true, @@ -3173,7 +3173,7 @@ }, "typeName": "address" }, - "id": 2901, + "id": 2953, "isConstant": false, "isLValue": false, "isPure": false, @@ -3195,7 +3195,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 2903, + "id": 2955, "isConstant": false, "isLValue": false, "isPure": true, @@ -3218,7 +3218,7 @@ "typeString": "int_const 0" } ], - "id": 2902, + "id": 2954, "isConstant": false, "isLValue": false, "isPure": true, @@ -3231,7 +3231,7 @@ }, "typeName": "address" }, - "id": 2904, + "id": 2956, "isConstant": false, "isLValue": false, "isPure": true, @@ -3252,7 +3252,7 @@ } }, "falseBody": { - "id": 2918, + "id": 2970, "nodeType": "Block", "src": "1853:74:17", "statements": [ @@ -3262,11 +3262,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2911, + "id": 2963, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1892:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3278,14 +3278,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2913, + "id": 2965, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7883, + "referencedDeclaration": 7874, "src": "1905:4:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } } @@ -3293,11 +3293,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } ], - "id": 2912, + "id": 2964, "isConstant": false, "isLValue": false, "isPure": true, @@ -3310,7 +3310,7 @@ }, "typeName": "address" }, - "id": 2914, + "id": 2966, "isConstant": false, "isLValue": false, "isPure": false, @@ -3326,11 +3326,11 @@ }, { "argumentTypes": null, - "id": 2915, + "id": 2967, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2880, + "referencedDeclaration": 2932, "src": "1912:3:17", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -3355,32 +3355,32 @@ ], "expression": { "argumentTypes": null, - "id": 2909, + "id": 2961, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1874:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2910, + "id": 2962, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "canCall", "nodeType": "MemberAccess", - "referencedDeclaration": 2798, + "referencedDeclaration": 2850, "src": "1874:17:17", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$_t_bytes4_$returns$_t_bool_$", "typeString": "function (address,address,bytes4) view external returns (bool)" } }, - "id": 2916, + "id": 2968, "isConstant": false, "isLValue": false, "isPure": false, @@ -3394,18 +3394,18 @@ "typeString": "bool" } }, - "functionReturnParameters": 2884, - "id": 2917, + "functionReturnParameters": 2936, + "id": 2969, "nodeType": "Return", "src": "1867:49:17" } ] }, - "id": 2919, + "id": 2971, "nodeType": "IfStatement", "src": "1772:155:17", "trueBody": { - "id": 2908, + "id": 2960, "nodeType": "Block", "src": "1810:37:17", "statements": [ @@ -3413,7 +3413,7 @@ "expression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2906, + "id": 2958, "isConstant": false, "isLValue": false, "isPure": true, @@ -3428,19 +3428,19 @@ }, "value": "false" }, - "functionReturnParameters": 2884, - "id": 2907, + "functionReturnParameters": 2936, + "id": 2959, "nodeType": "Return", "src": "1824:12:17" } ] } }, - "id": 2920, + "id": 2972, "nodeType": "IfStatement", "src": "1712:215:17", "trueBody": { - "id": 2898, + "id": 2950, "nodeType": "Block", "src": "1730:36:17", "statements": [ @@ -3448,7 +3448,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2896, + "id": 2948, "isConstant": false, "isLValue": false, "isPure": true, @@ -3463,19 +3463,19 @@ }, "value": "true" }, - "functionReturnParameters": 2884, - "id": 2897, + "functionReturnParameters": 2936, + "id": 2949, "nodeType": "Return", "src": "1744:11:17" } ] } }, - "id": 2921, + "id": 2973, "nodeType": "IfStatement", "src": "1644:283:17", "trueBody": { - "id": 2892, + "id": 2944, "nodeType": "Block", "src": "1670:36:17", "statements": [ @@ -3483,7 +3483,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2890, + "id": 2942, "isConstant": false, "isLValue": false, "isPure": true, @@ -3498,8 +3498,8 @@ }, "value": "true" }, - "functionReturnParameters": 2884, - "id": 2891, + "functionReturnParameters": 2936, + "id": 2943, "nodeType": "Return", "src": "1684:11:17" } @@ -3509,22 +3509,22 @@ ] }, "documentation": null, - "id": 2923, + "id": 2975, "implemented": true, "kind": "function", "modifiers": [], "name": "isAuthorized", "nodeType": "FunctionDefinition", "parameters": { - "id": 2881, + "id": 2933, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2878, + "id": 2930, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1580:11:17", "stateVariable": false, "storageLocation": "default", @@ -3533,7 +3533,7 @@ "typeString": "address" }, "typeName": { - "id": 2877, + "id": 2929, "name": "address", "nodeType": "ElementaryTypeName", "src": "1580:7:17", @@ -3548,10 +3548,10 @@ }, { "constant": false, - "id": 2880, + "id": 2932, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1593:10:17", "stateVariable": false, "storageLocation": "default", @@ -3560,7 +3560,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2879, + "id": 2931, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "1593:6:17", @@ -3576,15 +3576,15 @@ "src": "1579:25:17" }, "returnParameters": { - "id": 2884, + "id": 2936, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2883, + "id": 2935, "name": "", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1628:4:17", "stateVariable": false, "storageLocation": "default", @@ -3593,7 +3593,7 @@ "typeString": "bool" }, "typeName": { - "id": 2882, + "id": 2934, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1628:4:17", @@ -3608,14 +3608,14 @@ ], "src": "1627:6:17" }, - "scope": 2924, + "scope": 2976, "src": "1558:375:17", "stateMutability": "view", "superFunction": null, "visibility": "internal" } ], - "scope": 2925, + "scope": 2977, "src": "928:1007:17" } ], @@ -3627,7 +3627,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.489Z", + "updatedAt": "2020-04-08T12:21:13.717Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DSAuthEvents.json b/packages/smart-contracts/artifacts/DSAuthEvents.json index 17e02a2..dcf1bb0 100644 --- a/packages/smart-contracts/artifacts/DSAuthEvents.json +++ b/packages/smart-contracts/artifacts/DSAuthEvents.json @@ -39,20 +39,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "exportedSymbols": { "DSAuth": [ - 2924 + 2976 ], "DSAuthEvents": [ - 2808 + 2860 ], "DSAuthority": [ - 2799 + 2851 ] }, - "id": 2925, + "id": 2977, "nodeType": "SourceUnit", "nodes": [ { - "id": 2787, + "id": 2839, "literals": [ "solidity", "0.5", @@ -67,9 +67,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 2799, + "id": 2851, "linearizedBaseContracts": [ - 2799 + 2851 ], "name": "DSAuthority", "nodeType": "ContractDefinition", @@ -77,22 +77,22 @@ { "body": null, "documentation": null, - "id": 2798, + "id": 2850, "implemented": false, "kind": "function", "modifiers": [], "name": "canCall", "nodeType": "FunctionDefinition", "parameters": { - "id": 2794, + "id": 2846, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2789, + "id": 2841, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "721:11:17", "stateVariable": false, "storageLocation": "default", @@ -101,7 +101,7 @@ "typeString": "address" }, "typeName": { - "id": 2788, + "id": 2840, "name": "address", "nodeType": "ElementaryTypeName", "src": "721:7:17", @@ -116,10 +116,10 @@ }, { "constant": false, - "id": 2791, + "id": 2843, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "734:11:17", "stateVariable": false, "storageLocation": "default", @@ -128,7 +128,7 @@ "typeString": "address" }, "typeName": { - "id": 2790, + "id": 2842, "name": "address", "nodeType": "ElementaryTypeName", "src": "734:7:17", @@ -143,10 +143,10 @@ }, { "constant": false, - "id": 2793, + "id": 2845, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "747:10:17", "stateVariable": false, "storageLocation": "default", @@ -155,7 +155,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2792, + "id": 2844, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "747:6:17", @@ -171,15 +171,15 @@ "src": "711:52:17" }, "returnParameters": { - "id": 2797, + "id": 2849, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2796, + "id": 2848, "name": "", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "785:4:17", "stateVariable": false, "storageLocation": "default", @@ -188,7 +188,7 @@ "typeString": "bool" }, "typeName": { - "id": 2795, + "id": 2847, "name": "bool", "nodeType": "ElementaryTypeName", "src": "785:4:17", @@ -203,14 +203,14 @@ ], "src": "784:6:17" }, - "scope": 2799, + "scope": 2851, "src": "695:96:17", "stateMutability": "view", "superFunction": null, "visibility": "public" } ], - "scope": 2925, + "scope": 2977, "src": "668:125:17" }, { @@ -219,9 +219,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2808, + "id": 2860, "linearizedBaseContracts": [ - 2808 + 2860 ], "name": "DSAuthEvents", "nodeType": "ContractDefinition", @@ -229,20 +229,20 @@ { "anonymous": false, "documentation": null, - "id": 2803, + "id": 2855, "name": "LogSetAuthority", "nodeType": "EventDefinition", "parameters": { - "id": 2802, + "id": 2854, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2801, + "id": 2853, "indexed": true, "name": "authority", "nodeType": "VariableDeclaration", - "scope": 2803, + "scope": 2855, "src": "846:25:17", "stateVariable": false, "storageLocation": "default", @@ -251,7 +251,7 @@ "typeString": "address" }, "typeName": { - "id": 2800, + "id": 2852, "name": "address", "nodeType": "ElementaryTypeName", "src": "846:7:17", @@ -272,20 +272,20 @@ { "anonymous": false, "documentation": null, - "id": 2807, + "id": 2859, "name": "LogSetOwner", "nodeType": "EventDefinition", "parameters": { - "id": 2806, + "id": 2858, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2805, + "id": 2857, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2807, + "scope": 2859, "src": "901:21:17", "stateVariable": false, "storageLocation": "default", @@ -294,7 +294,7 @@ "typeString": "address" }, "typeName": { - "id": 2804, + "id": 2856, "name": "address", "nodeType": "ElementaryTypeName", "src": "901:7:17", @@ -313,7 +313,7 @@ "src": "878:46:17" } ], - "scope": 2925, + "scope": 2977, "src": "795:131:17" }, { @@ -322,57 +322,57 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2809, + "id": 2861, "name": "DSAuthEvents", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2808, + "referencedDeclaration": 2860, "src": "947:12:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthEvents_$2808", + "typeIdentifier": "t_contract$_DSAuthEvents_$2860", "typeString": "contract DSAuthEvents" } }, - "id": 2810, + "id": 2862, "nodeType": "InheritanceSpecifier", "src": "947:12:17" } ], "contractDependencies": [ - 2808 + 2860 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2924, + "id": 2976, "linearizedBaseContracts": [ - 2924, - 2808 + 2976, + 2860 ], "name": "DSAuth", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 2812, + "id": 2864, "name": "authority", "nodeType": "VariableDeclaration", - "scope": 2924, + "scope": 2976, "src": "966:30:17", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" }, "typeName": { "contractScope": null, - "id": 2811, + "id": 2863, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "966:11:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -381,10 +381,10 @@ }, { "constant": false, - "id": 2814, + "id": 2866, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2924, + "scope": 2976, "src": "1002:26:17", "stateVariable": true, "storageLocation": "default", @@ -393,7 +393,7 @@ "typeString": "address" }, "typeName": { - "id": 2813, + "id": 2865, "name": "address", "nodeType": "ElementaryTypeName", "src": "1002:7:17", @@ -408,25 +408,25 @@ }, { "body": { - "id": 2827, + "id": 2879, "nodeType": "Block", "src": "1056:73:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2820, + "id": 2872, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2817, + "id": 2869, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1066:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -439,18 +439,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2818, + "id": 2870, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1074:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2819, + "id": 2871, "isConstant": false, "isLValue": false, "isPure": false, @@ -470,7 +470,7 @@ "typeString": "address" } }, - "id": 2821, + "id": 2873, "nodeType": "ExpressionStatement", "src": "1066:18:17" }, @@ -482,18 +482,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2823, + "id": 2875, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1111:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2824, + "id": 2876, "isConstant": false, "isLValue": false, "isPure": false, @@ -515,18 +515,18 @@ "typeString": "address payable" } ], - "id": 2822, + "id": 2874, "name": "LogSetOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2807, + "referencedDeclaration": 2859, "src": "1099:11:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2825, + "id": 2877, "isConstant": false, "isLValue": false, "isPure": false, @@ -540,32 +540,32 @@ "typeString": "tuple()" } }, - "id": 2826, + "id": 2878, "nodeType": "EmitStatement", "src": "1094:28:17" } ] }, "documentation": null, - "id": 2828, + "id": 2880, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 2815, + "id": 2867, "nodeType": "ParameterList", "parameters": [], "src": "1046:2:17" }, "returnParameters": { - "id": 2816, + "id": 2868, "nodeType": "ParameterList", "parameters": [], "src": "1056:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1035:94:17", "stateMutability": "nonpayable", "superFunction": null, @@ -573,25 +573,25 @@ }, { "body": { - "id": 2843, + "id": 2895, "nodeType": "Block", "src": "1201:64:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2837, + "id": 2889, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2835, + "id": 2887, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1211:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -602,11 +602,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2836, + "id": 2888, "name": "owner_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2830, + "referencedDeclaration": 2882, "src": "1219:6:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -619,7 +619,7 @@ "typeString": "address" } }, - "id": 2838, + "id": 2890, "nodeType": "ExpressionStatement", "src": "1211:14:17" }, @@ -629,11 +629,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2840, + "id": 2892, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1252:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -648,18 +648,18 @@ "typeString": "address" } ], - "id": 2839, + "id": 2891, "name": "LogSetOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2807, + "referencedDeclaration": 2859, "src": "1240:11:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2841, + "id": 2893, "isConstant": false, "isLValue": false, "isPure": false, @@ -673,27 +673,27 @@ "typeString": "tuple()" } }, - "id": 2842, + "id": 2894, "nodeType": "EmitStatement", "src": "1235:23:17" } ] }, "documentation": null, - "id": 2844, + "id": 2896, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 2833, + "id": 2885, "modifierName": { "argumentTypes": null, - "id": 2832, + "id": 2884, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1192:4:17", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -707,15 +707,15 @@ "name": "setOwner", "nodeType": "FunctionDefinition", "parameters": { - "id": 2831, + "id": 2883, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2830, + "id": 2882, "name": "owner_", "nodeType": "VariableDeclaration", - "scope": 2844, + "scope": 2896, "src": "1153:14:17", "stateVariable": false, "storageLocation": "default", @@ -724,7 +724,7 @@ "typeString": "address" }, "typeName": { - "id": 2829, + "id": 2881, "name": "address", "nodeType": "ElementaryTypeName", "src": "1153:7:17", @@ -741,12 +741,12 @@ "src": "1152:16:17" }, "returnParameters": { - "id": 2834, + "id": 2886, "nodeType": "ParameterList", "parameters": [], "src": "1201:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1135:130:17", "stateMutability": "nonpayable", "superFunction": null, @@ -754,28 +754,28 @@ }, { "body": { - "id": 2861, + "id": 2913, "nodeType": "Block", "src": "1349:89:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2853, + "id": 2905, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2851, + "id": 2903, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1359:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -783,24 +783,24 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2852, + "id": 2904, "name": "authority_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2846, + "referencedDeclaration": 2898, "src": "1371:10:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, "src": "1359:22:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2854, + "id": 2906, "nodeType": "ExpressionStatement", "src": "1359:22:17" }, @@ -813,14 +813,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2857, + "id": 2909, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1420:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -828,11 +828,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 2856, + "id": 2908, "isConstant": false, "isLValue": false, "isPure": true, @@ -845,7 +845,7 @@ }, "typeName": "address" }, - "id": 2858, + "id": 2910, "isConstant": false, "isLValue": false, "isPure": false, @@ -867,18 +867,18 @@ "typeString": "address" } ], - "id": 2855, + "id": 2907, "name": "LogSetAuthority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2803, + "referencedDeclaration": 2855, "src": "1396:15:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2859, + "id": 2911, "isConstant": false, "isLValue": false, "isPure": false, @@ -892,27 +892,27 @@ "typeString": "tuple()" } }, - "id": 2860, + "id": 2912, "nodeType": "EmitStatement", "src": "1391:40:17" } ] }, "documentation": null, - "id": 2862, + "id": 2914, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 2849, + "id": 2901, "modifierName": { "argumentTypes": null, - "id": 2848, + "id": 2900, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1340:4:17", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -926,31 +926,31 @@ "name": "setAuthority", "nodeType": "FunctionDefinition", "parameters": { - "id": 2847, + "id": 2899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2846, + "id": 2898, "name": "authority_", "nodeType": "VariableDeclaration", - "scope": 2862, + "scope": 2914, "src": "1293:22:17", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" }, "typeName": { "contractScope": null, - "id": 2845, + "id": 2897, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "1293:11:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -961,12 +961,12 @@ "src": "1292:24:17" }, "returnParameters": { - "id": 2850, + "id": 2902, "nodeType": "ParameterList", "parameters": [], "src": "1349:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1271:167:17", "stateMutability": "nonpayable", "superFunction": null, @@ -974,7 +974,7 @@ }, { "body": { - "id": 2875, + "id": 2927, "nodeType": "Block", "src": "1458:94:17", "statements": [ @@ -989,18 +989,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2866, + "id": 2918, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1489:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2867, + "id": 2919, "isConstant": false, "isLValue": false, "isPure": false, @@ -1018,18 +1018,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2868, + "id": 2920, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1501:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2869, + "id": 2921, "isConstant": false, "isLValue": false, "isPure": false, @@ -1055,18 +1055,18 @@ "typeString": "bytes4" } ], - "id": 2865, + "id": 2917, "name": "isAuthorized", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, + "referencedDeclaration": 2975, "src": "1476:12:17", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_bytes4_$returns$_t_bool_$", "typeString": "function (address,bytes4) view returns (bool)" } }, - "id": 2870, + "id": 2922, "isConstant": false, "isLValue": false, "isPure": false, @@ -1083,7 +1083,7 @@ { "argumentTypes": null, "hexValue": "64732d617574682d756e617574686f72697a6564", - "id": 2871, + "id": 2923, "isConstant": false, "isLValue": false, "isPure": true, @@ -1110,21 +1110,21 @@ "typeString": "literal_string \"ds-auth-unauthorized\"" } ], - "id": 2864, + "id": 2916, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1468:7:17", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2872, + "id": 2924, "isConstant": false, "isLValue": false, "isPure": false, @@ -1138,23 +1138,23 @@ "typeString": "tuple()" } }, - "id": 2873, + "id": 2925, "nodeType": "ExpressionStatement", "src": "1468:66:17" }, { - "id": 2874, + "id": 2926, "nodeType": "PlaceholderStatement", "src": "1544:1:17" } ] }, "documentation": null, - "id": 2876, + "id": 2928, "name": "auth", "nodeType": "ModifierDefinition", "parameters": { - "id": 2863, + "id": 2915, "nodeType": "ParameterList", "parameters": [], "src": "1458:0:17" @@ -1164,7 +1164,7 @@ }, { "body": { - "id": 2922, + "id": 2974, "nodeType": "Block", "src": "1634:299:17", "statements": [ @@ -1175,18 +1175,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2889, + "id": 2941, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2885, + "id": 2937, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1648:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1200,14 +1200,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2887, + "id": 2939, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7883, + "referencedDeclaration": 7874, "src": "1663:4:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } } @@ -1215,11 +1215,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } ], - "id": 2886, + "id": 2938, "isConstant": false, "isLValue": false, "isPure": true, @@ -1232,7 +1232,7 @@ }, "typeName": "address" }, - "id": 2888, + "id": 2940, "isConstant": false, "isLValue": false, "isPure": false, @@ -1259,18 +1259,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2895, + "id": 2947, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2893, + "id": 2945, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1716:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1281,11 +1281,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2894, + "id": 2946, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1723:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1305,7 +1305,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2905, + "id": 2957, "isConstant": false, "isLValue": false, "isPure": false, @@ -1315,14 +1315,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2900, + "id": 2952, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1784:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -1330,11 +1330,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 2899, + "id": 2951, "isConstant": false, "isLValue": false, "isPure": true, @@ -1347,7 +1347,7 @@ }, "typeName": "address" }, - "id": 2901, + "id": 2953, "isConstant": false, "isLValue": false, "isPure": false, @@ -1369,7 +1369,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 2903, + "id": 2955, "isConstant": false, "isLValue": false, "isPure": true, @@ -1392,7 +1392,7 @@ "typeString": "int_const 0" } ], - "id": 2902, + "id": 2954, "isConstant": false, "isLValue": false, "isPure": true, @@ -1405,7 +1405,7 @@ }, "typeName": "address" }, - "id": 2904, + "id": 2956, "isConstant": false, "isLValue": false, "isPure": true, @@ -1426,7 +1426,7 @@ } }, "falseBody": { - "id": 2918, + "id": 2970, "nodeType": "Block", "src": "1853:74:17", "statements": [ @@ -1436,11 +1436,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2911, + "id": 2963, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1892:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1452,14 +1452,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2913, + "id": 2965, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7883, + "referencedDeclaration": 7874, "src": "1905:4:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } } @@ -1467,11 +1467,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } ], - "id": 2912, + "id": 2964, "isConstant": false, "isLValue": false, "isPure": true, @@ -1484,7 +1484,7 @@ }, "typeName": "address" }, - "id": 2914, + "id": 2966, "isConstant": false, "isLValue": false, "isPure": false, @@ -1500,11 +1500,11 @@ }, { "argumentTypes": null, - "id": 2915, + "id": 2967, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2880, + "referencedDeclaration": 2932, "src": "1912:3:17", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1529,32 +1529,32 @@ ], "expression": { "argumentTypes": null, - "id": 2909, + "id": 2961, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1874:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2910, + "id": 2962, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "canCall", "nodeType": "MemberAccess", - "referencedDeclaration": 2798, + "referencedDeclaration": 2850, "src": "1874:17:17", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$_t_bytes4_$returns$_t_bool_$", "typeString": "function (address,address,bytes4) view external returns (bool)" } }, - "id": 2916, + "id": 2968, "isConstant": false, "isLValue": false, "isPure": false, @@ -1568,18 +1568,18 @@ "typeString": "bool" } }, - "functionReturnParameters": 2884, - "id": 2917, + "functionReturnParameters": 2936, + "id": 2969, "nodeType": "Return", "src": "1867:49:17" } ] }, - "id": 2919, + "id": 2971, "nodeType": "IfStatement", "src": "1772:155:17", "trueBody": { - "id": 2908, + "id": 2960, "nodeType": "Block", "src": "1810:37:17", "statements": [ @@ -1587,7 +1587,7 @@ "expression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2906, + "id": 2958, "isConstant": false, "isLValue": false, "isPure": true, @@ -1602,19 +1602,19 @@ }, "value": "false" }, - "functionReturnParameters": 2884, - "id": 2907, + "functionReturnParameters": 2936, + "id": 2959, "nodeType": "Return", "src": "1824:12:17" } ] } }, - "id": 2920, + "id": 2972, "nodeType": "IfStatement", "src": "1712:215:17", "trueBody": { - "id": 2898, + "id": 2950, "nodeType": "Block", "src": "1730:36:17", "statements": [ @@ -1622,7 +1622,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2896, + "id": 2948, "isConstant": false, "isLValue": false, "isPure": true, @@ -1637,19 +1637,19 @@ }, "value": "true" }, - "functionReturnParameters": 2884, - "id": 2897, + "functionReturnParameters": 2936, + "id": 2949, "nodeType": "Return", "src": "1744:11:17" } ] } }, - "id": 2921, + "id": 2973, "nodeType": "IfStatement", "src": "1644:283:17", "trueBody": { - "id": 2892, + "id": 2944, "nodeType": "Block", "src": "1670:36:17", "statements": [ @@ -1657,7 +1657,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2890, + "id": 2942, "isConstant": false, "isLValue": false, "isPure": true, @@ -1672,8 +1672,8 @@ }, "value": "true" }, - "functionReturnParameters": 2884, - "id": 2891, + "functionReturnParameters": 2936, + "id": 2943, "nodeType": "Return", "src": "1684:11:17" } @@ -1683,22 +1683,22 @@ ] }, "documentation": null, - "id": 2923, + "id": 2975, "implemented": true, "kind": "function", "modifiers": [], "name": "isAuthorized", "nodeType": "FunctionDefinition", "parameters": { - "id": 2881, + "id": 2933, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2878, + "id": 2930, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1580:11:17", "stateVariable": false, "storageLocation": "default", @@ -1707,7 +1707,7 @@ "typeString": "address" }, "typeName": { - "id": 2877, + "id": 2929, "name": "address", "nodeType": "ElementaryTypeName", "src": "1580:7:17", @@ -1722,10 +1722,10 @@ }, { "constant": false, - "id": 2880, + "id": 2932, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1593:10:17", "stateVariable": false, "storageLocation": "default", @@ -1734,7 +1734,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2879, + "id": 2931, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "1593:6:17", @@ -1750,15 +1750,15 @@ "src": "1579:25:17" }, "returnParameters": { - "id": 2884, + "id": 2936, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2883, + "id": 2935, "name": "", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1628:4:17", "stateVariable": false, "storageLocation": "default", @@ -1767,7 +1767,7 @@ "typeString": "bool" }, "typeName": { - "id": 2882, + "id": 2934, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1628:4:17", @@ -1782,14 +1782,14 @@ ], "src": "1627:6:17" }, - "scope": 2924, + "scope": 2976, "src": "1558:375:17", "stateMutability": "view", "superFunction": null, "visibility": "internal" } ], - "scope": 2925, + "scope": 2977, "src": "928:1007:17" } ], @@ -1799,20 +1799,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "exportedSymbols": { "DSAuth": [ - 2924 + 2976 ], "DSAuthEvents": [ - 2808 + 2860 ], "DSAuthority": [ - 2799 + 2851 ] }, - "id": 2925, + "id": 2977, "nodeType": "SourceUnit", "nodes": [ { - "id": 2787, + "id": 2839, "literals": [ "solidity", "0.5", @@ -1827,9 +1827,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 2799, + "id": 2851, "linearizedBaseContracts": [ - 2799 + 2851 ], "name": "DSAuthority", "nodeType": "ContractDefinition", @@ -1837,22 +1837,22 @@ { "body": null, "documentation": null, - "id": 2798, + "id": 2850, "implemented": false, "kind": "function", "modifiers": [], "name": "canCall", "nodeType": "FunctionDefinition", "parameters": { - "id": 2794, + "id": 2846, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2789, + "id": 2841, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "721:11:17", "stateVariable": false, "storageLocation": "default", @@ -1861,7 +1861,7 @@ "typeString": "address" }, "typeName": { - "id": 2788, + "id": 2840, "name": "address", "nodeType": "ElementaryTypeName", "src": "721:7:17", @@ -1876,10 +1876,10 @@ }, { "constant": false, - "id": 2791, + "id": 2843, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "734:11:17", "stateVariable": false, "storageLocation": "default", @@ -1888,7 +1888,7 @@ "typeString": "address" }, "typeName": { - "id": 2790, + "id": 2842, "name": "address", "nodeType": "ElementaryTypeName", "src": "734:7:17", @@ -1903,10 +1903,10 @@ }, { "constant": false, - "id": 2793, + "id": 2845, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "747:10:17", "stateVariable": false, "storageLocation": "default", @@ -1915,7 +1915,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2792, + "id": 2844, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "747:6:17", @@ -1931,15 +1931,15 @@ "src": "711:52:17" }, "returnParameters": { - "id": 2797, + "id": 2849, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2796, + "id": 2848, "name": "", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "785:4:17", "stateVariable": false, "storageLocation": "default", @@ -1948,7 +1948,7 @@ "typeString": "bool" }, "typeName": { - "id": 2795, + "id": 2847, "name": "bool", "nodeType": "ElementaryTypeName", "src": "785:4:17", @@ -1963,14 +1963,14 @@ ], "src": "784:6:17" }, - "scope": 2799, + "scope": 2851, "src": "695:96:17", "stateMutability": "view", "superFunction": null, "visibility": "public" } ], - "scope": 2925, + "scope": 2977, "src": "668:125:17" }, { @@ -1979,9 +1979,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2808, + "id": 2860, "linearizedBaseContracts": [ - 2808 + 2860 ], "name": "DSAuthEvents", "nodeType": "ContractDefinition", @@ -1989,20 +1989,20 @@ { "anonymous": false, "documentation": null, - "id": 2803, + "id": 2855, "name": "LogSetAuthority", "nodeType": "EventDefinition", "parameters": { - "id": 2802, + "id": 2854, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2801, + "id": 2853, "indexed": true, "name": "authority", "nodeType": "VariableDeclaration", - "scope": 2803, + "scope": 2855, "src": "846:25:17", "stateVariable": false, "storageLocation": "default", @@ -2011,7 +2011,7 @@ "typeString": "address" }, "typeName": { - "id": 2800, + "id": 2852, "name": "address", "nodeType": "ElementaryTypeName", "src": "846:7:17", @@ -2032,20 +2032,20 @@ { "anonymous": false, "documentation": null, - "id": 2807, + "id": 2859, "name": "LogSetOwner", "nodeType": "EventDefinition", "parameters": { - "id": 2806, + "id": 2858, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2805, + "id": 2857, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2807, + "scope": 2859, "src": "901:21:17", "stateVariable": false, "storageLocation": "default", @@ -2054,7 +2054,7 @@ "typeString": "address" }, "typeName": { - "id": 2804, + "id": 2856, "name": "address", "nodeType": "ElementaryTypeName", "src": "901:7:17", @@ -2073,7 +2073,7 @@ "src": "878:46:17" } ], - "scope": 2925, + "scope": 2977, "src": "795:131:17" }, { @@ -2082,57 +2082,57 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2809, + "id": 2861, "name": "DSAuthEvents", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2808, + "referencedDeclaration": 2860, "src": "947:12:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthEvents_$2808", + "typeIdentifier": "t_contract$_DSAuthEvents_$2860", "typeString": "contract DSAuthEvents" } }, - "id": 2810, + "id": 2862, "nodeType": "InheritanceSpecifier", "src": "947:12:17" } ], "contractDependencies": [ - 2808 + 2860 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2924, + "id": 2976, "linearizedBaseContracts": [ - 2924, - 2808 + 2976, + 2860 ], "name": "DSAuth", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 2812, + "id": 2864, "name": "authority", "nodeType": "VariableDeclaration", - "scope": 2924, + "scope": 2976, "src": "966:30:17", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" }, "typeName": { "contractScope": null, - "id": 2811, + "id": 2863, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "966:11:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -2141,10 +2141,10 @@ }, { "constant": false, - "id": 2814, + "id": 2866, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2924, + "scope": 2976, "src": "1002:26:17", "stateVariable": true, "storageLocation": "default", @@ -2153,7 +2153,7 @@ "typeString": "address" }, "typeName": { - "id": 2813, + "id": 2865, "name": "address", "nodeType": "ElementaryTypeName", "src": "1002:7:17", @@ -2168,25 +2168,25 @@ }, { "body": { - "id": 2827, + "id": 2879, "nodeType": "Block", "src": "1056:73:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2820, + "id": 2872, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2817, + "id": 2869, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1066:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2199,18 +2199,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2818, + "id": 2870, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1074:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2819, + "id": 2871, "isConstant": false, "isLValue": false, "isPure": false, @@ -2230,7 +2230,7 @@ "typeString": "address" } }, - "id": 2821, + "id": 2873, "nodeType": "ExpressionStatement", "src": "1066:18:17" }, @@ -2242,18 +2242,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2823, + "id": 2875, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1111:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2824, + "id": 2876, "isConstant": false, "isLValue": false, "isPure": false, @@ -2275,18 +2275,18 @@ "typeString": "address payable" } ], - "id": 2822, + "id": 2874, "name": "LogSetOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2807, + "referencedDeclaration": 2859, "src": "1099:11:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2825, + "id": 2877, "isConstant": false, "isLValue": false, "isPure": false, @@ -2300,32 +2300,32 @@ "typeString": "tuple()" } }, - "id": 2826, + "id": 2878, "nodeType": "EmitStatement", "src": "1094:28:17" } ] }, "documentation": null, - "id": 2828, + "id": 2880, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 2815, + "id": 2867, "nodeType": "ParameterList", "parameters": [], "src": "1046:2:17" }, "returnParameters": { - "id": 2816, + "id": 2868, "nodeType": "ParameterList", "parameters": [], "src": "1056:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1035:94:17", "stateMutability": "nonpayable", "superFunction": null, @@ -2333,25 +2333,25 @@ }, { "body": { - "id": 2843, + "id": 2895, "nodeType": "Block", "src": "1201:64:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2837, + "id": 2889, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2835, + "id": 2887, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1211:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2362,11 +2362,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2836, + "id": 2888, "name": "owner_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2830, + "referencedDeclaration": 2882, "src": "1219:6:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2379,7 +2379,7 @@ "typeString": "address" } }, - "id": 2838, + "id": 2890, "nodeType": "ExpressionStatement", "src": "1211:14:17" }, @@ -2389,11 +2389,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2840, + "id": 2892, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1252:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2408,18 +2408,18 @@ "typeString": "address" } ], - "id": 2839, + "id": 2891, "name": "LogSetOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2807, + "referencedDeclaration": 2859, "src": "1240:11:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2841, + "id": 2893, "isConstant": false, "isLValue": false, "isPure": false, @@ -2433,27 +2433,27 @@ "typeString": "tuple()" } }, - "id": 2842, + "id": 2894, "nodeType": "EmitStatement", "src": "1235:23:17" } ] }, "documentation": null, - "id": 2844, + "id": 2896, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 2833, + "id": 2885, "modifierName": { "argumentTypes": null, - "id": 2832, + "id": 2884, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1192:4:17", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2467,15 +2467,15 @@ "name": "setOwner", "nodeType": "FunctionDefinition", "parameters": { - "id": 2831, + "id": 2883, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2830, + "id": 2882, "name": "owner_", "nodeType": "VariableDeclaration", - "scope": 2844, + "scope": 2896, "src": "1153:14:17", "stateVariable": false, "storageLocation": "default", @@ -2484,7 +2484,7 @@ "typeString": "address" }, "typeName": { - "id": 2829, + "id": 2881, "name": "address", "nodeType": "ElementaryTypeName", "src": "1153:7:17", @@ -2501,12 +2501,12 @@ "src": "1152:16:17" }, "returnParameters": { - "id": 2834, + "id": 2886, "nodeType": "ParameterList", "parameters": [], "src": "1201:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1135:130:17", "stateMutability": "nonpayable", "superFunction": null, @@ -2514,28 +2514,28 @@ }, { "body": { - "id": 2861, + "id": 2913, "nodeType": "Block", "src": "1349:89:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2853, + "id": 2905, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2851, + "id": 2903, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1359:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -2543,24 +2543,24 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2852, + "id": 2904, "name": "authority_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2846, + "referencedDeclaration": 2898, "src": "1371:10:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, "src": "1359:22:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2854, + "id": 2906, "nodeType": "ExpressionStatement", "src": "1359:22:17" }, @@ -2573,14 +2573,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2857, + "id": 2909, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1420:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -2588,11 +2588,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 2856, + "id": 2908, "isConstant": false, "isLValue": false, "isPure": true, @@ -2605,7 +2605,7 @@ }, "typeName": "address" }, - "id": 2858, + "id": 2910, "isConstant": false, "isLValue": false, "isPure": false, @@ -2627,18 +2627,18 @@ "typeString": "address" } ], - "id": 2855, + "id": 2907, "name": "LogSetAuthority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2803, + "referencedDeclaration": 2855, "src": "1396:15:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2859, + "id": 2911, "isConstant": false, "isLValue": false, "isPure": false, @@ -2652,27 +2652,27 @@ "typeString": "tuple()" } }, - "id": 2860, + "id": 2912, "nodeType": "EmitStatement", "src": "1391:40:17" } ] }, "documentation": null, - "id": 2862, + "id": 2914, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 2849, + "id": 2901, "modifierName": { "argumentTypes": null, - "id": 2848, + "id": 2900, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1340:4:17", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2686,31 +2686,31 @@ "name": "setAuthority", "nodeType": "FunctionDefinition", "parameters": { - "id": 2847, + "id": 2899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2846, + "id": 2898, "name": "authority_", "nodeType": "VariableDeclaration", - "scope": 2862, + "scope": 2914, "src": "1293:22:17", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" }, "typeName": { "contractScope": null, - "id": 2845, + "id": 2897, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "1293:11:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -2721,12 +2721,12 @@ "src": "1292:24:17" }, "returnParameters": { - "id": 2850, + "id": 2902, "nodeType": "ParameterList", "parameters": [], "src": "1349:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1271:167:17", "stateMutability": "nonpayable", "superFunction": null, @@ -2734,7 +2734,7 @@ }, { "body": { - "id": 2875, + "id": 2927, "nodeType": "Block", "src": "1458:94:17", "statements": [ @@ -2749,18 +2749,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2866, + "id": 2918, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1489:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2867, + "id": 2919, "isConstant": false, "isLValue": false, "isPure": false, @@ -2778,18 +2778,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2868, + "id": 2920, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1501:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2869, + "id": 2921, "isConstant": false, "isLValue": false, "isPure": false, @@ -2815,18 +2815,18 @@ "typeString": "bytes4" } ], - "id": 2865, + "id": 2917, "name": "isAuthorized", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, + "referencedDeclaration": 2975, "src": "1476:12:17", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_bytes4_$returns$_t_bool_$", "typeString": "function (address,bytes4) view returns (bool)" } }, - "id": 2870, + "id": 2922, "isConstant": false, "isLValue": false, "isPure": false, @@ -2843,7 +2843,7 @@ { "argumentTypes": null, "hexValue": "64732d617574682d756e617574686f72697a6564", - "id": 2871, + "id": 2923, "isConstant": false, "isLValue": false, "isPure": true, @@ -2870,21 +2870,21 @@ "typeString": "literal_string \"ds-auth-unauthorized\"" } ], - "id": 2864, + "id": 2916, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1468:7:17", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2872, + "id": 2924, "isConstant": false, "isLValue": false, "isPure": false, @@ -2898,23 +2898,23 @@ "typeString": "tuple()" } }, - "id": 2873, + "id": 2925, "nodeType": "ExpressionStatement", "src": "1468:66:17" }, { - "id": 2874, + "id": 2926, "nodeType": "PlaceholderStatement", "src": "1544:1:17" } ] }, "documentation": null, - "id": 2876, + "id": 2928, "name": "auth", "nodeType": "ModifierDefinition", "parameters": { - "id": 2863, + "id": 2915, "nodeType": "ParameterList", "parameters": [], "src": "1458:0:17" @@ -2924,7 +2924,7 @@ }, { "body": { - "id": 2922, + "id": 2974, "nodeType": "Block", "src": "1634:299:17", "statements": [ @@ -2935,18 +2935,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2889, + "id": 2941, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2885, + "id": 2937, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1648:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2960,14 +2960,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2887, + "id": 2939, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7883, + "referencedDeclaration": 7874, "src": "1663:4:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } } @@ -2975,11 +2975,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } ], - "id": 2886, + "id": 2938, "isConstant": false, "isLValue": false, "isPure": true, @@ -2992,7 +2992,7 @@ }, "typeName": "address" }, - "id": 2888, + "id": 2940, "isConstant": false, "isLValue": false, "isPure": false, @@ -3019,18 +3019,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2895, + "id": 2947, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2893, + "id": 2945, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1716:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3041,11 +3041,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2894, + "id": 2946, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1723:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3065,7 +3065,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2905, + "id": 2957, "isConstant": false, "isLValue": false, "isPure": false, @@ -3075,14 +3075,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2900, + "id": 2952, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1784:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -3090,11 +3090,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 2899, + "id": 2951, "isConstant": false, "isLValue": false, "isPure": true, @@ -3107,7 +3107,7 @@ }, "typeName": "address" }, - "id": 2901, + "id": 2953, "isConstant": false, "isLValue": false, "isPure": false, @@ -3129,7 +3129,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 2903, + "id": 2955, "isConstant": false, "isLValue": false, "isPure": true, @@ -3152,7 +3152,7 @@ "typeString": "int_const 0" } ], - "id": 2902, + "id": 2954, "isConstant": false, "isLValue": false, "isPure": true, @@ -3165,7 +3165,7 @@ }, "typeName": "address" }, - "id": 2904, + "id": 2956, "isConstant": false, "isLValue": false, "isPure": true, @@ -3186,7 +3186,7 @@ } }, "falseBody": { - "id": 2918, + "id": 2970, "nodeType": "Block", "src": "1853:74:17", "statements": [ @@ -3196,11 +3196,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2911, + "id": 2963, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1892:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3212,14 +3212,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2913, + "id": 2965, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7883, + "referencedDeclaration": 7874, "src": "1905:4:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } } @@ -3227,11 +3227,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } ], - "id": 2912, + "id": 2964, "isConstant": false, "isLValue": false, "isPure": true, @@ -3244,7 +3244,7 @@ }, "typeName": "address" }, - "id": 2914, + "id": 2966, "isConstant": false, "isLValue": false, "isPure": false, @@ -3260,11 +3260,11 @@ }, { "argumentTypes": null, - "id": 2915, + "id": 2967, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2880, + "referencedDeclaration": 2932, "src": "1912:3:17", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -3289,32 +3289,32 @@ ], "expression": { "argumentTypes": null, - "id": 2909, + "id": 2961, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1874:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2910, + "id": 2962, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "canCall", "nodeType": "MemberAccess", - "referencedDeclaration": 2798, + "referencedDeclaration": 2850, "src": "1874:17:17", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$_t_bytes4_$returns$_t_bool_$", "typeString": "function (address,address,bytes4) view external returns (bool)" } }, - "id": 2916, + "id": 2968, "isConstant": false, "isLValue": false, "isPure": false, @@ -3328,18 +3328,18 @@ "typeString": "bool" } }, - "functionReturnParameters": 2884, - "id": 2917, + "functionReturnParameters": 2936, + "id": 2969, "nodeType": "Return", "src": "1867:49:17" } ] }, - "id": 2919, + "id": 2971, "nodeType": "IfStatement", "src": "1772:155:17", "trueBody": { - "id": 2908, + "id": 2960, "nodeType": "Block", "src": "1810:37:17", "statements": [ @@ -3347,7 +3347,7 @@ "expression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2906, + "id": 2958, "isConstant": false, "isLValue": false, "isPure": true, @@ -3362,19 +3362,19 @@ }, "value": "false" }, - "functionReturnParameters": 2884, - "id": 2907, + "functionReturnParameters": 2936, + "id": 2959, "nodeType": "Return", "src": "1824:12:17" } ] } }, - "id": 2920, + "id": 2972, "nodeType": "IfStatement", "src": "1712:215:17", "trueBody": { - "id": 2898, + "id": 2950, "nodeType": "Block", "src": "1730:36:17", "statements": [ @@ -3382,7 +3382,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2896, + "id": 2948, "isConstant": false, "isLValue": false, "isPure": true, @@ -3397,19 +3397,19 @@ }, "value": "true" }, - "functionReturnParameters": 2884, - "id": 2897, + "functionReturnParameters": 2936, + "id": 2949, "nodeType": "Return", "src": "1744:11:17" } ] } }, - "id": 2921, + "id": 2973, "nodeType": "IfStatement", "src": "1644:283:17", "trueBody": { - "id": 2892, + "id": 2944, "nodeType": "Block", "src": "1670:36:17", "statements": [ @@ -3417,7 +3417,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2890, + "id": 2942, "isConstant": false, "isLValue": false, "isPure": true, @@ -3432,8 +3432,8 @@ }, "value": "true" }, - "functionReturnParameters": 2884, - "id": 2891, + "functionReturnParameters": 2936, + "id": 2943, "nodeType": "Return", "src": "1684:11:17" } @@ -3443,22 +3443,22 @@ ] }, "documentation": null, - "id": 2923, + "id": 2975, "implemented": true, "kind": "function", "modifiers": [], "name": "isAuthorized", "nodeType": "FunctionDefinition", "parameters": { - "id": 2881, + "id": 2933, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2878, + "id": 2930, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1580:11:17", "stateVariable": false, "storageLocation": "default", @@ -3467,7 +3467,7 @@ "typeString": "address" }, "typeName": { - "id": 2877, + "id": 2929, "name": "address", "nodeType": "ElementaryTypeName", "src": "1580:7:17", @@ -3482,10 +3482,10 @@ }, { "constant": false, - "id": 2880, + "id": 2932, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1593:10:17", "stateVariable": false, "storageLocation": "default", @@ -3494,7 +3494,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2879, + "id": 2931, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "1593:6:17", @@ -3510,15 +3510,15 @@ "src": "1579:25:17" }, "returnParameters": { - "id": 2884, + "id": 2936, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2883, + "id": 2935, "name": "", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1628:4:17", "stateVariable": false, "storageLocation": "default", @@ -3527,7 +3527,7 @@ "typeString": "bool" }, "typeName": { - "id": 2882, + "id": 2934, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1628:4:17", @@ -3542,14 +3542,14 @@ ], "src": "1627:6:17" }, - "scope": 2924, + "scope": 2976, "src": "1558:375:17", "stateMutability": "view", "superFunction": null, "visibility": "internal" } ], - "scope": 2925, + "scope": 2977, "src": "928:1007:17" } ], @@ -3561,7 +3561,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.491Z", + "updatedAt": "2020-04-08T12:21:13.725Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DSAuthority.json b/packages/smart-contracts/artifacts/DSAuthority.json index 91aeb59..f9c311e 100644 --- a/packages/smart-contracts/artifacts/DSAuthority.json +++ b/packages/smart-contracts/artifacts/DSAuthority.json @@ -44,20 +44,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "exportedSymbols": { "DSAuth": [ - 2924 + 2976 ], "DSAuthEvents": [ - 2808 + 2860 ], "DSAuthority": [ - 2799 + 2851 ] }, - "id": 2925, + "id": 2977, "nodeType": "SourceUnit", "nodes": [ { - "id": 2787, + "id": 2839, "literals": [ "solidity", "0.5", @@ -72,9 +72,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 2799, + "id": 2851, "linearizedBaseContracts": [ - 2799 + 2851 ], "name": "DSAuthority", "nodeType": "ContractDefinition", @@ -82,22 +82,22 @@ { "body": null, "documentation": null, - "id": 2798, + "id": 2850, "implemented": false, "kind": "function", "modifiers": [], "name": "canCall", "nodeType": "FunctionDefinition", "parameters": { - "id": 2794, + "id": 2846, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2789, + "id": 2841, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "721:11:17", "stateVariable": false, "storageLocation": "default", @@ -106,7 +106,7 @@ "typeString": "address" }, "typeName": { - "id": 2788, + "id": 2840, "name": "address", "nodeType": "ElementaryTypeName", "src": "721:7:17", @@ -121,10 +121,10 @@ }, { "constant": false, - "id": 2791, + "id": 2843, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "734:11:17", "stateVariable": false, "storageLocation": "default", @@ -133,7 +133,7 @@ "typeString": "address" }, "typeName": { - "id": 2790, + "id": 2842, "name": "address", "nodeType": "ElementaryTypeName", "src": "734:7:17", @@ -148,10 +148,10 @@ }, { "constant": false, - "id": 2793, + "id": 2845, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "747:10:17", "stateVariable": false, "storageLocation": "default", @@ -160,7 +160,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2792, + "id": 2844, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "747:6:17", @@ -176,15 +176,15 @@ "src": "711:52:17" }, "returnParameters": { - "id": 2797, + "id": 2849, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2796, + "id": 2848, "name": "", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "785:4:17", "stateVariable": false, "storageLocation": "default", @@ -193,7 +193,7 @@ "typeString": "bool" }, "typeName": { - "id": 2795, + "id": 2847, "name": "bool", "nodeType": "ElementaryTypeName", "src": "785:4:17", @@ -208,14 +208,14 @@ ], "src": "784:6:17" }, - "scope": 2799, + "scope": 2851, "src": "695:96:17", "stateMutability": "view", "superFunction": null, "visibility": "public" } ], - "scope": 2925, + "scope": 2977, "src": "668:125:17" }, { @@ -224,9 +224,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2808, + "id": 2860, "linearizedBaseContracts": [ - 2808 + 2860 ], "name": "DSAuthEvents", "nodeType": "ContractDefinition", @@ -234,20 +234,20 @@ { "anonymous": false, "documentation": null, - "id": 2803, + "id": 2855, "name": "LogSetAuthority", "nodeType": "EventDefinition", "parameters": { - "id": 2802, + "id": 2854, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2801, + "id": 2853, "indexed": true, "name": "authority", "nodeType": "VariableDeclaration", - "scope": 2803, + "scope": 2855, "src": "846:25:17", "stateVariable": false, "storageLocation": "default", @@ -256,7 +256,7 @@ "typeString": "address" }, "typeName": { - "id": 2800, + "id": 2852, "name": "address", "nodeType": "ElementaryTypeName", "src": "846:7:17", @@ -277,20 +277,20 @@ { "anonymous": false, "documentation": null, - "id": 2807, + "id": 2859, "name": "LogSetOwner", "nodeType": "EventDefinition", "parameters": { - "id": 2806, + "id": 2858, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2805, + "id": 2857, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2807, + "scope": 2859, "src": "901:21:17", "stateVariable": false, "storageLocation": "default", @@ -299,7 +299,7 @@ "typeString": "address" }, "typeName": { - "id": 2804, + "id": 2856, "name": "address", "nodeType": "ElementaryTypeName", "src": "901:7:17", @@ -318,7 +318,7 @@ "src": "878:46:17" } ], - "scope": 2925, + "scope": 2977, "src": "795:131:17" }, { @@ -327,57 +327,57 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2809, + "id": 2861, "name": "DSAuthEvents", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2808, + "referencedDeclaration": 2860, "src": "947:12:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthEvents_$2808", + "typeIdentifier": "t_contract$_DSAuthEvents_$2860", "typeString": "contract DSAuthEvents" } }, - "id": 2810, + "id": 2862, "nodeType": "InheritanceSpecifier", "src": "947:12:17" } ], "contractDependencies": [ - 2808 + 2860 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2924, + "id": 2976, "linearizedBaseContracts": [ - 2924, - 2808 + 2976, + 2860 ], "name": "DSAuth", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 2812, + "id": 2864, "name": "authority", "nodeType": "VariableDeclaration", - "scope": 2924, + "scope": 2976, "src": "966:30:17", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" }, "typeName": { "contractScope": null, - "id": 2811, + "id": 2863, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "966:11:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -386,10 +386,10 @@ }, { "constant": false, - "id": 2814, + "id": 2866, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2924, + "scope": 2976, "src": "1002:26:17", "stateVariable": true, "storageLocation": "default", @@ -398,7 +398,7 @@ "typeString": "address" }, "typeName": { - "id": 2813, + "id": 2865, "name": "address", "nodeType": "ElementaryTypeName", "src": "1002:7:17", @@ -413,25 +413,25 @@ }, { "body": { - "id": 2827, + "id": 2879, "nodeType": "Block", "src": "1056:73:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2820, + "id": 2872, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2817, + "id": 2869, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1066:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -444,18 +444,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2818, + "id": 2870, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1074:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2819, + "id": 2871, "isConstant": false, "isLValue": false, "isPure": false, @@ -475,7 +475,7 @@ "typeString": "address" } }, - "id": 2821, + "id": 2873, "nodeType": "ExpressionStatement", "src": "1066:18:17" }, @@ -487,18 +487,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2823, + "id": 2875, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1111:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2824, + "id": 2876, "isConstant": false, "isLValue": false, "isPure": false, @@ -520,18 +520,18 @@ "typeString": "address payable" } ], - "id": 2822, + "id": 2874, "name": "LogSetOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2807, + "referencedDeclaration": 2859, "src": "1099:11:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2825, + "id": 2877, "isConstant": false, "isLValue": false, "isPure": false, @@ -545,32 +545,32 @@ "typeString": "tuple()" } }, - "id": 2826, + "id": 2878, "nodeType": "EmitStatement", "src": "1094:28:17" } ] }, "documentation": null, - "id": 2828, + "id": 2880, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 2815, + "id": 2867, "nodeType": "ParameterList", "parameters": [], "src": "1046:2:17" }, "returnParameters": { - "id": 2816, + "id": 2868, "nodeType": "ParameterList", "parameters": [], "src": "1056:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1035:94:17", "stateMutability": "nonpayable", "superFunction": null, @@ -578,25 +578,25 @@ }, { "body": { - "id": 2843, + "id": 2895, "nodeType": "Block", "src": "1201:64:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2837, + "id": 2889, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2835, + "id": 2887, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1211:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -607,11 +607,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2836, + "id": 2888, "name": "owner_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2830, + "referencedDeclaration": 2882, "src": "1219:6:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -624,7 +624,7 @@ "typeString": "address" } }, - "id": 2838, + "id": 2890, "nodeType": "ExpressionStatement", "src": "1211:14:17" }, @@ -634,11 +634,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2840, + "id": 2892, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1252:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -653,18 +653,18 @@ "typeString": "address" } ], - "id": 2839, + "id": 2891, "name": "LogSetOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2807, + "referencedDeclaration": 2859, "src": "1240:11:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2841, + "id": 2893, "isConstant": false, "isLValue": false, "isPure": false, @@ -678,27 +678,27 @@ "typeString": "tuple()" } }, - "id": 2842, + "id": 2894, "nodeType": "EmitStatement", "src": "1235:23:17" } ] }, "documentation": null, - "id": 2844, + "id": 2896, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 2833, + "id": 2885, "modifierName": { "argumentTypes": null, - "id": 2832, + "id": 2884, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1192:4:17", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -712,15 +712,15 @@ "name": "setOwner", "nodeType": "FunctionDefinition", "parameters": { - "id": 2831, + "id": 2883, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2830, + "id": 2882, "name": "owner_", "nodeType": "VariableDeclaration", - "scope": 2844, + "scope": 2896, "src": "1153:14:17", "stateVariable": false, "storageLocation": "default", @@ -729,7 +729,7 @@ "typeString": "address" }, "typeName": { - "id": 2829, + "id": 2881, "name": "address", "nodeType": "ElementaryTypeName", "src": "1153:7:17", @@ -746,12 +746,12 @@ "src": "1152:16:17" }, "returnParameters": { - "id": 2834, + "id": 2886, "nodeType": "ParameterList", "parameters": [], "src": "1201:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1135:130:17", "stateMutability": "nonpayable", "superFunction": null, @@ -759,28 +759,28 @@ }, { "body": { - "id": 2861, + "id": 2913, "nodeType": "Block", "src": "1349:89:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2853, + "id": 2905, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2851, + "id": 2903, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1359:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -788,24 +788,24 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2852, + "id": 2904, "name": "authority_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2846, + "referencedDeclaration": 2898, "src": "1371:10:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, "src": "1359:22:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2854, + "id": 2906, "nodeType": "ExpressionStatement", "src": "1359:22:17" }, @@ -818,14 +818,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2857, + "id": 2909, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1420:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -833,11 +833,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 2856, + "id": 2908, "isConstant": false, "isLValue": false, "isPure": true, @@ -850,7 +850,7 @@ }, "typeName": "address" }, - "id": 2858, + "id": 2910, "isConstant": false, "isLValue": false, "isPure": false, @@ -872,18 +872,18 @@ "typeString": "address" } ], - "id": 2855, + "id": 2907, "name": "LogSetAuthority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2803, + "referencedDeclaration": 2855, "src": "1396:15:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2859, + "id": 2911, "isConstant": false, "isLValue": false, "isPure": false, @@ -897,27 +897,27 @@ "typeString": "tuple()" } }, - "id": 2860, + "id": 2912, "nodeType": "EmitStatement", "src": "1391:40:17" } ] }, "documentation": null, - "id": 2862, + "id": 2914, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 2849, + "id": 2901, "modifierName": { "argumentTypes": null, - "id": 2848, + "id": 2900, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1340:4:17", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -931,31 +931,31 @@ "name": "setAuthority", "nodeType": "FunctionDefinition", "parameters": { - "id": 2847, + "id": 2899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2846, + "id": 2898, "name": "authority_", "nodeType": "VariableDeclaration", - "scope": 2862, + "scope": 2914, "src": "1293:22:17", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" }, "typeName": { "contractScope": null, - "id": 2845, + "id": 2897, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "1293:11:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -966,12 +966,12 @@ "src": "1292:24:17" }, "returnParameters": { - "id": 2850, + "id": 2902, "nodeType": "ParameterList", "parameters": [], "src": "1349:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1271:167:17", "stateMutability": "nonpayable", "superFunction": null, @@ -979,7 +979,7 @@ }, { "body": { - "id": 2875, + "id": 2927, "nodeType": "Block", "src": "1458:94:17", "statements": [ @@ -994,18 +994,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2866, + "id": 2918, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1489:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2867, + "id": 2919, "isConstant": false, "isLValue": false, "isPure": false, @@ -1023,18 +1023,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2868, + "id": 2920, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1501:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2869, + "id": 2921, "isConstant": false, "isLValue": false, "isPure": false, @@ -1060,18 +1060,18 @@ "typeString": "bytes4" } ], - "id": 2865, + "id": 2917, "name": "isAuthorized", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, + "referencedDeclaration": 2975, "src": "1476:12:17", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_bytes4_$returns$_t_bool_$", "typeString": "function (address,bytes4) view returns (bool)" } }, - "id": 2870, + "id": 2922, "isConstant": false, "isLValue": false, "isPure": false, @@ -1088,7 +1088,7 @@ { "argumentTypes": null, "hexValue": "64732d617574682d756e617574686f72697a6564", - "id": 2871, + "id": 2923, "isConstant": false, "isLValue": false, "isPure": true, @@ -1115,21 +1115,21 @@ "typeString": "literal_string \"ds-auth-unauthorized\"" } ], - "id": 2864, + "id": 2916, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1468:7:17", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2872, + "id": 2924, "isConstant": false, "isLValue": false, "isPure": false, @@ -1143,23 +1143,23 @@ "typeString": "tuple()" } }, - "id": 2873, + "id": 2925, "nodeType": "ExpressionStatement", "src": "1468:66:17" }, { - "id": 2874, + "id": 2926, "nodeType": "PlaceholderStatement", "src": "1544:1:17" } ] }, "documentation": null, - "id": 2876, + "id": 2928, "name": "auth", "nodeType": "ModifierDefinition", "parameters": { - "id": 2863, + "id": 2915, "nodeType": "ParameterList", "parameters": [], "src": "1458:0:17" @@ -1169,7 +1169,7 @@ }, { "body": { - "id": 2922, + "id": 2974, "nodeType": "Block", "src": "1634:299:17", "statements": [ @@ -1180,18 +1180,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2889, + "id": 2941, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2885, + "id": 2937, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1648:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1205,14 +1205,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2887, + "id": 2939, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7883, + "referencedDeclaration": 7874, "src": "1663:4:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } } @@ -1220,11 +1220,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } ], - "id": 2886, + "id": 2938, "isConstant": false, "isLValue": false, "isPure": true, @@ -1237,7 +1237,7 @@ }, "typeName": "address" }, - "id": 2888, + "id": 2940, "isConstant": false, "isLValue": false, "isPure": false, @@ -1264,18 +1264,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2895, + "id": 2947, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2893, + "id": 2945, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1716:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1286,11 +1286,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2894, + "id": 2946, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1723:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1310,7 +1310,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2905, + "id": 2957, "isConstant": false, "isLValue": false, "isPure": false, @@ -1320,14 +1320,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2900, + "id": 2952, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1784:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -1335,11 +1335,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 2899, + "id": 2951, "isConstant": false, "isLValue": false, "isPure": true, @@ -1352,7 +1352,7 @@ }, "typeName": "address" }, - "id": 2901, + "id": 2953, "isConstant": false, "isLValue": false, "isPure": false, @@ -1374,7 +1374,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 2903, + "id": 2955, "isConstant": false, "isLValue": false, "isPure": true, @@ -1397,7 +1397,7 @@ "typeString": "int_const 0" } ], - "id": 2902, + "id": 2954, "isConstant": false, "isLValue": false, "isPure": true, @@ -1410,7 +1410,7 @@ }, "typeName": "address" }, - "id": 2904, + "id": 2956, "isConstant": false, "isLValue": false, "isPure": true, @@ -1431,7 +1431,7 @@ } }, "falseBody": { - "id": 2918, + "id": 2970, "nodeType": "Block", "src": "1853:74:17", "statements": [ @@ -1441,11 +1441,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2911, + "id": 2963, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1892:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1457,14 +1457,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2913, + "id": 2965, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7883, + "referencedDeclaration": 7874, "src": "1905:4:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } } @@ -1472,11 +1472,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } ], - "id": 2912, + "id": 2964, "isConstant": false, "isLValue": false, "isPure": true, @@ -1489,7 +1489,7 @@ }, "typeName": "address" }, - "id": 2914, + "id": 2966, "isConstant": false, "isLValue": false, "isPure": false, @@ -1505,11 +1505,11 @@ }, { "argumentTypes": null, - "id": 2915, + "id": 2967, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2880, + "referencedDeclaration": 2932, "src": "1912:3:17", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1534,32 +1534,32 @@ ], "expression": { "argumentTypes": null, - "id": 2909, + "id": 2961, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1874:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2910, + "id": 2962, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "canCall", "nodeType": "MemberAccess", - "referencedDeclaration": 2798, + "referencedDeclaration": 2850, "src": "1874:17:17", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$_t_bytes4_$returns$_t_bool_$", "typeString": "function (address,address,bytes4) view external returns (bool)" } }, - "id": 2916, + "id": 2968, "isConstant": false, "isLValue": false, "isPure": false, @@ -1573,18 +1573,18 @@ "typeString": "bool" } }, - "functionReturnParameters": 2884, - "id": 2917, + "functionReturnParameters": 2936, + "id": 2969, "nodeType": "Return", "src": "1867:49:17" } ] }, - "id": 2919, + "id": 2971, "nodeType": "IfStatement", "src": "1772:155:17", "trueBody": { - "id": 2908, + "id": 2960, "nodeType": "Block", "src": "1810:37:17", "statements": [ @@ -1592,7 +1592,7 @@ "expression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2906, + "id": 2958, "isConstant": false, "isLValue": false, "isPure": true, @@ -1607,19 +1607,19 @@ }, "value": "false" }, - "functionReturnParameters": 2884, - "id": 2907, + "functionReturnParameters": 2936, + "id": 2959, "nodeType": "Return", "src": "1824:12:17" } ] } }, - "id": 2920, + "id": 2972, "nodeType": "IfStatement", "src": "1712:215:17", "trueBody": { - "id": 2898, + "id": 2950, "nodeType": "Block", "src": "1730:36:17", "statements": [ @@ -1627,7 +1627,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2896, + "id": 2948, "isConstant": false, "isLValue": false, "isPure": true, @@ -1642,19 +1642,19 @@ }, "value": "true" }, - "functionReturnParameters": 2884, - "id": 2897, + "functionReturnParameters": 2936, + "id": 2949, "nodeType": "Return", "src": "1744:11:17" } ] } }, - "id": 2921, + "id": 2973, "nodeType": "IfStatement", "src": "1644:283:17", "trueBody": { - "id": 2892, + "id": 2944, "nodeType": "Block", "src": "1670:36:17", "statements": [ @@ -1662,7 +1662,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2890, + "id": 2942, "isConstant": false, "isLValue": false, "isPure": true, @@ -1677,8 +1677,8 @@ }, "value": "true" }, - "functionReturnParameters": 2884, - "id": 2891, + "functionReturnParameters": 2936, + "id": 2943, "nodeType": "Return", "src": "1684:11:17" } @@ -1688,22 +1688,22 @@ ] }, "documentation": null, - "id": 2923, + "id": 2975, "implemented": true, "kind": "function", "modifiers": [], "name": "isAuthorized", "nodeType": "FunctionDefinition", "parameters": { - "id": 2881, + "id": 2933, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2878, + "id": 2930, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1580:11:17", "stateVariable": false, "storageLocation": "default", @@ -1712,7 +1712,7 @@ "typeString": "address" }, "typeName": { - "id": 2877, + "id": 2929, "name": "address", "nodeType": "ElementaryTypeName", "src": "1580:7:17", @@ -1727,10 +1727,10 @@ }, { "constant": false, - "id": 2880, + "id": 2932, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1593:10:17", "stateVariable": false, "storageLocation": "default", @@ -1739,7 +1739,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2879, + "id": 2931, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "1593:6:17", @@ -1755,15 +1755,15 @@ "src": "1579:25:17" }, "returnParameters": { - "id": 2884, + "id": 2936, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2883, + "id": 2935, "name": "", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1628:4:17", "stateVariable": false, "storageLocation": "default", @@ -1772,7 +1772,7 @@ "typeString": "bool" }, "typeName": { - "id": 2882, + "id": 2934, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1628:4:17", @@ -1787,14 +1787,14 @@ ], "src": "1627:6:17" }, - "scope": 2924, + "scope": 2976, "src": "1558:375:17", "stateMutability": "view", "superFunction": null, "visibility": "internal" } ], - "scope": 2925, + "scope": 2977, "src": "928:1007:17" } ], @@ -1804,20 +1804,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "exportedSymbols": { "DSAuth": [ - 2924 + 2976 ], "DSAuthEvents": [ - 2808 + 2860 ], "DSAuthority": [ - 2799 + 2851 ] }, - "id": 2925, + "id": 2977, "nodeType": "SourceUnit", "nodes": [ { - "id": 2787, + "id": 2839, "literals": [ "solidity", "0.5", @@ -1832,9 +1832,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 2799, + "id": 2851, "linearizedBaseContracts": [ - 2799 + 2851 ], "name": "DSAuthority", "nodeType": "ContractDefinition", @@ -1842,22 +1842,22 @@ { "body": null, "documentation": null, - "id": 2798, + "id": 2850, "implemented": false, "kind": "function", "modifiers": [], "name": "canCall", "nodeType": "FunctionDefinition", "parameters": { - "id": 2794, + "id": 2846, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2789, + "id": 2841, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "721:11:17", "stateVariable": false, "storageLocation": "default", @@ -1866,7 +1866,7 @@ "typeString": "address" }, "typeName": { - "id": 2788, + "id": 2840, "name": "address", "nodeType": "ElementaryTypeName", "src": "721:7:17", @@ -1881,10 +1881,10 @@ }, { "constant": false, - "id": 2791, + "id": 2843, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "734:11:17", "stateVariable": false, "storageLocation": "default", @@ -1893,7 +1893,7 @@ "typeString": "address" }, "typeName": { - "id": 2790, + "id": 2842, "name": "address", "nodeType": "ElementaryTypeName", "src": "734:7:17", @@ -1908,10 +1908,10 @@ }, { "constant": false, - "id": 2793, + "id": 2845, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "747:10:17", "stateVariable": false, "storageLocation": "default", @@ -1920,7 +1920,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2792, + "id": 2844, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "747:6:17", @@ -1936,15 +1936,15 @@ "src": "711:52:17" }, "returnParameters": { - "id": 2797, + "id": 2849, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2796, + "id": 2848, "name": "", "nodeType": "VariableDeclaration", - "scope": 2798, + "scope": 2850, "src": "785:4:17", "stateVariable": false, "storageLocation": "default", @@ -1953,7 +1953,7 @@ "typeString": "bool" }, "typeName": { - "id": 2795, + "id": 2847, "name": "bool", "nodeType": "ElementaryTypeName", "src": "785:4:17", @@ -1968,14 +1968,14 @@ ], "src": "784:6:17" }, - "scope": 2799, + "scope": 2851, "src": "695:96:17", "stateMutability": "view", "superFunction": null, "visibility": "public" } ], - "scope": 2925, + "scope": 2977, "src": "668:125:17" }, { @@ -1984,9 +1984,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2808, + "id": 2860, "linearizedBaseContracts": [ - 2808 + 2860 ], "name": "DSAuthEvents", "nodeType": "ContractDefinition", @@ -1994,20 +1994,20 @@ { "anonymous": false, "documentation": null, - "id": 2803, + "id": 2855, "name": "LogSetAuthority", "nodeType": "EventDefinition", "parameters": { - "id": 2802, + "id": 2854, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2801, + "id": 2853, "indexed": true, "name": "authority", "nodeType": "VariableDeclaration", - "scope": 2803, + "scope": 2855, "src": "846:25:17", "stateVariable": false, "storageLocation": "default", @@ -2016,7 +2016,7 @@ "typeString": "address" }, "typeName": { - "id": 2800, + "id": 2852, "name": "address", "nodeType": "ElementaryTypeName", "src": "846:7:17", @@ -2037,20 +2037,20 @@ { "anonymous": false, "documentation": null, - "id": 2807, + "id": 2859, "name": "LogSetOwner", "nodeType": "EventDefinition", "parameters": { - "id": 2806, + "id": 2858, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2805, + "id": 2857, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2807, + "scope": 2859, "src": "901:21:17", "stateVariable": false, "storageLocation": "default", @@ -2059,7 +2059,7 @@ "typeString": "address" }, "typeName": { - "id": 2804, + "id": 2856, "name": "address", "nodeType": "ElementaryTypeName", "src": "901:7:17", @@ -2078,7 +2078,7 @@ "src": "878:46:17" } ], - "scope": 2925, + "scope": 2977, "src": "795:131:17" }, { @@ -2087,57 +2087,57 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2809, + "id": 2861, "name": "DSAuthEvents", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2808, + "referencedDeclaration": 2860, "src": "947:12:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthEvents_$2808", + "typeIdentifier": "t_contract$_DSAuthEvents_$2860", "typeString": "contract DSAuthEvents" } }, - "id": 2810, + "id": 2862, "nodeType": "InheritanceSpecifier", "src": "947:12:17" } ], "contractDependencies": [ - 2808 + 2860 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2924, + "id": 2976, "linearizedBaseContracts": [ - 2924, - 2808 + 2976, + 2860 ], "name": "DSAuth", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 2812, + "id": 2864, "name": "authority", "nodeType": "VariableDeclaration", - "scope": 2924, + "scope": 2976, "src": "966:30:17", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" }, "typeName": { "contractScope": null, - "id": 2811, + "id": 2863, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "966:11:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -2146,10 +2146,10 @@ }, { "constant": false, - "id": 2814, + "id": 2866, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 2924, + "scope": 2976, "src": "1002:26:17", "stateVariable": true, "storageLocation": "default", @@ -2158,7 +2158,7 @@ "typeString": "address" }, "typeName": { - "id": 2813, + "id": 2865, "name": "address", "nodeType": "ElementaryTypeName", "src": "1002:7:17", @@ -2173,25 +2173,25 @@ }, { "body": { - "id": 2827, + "id": 2879, "nodeType": "Block", "src": "1056:73:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2820, + "id": 2872, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2817, + "id": 2869, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1066:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2204,18 +2204,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2818, + "id": 2870, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1074:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2819, + "id": 2871, "isConstant": false, "isLValue": false, "isPure": false, @@ -2235,7 +2235,7 @@ "typeString": "address" } }, - "id": 2821, + "id": 2873, "nodeType": "ExpressionStatement", "src": "1066:18:17" }, @@ -2247,18 +2247,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2823, + "id": 2875, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1111:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2824, + "id": 2876, "isConstant": false, "isLValue": false, "isPure": false, @@ -2280,18 +2280,18 @@ "typeString": "address payable" } ], - "id": 2822, + "id": 2874, "name": "LogSetOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2807, + "referencedDeclaration": 2859, "src": "1099:11:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2825, + "id": 2877, "isConstant": false, "isLValue": false, "isPure": false, @@ -2305,32 +2305,32 @@ "typeString": "tuple()" } }, - "id": 2826, + "id": 2878, "nodeType": "EmitStatement", "src": "1094:28:17" } ] }, "documentation": null, - "id": 2828, + "id": 2880, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 2815, + "id": 2867, "nodeType": "ParameterList", "parameters": [], "src": "1046:2:17" }, "returnParameters": { - "id": 2816, + "id": 2868, "nodeType": "ParameterList", "parameters": [], "src": "1056:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1035:94:17", "stateMutability": "nonpayable", "superFunction": null, @@ -2338,25 +2338,25 @@ }, { "body": { - "id": 2843, + "id": 2895, "nodeType": "Block", "src": "1201:64:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2837, + "id": 2889, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2835, + "id": 2887, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1211:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2367,11 +2367,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2836, + "id": 2888, "name": "owner_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2830, + "referencedDeclaration": 2882, "src": "1219:6:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2384,7 +2384,7 @@ "typeString": "address" } }, - "id": 2838, + "id": 2890, "nodeType": "ExpressionStatement", "src": "1211:14:17" }, @@ -2394,11 +2394,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2840, + "id": 2892, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1252:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2413,18 +2413,18 @@ "typeString": "address" } ], - "id": 2839, + "id": 2891, "name": "LogSetOwner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2807, + "referencedDeclaration": 2859, "src": "1240:11:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2841, + "id": 2893, "isConstant": false, "isLValue": false, "isPure": false, @@ -2438,27 +2438,27 @@ "typeString": "tuple()" } }, - "id": 2842, + "id": 2894, "nodeType": "EmitStatement", "src": "1235:23:17" } ] }, "documentation": null, - "id": 2844, + "id": 2896, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 2833, + "id": 2885, "modifierName": { "argumentTypes": null, - "id": 2832, + "id": 2884, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1192:4:17", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2472,15 +2472,15 @@ "name": "setOwner", "nodeType": "FunctionDefinition", "parameters": { - "id": 2831, + "id": 2883, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2830, + "id": 2882, "name": "owner_", "nodeType": "VariableDeclaration", - "scope": 2844, + "scope": 2896, "src": "1153:14:17", "stateVariable": false, "storageLocation": "default", @@ -2489,7 +2489,7 @@ "typeString": "address" }, "typeName": { - "id": 2829, + "id": 2881, "name": "address", "nodeType": "ElementaryTypeName", "src": "1153:7:17", @@ -2506,12 +2506,12 @@ "src": "1152:16:17" }, "returnParameters": { - "id": 2834, + "id": 2886, "nodeType": "ParameterList", "parameters": [], "src": "1201:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1135:130:17", "stateMutability": "nonpayable", "superFunction": null, @@ -2519,28 +2519,28 @@ }, { "body": { - "id": 2861, + "id": 2913, "nodeType": "Block", "src": "1349:89:17", "statements": [ { "expression": { "argumentTypes": null, - "id": 2853, + "id": 2905, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 2851, + "id": 2903, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1359:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -2548,24 +2548,24 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 2852, + "id": 2904, "name": "authority_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2846, + "referencedDeclaration": 2898, "src": "1371:10:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, "src": "1359:22:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2854, + "id": 2906, "nodeType": "ExpressionStatement", "src": "1359:22:17" }, @@ -2578,14 +2578,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2857, + "id": 2909, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1420:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -2593,11 +2593,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 2856, + "id": 2908, "isConstant": false, "isLValue": false, "isPure": true, @@ -2610,7 +2610,7 @@ }, "typeName": "address" }, - "id": 2858, + "id": 2910, "isConstant": false, "isLValue": false, "isPure": false, @@ -2632,18 +2632,18 @@ "typeString": "address" } ], - "id": 2855, + "id": 2907, "name": "LogSetAuthority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2803, + "referencedDeclaration": 2855, "src": "1396:15:17", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$", "typeString": "function (address)" } }, - "id": 2859, + "id": 2911, "isConstant": false, "isLValue": false, "isPure": false, @@ -2657,27 +2657,27 @@ "typeString": "tuple()" } }, - "id": 2860, + "id": 2912, "nodeType": "EmitStatement", "src": "1391:40:17" } ] }, "documentation": null, - "id": 2862, + "id": 2914, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 2849, + "id": 2901, "modifierName": { "argumentTypes": null, - "id": 2848, + "id": 2900, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1340:4:17", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2691,31 +2691,31 @@ "name": "setAuthority", "nodeType": "FunctionDefinition", "parameters": { - "id": 2847, + "id": 2899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2846, + "id": 2898, "name": "authority_", "nodeType": "VariableDeclaration", - "scope": 2862, + "scope": 2914, "src": "1293:22:17", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" }, "typeName": { "contractScope": null, - "id": 2845, + "id": 2897, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "1293:11:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, @@ -2726,12 +2726,12 @@ "src": "1292:24:17" }, "returnParameters": { - "id": 2850, + "id": 2902, "nodeType": "ParameterList", "parameters": [], "src": "1349:0:17" }, - "scope": 2924, + "scope": 2976, "src": "1271:167:17", "stateMutability": "nonpayable", "superFunction": null, @@ -2739,7 +2739,7 @@ }, { "body": { - "id": 2875, + "id": 2927, "nodeType": "Block", "src": "1458:94:17", "statements": [ @@ -2754,18 +2754,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2866, + "id": 2918, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1489:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2867, + "id": 2919, "isConstant": false, "isLValue": false, "isPure": false, @@ -2783,18 +2783,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2868, + "id": 2920, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1501:3:17", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 2869, + "id": 2921, "isConstant": false, "isLValue": false, "isPure": false, @@ -2820,18 +2820,18 @@ "typeString": "bytes4" } ], - "id": 2865, + "id": 2917, "name": "isAuthorized", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2923, + "referencedDeclaration": 2975, "src": "1476:12:17", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_bytes4_$returns$_t_bool_$", "typeString": "function (address,bytes4) view returns (bool)" } }, - "id": 2870, + "id": 2922, "isConstant": false, "isLValue": false, "isPure": false, @@ -2848,7 +2848,7 @@ { "argumentTypes": null, "hexValue": "64732d617574682d756e617574686f72697a6564", - "id": 2871, + "id": 2923, "isConstant": false, "isLValue": false, "isPure": true, @@ -2875,21 +2875,21 @@ "typeString": "literal_string \"ds-auth-unauthorized\"" } ], - "id": 2864, + "id": 2916, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1468:7:17", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 2872, + "id": 2924, "isConstant": false, "isLValue": false, "isPure": false, @@ -2903,23 +2903,23 @@ "typeString": "tuple()" } }, - "id": 2873, + "id": 2925, "nodeType": "ExpressionStatement", "src": "1468:66:17" }, { - "id": 2874, + "id": 2926, "nodeType": "PlaceholderStatement", "src": "1544:1:17" } ] }, "documentation": null, - "id": 2876, + "id": 2928, "name": "auth", "nodeType": "ModifierDefinition", "parameters": { - "id": 2863, + "id": 2915, "nodeType": "ParameterList", "parameters": [], "src": "1458:0:17" @@ -2929,7 +2929,7 @@ }, { "body": { - "id": 2922, + "id": 2974, "nodeType": "Block", "src": "1634:299:17", "statements": [ @@ -2940,18 +2940,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2889, + "id": 2941, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2885, + "id": 2937, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1648:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2965,14 +2965,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2887, + "id": 2939, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7883, + "referencedDeclaration": 7874, "src": "1663:4:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } } @@ -2980,11 +2980,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } ], - "id": 2886, + "id": 2938, "isConstant": false, "isLValue": false, "isPure": true, @@ -2997,7 +2997,7 @@ }, "typeName": "address" }, - "id": 2888, + "id": 2940, "isConstant": false, "isLValue": false, "isPure": false, @@ -3024,18 +3024,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2895, + "id": 2947, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2893, + "id": 2945, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1716:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3046,11 +3046,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2894, + "id": 2946, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2814, + "referencedDeclaration": 2866, "src": "1723:5:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3070,7 +3070,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2905, + "id": 2957, "isConstant": false, "isLValue": false, "isPure": false, @@ -3080,14 +3080,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2900, + "id": 2952, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1784:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -3095,11 +3095,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 2899, + "id": 2951, "isConstant": false, "isLValue": false, "isPure": true, @@ -3112,7 +3112,7 @@ }, "typeName": "address" }, - "id": 2901, + "id": 2953, "isConstant": false, "isLValue": false, "isPure": false, @@ -3134,7 +3134,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 2903, + "id": 2955, "isConstant": false, "isLValue": false, "isPure": true, @@ -3157,7 +3157,7 @@ "typeString": "int_const 0" } ], - "id": 2902, + "id": 2954, "isConstant": false, "isLValue": false, "isPure": true, @@ -3170,7 +3170,7 @@ }, "typeName": "address" }, - "id": 2904, + "id": 2956, "isConstant": false, "isLValue": false, "isPure": true, @@ -3191,7 +3191,7 @@ } }, "falseBody": { - "id": 2918, + "id": 2970, "nodeType": "Block", "src": "1853:74:17", "statements": [ @@ -3201,11 +3201,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2911, + "id": 2963, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2878, + "referencedDeclaration": 2930, "src": "1892:3:17", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3217,14 +3217,14 @@ "arguments": [ { "argumentTypes": null, - "id": 2913, + "id": 2965, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7883, + "referencedDeclaration": 7874, "src": "1905:4:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } } @@ -3232,11 +3232,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } ], - "id": 2912, + "id": 2964, "isConstant": false, "isLValue": false, "isPure": true, @@ -3249,7 +3249,7 @@ }, "typeName": "address" }, - "id": 2914, + "id": 2966, "isConstant": false, "isLValue": false, "isPure": false, @@ -3265,11 +3265,11 @@ }, { "argumentTypes": null, - "id": 2915, + "id": 2967, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2880, + "referencedDeclaration": 2932, "src": "1912:3:17", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -3294,32 +3294,32 @@ ], "expression": { "argumentTypes": null, - "id": 2909, + "id": 2961, "name": "authority", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1874:9:17", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2910, + "id": 2962, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "canCall", "nodeType": "MemberAccess", - "referencedDeclaration": 2798, + "referencedDeclaration": 2850, "src": "1874:17:17", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$_t_address_$_t_bytes4_$returns$_t_bool_$", "typeString": "function (address,address,bytes4) view external returns (bool)" } }, - "id": 2916, + "id": 2968, "isConstant": false, "isLValue": false, "isPure": false, @@ -3333,18 +3333,18 @@ "typeString": "bool" } }, - "functionReturnParameters": 2884, - "id": 2917, + "functionReturnParameters": 2936, + "id": 2969, "nodeType": "Return", "src": "1867:49:17" } ] }, - "id": 2919, + "id": 2971, "nodeType": "IfStatement", "src": "1772:155:17", "trueBody": { - "id": 2908, + "id": 2960, "nodeType": "Block", "src": "1810:37:17", "statements": [ @@ -3352,7 +3352,7 @@ "expression": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 2906, + "id": 2958, "isConstant": false, "isLValue": false, "isPure": true, @@ -3367,19 +3367,19 @@ }, "value": "false" }, - "functionReturnParameters": 2884, - "id": 2907, + "functionReturnParameters": 2936, + "id": 2959, "nodeType": "Return", "src": "1824:12:17" } ] } }, - "id": 2920, + "id": 2972, "nodeType": "IfStatement", "src": "1712:215:17", "trueBody": { - "id": 2898, + "id": 2950, "nodeType": "Block", "src": "1730:36:17", "statements": [ @@ -3387,7 +3387,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2896, + "id": 2948, "isConstant": false, "isLValue": false, "isPure": true, @@ -3402,19 +3402,19 @@ }, "value": "true" }, - "functionReturnParameters": 2884, - "id": 2897, + "functionReturnParameters": 2936, + "id": 2949, "nodeType": "Return", "src": "1744:11:17" } ] } }, - "id": 2921, + "id": 2973, "nodeType": "IfStatement", "src": "1644:283:17", "trueBody": { - "id": 2892, + "id": 2944, "nodeType": "Block", "src": "1670:36:17", "statements": [ @@ -3422,7 +3422,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 2890, + "id": 2942, "isConstant": false, "isLValue": false, "isPure": true, @@ -3437,8 +3437,8 @@ }, "value": "true" }, - "functionReturnParameters": 2884, - "id": 2891, + "functionReturnParameters": 2936, + "id": 2943, "nodeType": "Return", "src": "1684:11:17" } @@ -3448,22 +3448,22 @@ ] }, "documentation": null, - "id": 2923, + "id": 2975, "implemented": true, "kind": "function", "modifiers": [], "name": "isAuthorized", "nodeType": "FunctionDefinition", "parameters": { - "id": 2881, + "id": 2933, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2878, + "id": 2930, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1580:11:17", "stateVariable": false, "storageLocation": "default", @@ -3472,7 +3472,7 @@ "typeString": "address" }, "typeName": { - "id": 2877, + "id": 2929, "name": "address", "nodeType": "ElementaryTypeName", "src": "1580:7:17", @@ -3487,10 +3487,10 @@ }, { "constant": false, - "id": 2880, + "id": 2932, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1593:10:17", "stateVariable": false, "storageLocation": "default", @@ -3499,7 +3499,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2879, + "id": 2931, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "1593:6:17", @@ -3515,15 +3515,15 @@ "src": "1579:25:17" }, "returnParameters": { - "id": 2884, + "id": 2936, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2883, + "id": 2935, "name": "", "nodeType": "VariableDeclaration", - "scope": 2923, + "scope": 2975, "src": "1628:4:17", "stateVariable": false, "storageLocation": "default", @@ -3532,7 +3532,7 @@ "typeString": "bool" }, "typeName": { - "id": 2882, + "id": 2934, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1628:4:17", @@ -3547,14 +3547,14 @@ ], "src": "1627:6:17" }, - "scope": 2924, + "scope": 2976, "src": "1558:375:17", "stateMutability": "view", "superFunction": null, "visibility": "internal" } ], - "scope": 2925, + "scope": 2977, "src": "928:1007:17" } ], @@ -3566,7 +3566,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.492Z", + "updatedAt": "2020-04-08T12:21:13.728Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DSGuard.json b/packages/smart-contracts/artifacts/DSGuard.json index ba8ac68..aa57799 100644 --- a/packages/smart-contracts/artifacts/DSGuard.json +++ b/packages/smart-contracts/artifacts/DSGuard.json @@ -295,20 +295,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "exportedSymbols": { "DSGuard": [ - 3163 + 3215 ], "DSGuardEvents": [ - 2944 + 2996 ], "DSGuardFactory": [ - 3195 + 3247 ] }, - "id": 3196, + "id": 3248, "nodeType": "SourceUnit", "nodes": [ { - "id": 2926, + "id": 2978, "literals": [ "solidity", "0.5", @@ -320,10 +320,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "file": "./Auth.sol", - "id": 2927, + "id": 2979, "nodeType": "ImportDirective", - "scope": 3196, - "sourceUnit": 2925, + "scope": 3248, + "sourceUnit": 2977, "src": "769:20:18", "symbolAliases": [], "unitAlias": "" @@ -334,9 +334,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2944, + "id": 2996, "linearizedBaseContracts": [ - 2944 + 2996 ], "name": "DSGuardEvents", "nodeType": "ContractDefinition", @@ -344,20 +344,20 @@ { "anonymous": false, "documentation": null, - "id": 2935, + "id": 2987, "name": "LogPermit", "nodeType": "EventDefinition", "parameters": { - "id": 2934, + "id": 2986, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2929, + "id": 2981, "indexed": true, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "845:19:18", "stateVariable": false, "storageLocation": "default", @@ -366,7 +366,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2928, + "id": 2980, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "845:7:18", @@ -380,11 +380,11 @@ }, { "constant": false, - "id": 2931, + "id": 2983, "indexed": true, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "874:19:18", "stateVariable": false, "storageLocation": "default", @@ -393,7 +393,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2930, + "id": 2982, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "874:7:18", @@ -407,11 +407,11 @@ }, { "constant": false, - "id": 2933, + "id": 2985, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "903:19:18", "stateVariable": false, "storageLocation": "default", @@ -420,7 +420,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2932, + "id": 2984, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "903:7:18", @@ -440,20 +440,20 @@ { "anonymous": false, "documentation": null, - "id": 2943, + "id": 2995, "name": "LogForbid", "nodeType": "EventDefinition", "parameters": { - "id": 2942, + "id": 2994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2937, + "id": 2989, "indexed": true, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "960:19:18", "stateVariable": false, "storageLocation": "default", @@ -462,7 +462,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2936, + "id": 2988, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "960:7:18", @@ -476,11 +476,11 @@ }, { "constant": false, - "id": 2939, + "id": 2991, "indexed": true, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "989:19:18", "stateVariable": false, "storageLocation": "default", @@ -489,7 +489,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2938, + "id": 2990, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "989:7:18", @@ -503,11 +503,11 @@ }, { "constant": false, - "id": 2941, + "id": 2993, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "1018:19:18", "stateVariable": false, "storageLocation": "default", @@ -516,7 +516,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2940, + "id": 2992, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1018:7:18", @@ -534,7 +534,7 @@ "src": "935:109:18" } ], - "scope": 3196, + "scope": 3248, "src": "791:255:18" }, { @@ -543,17 +543,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2945, + "id": 2997, "name": "DSAuth", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2924, + "referencedDeclaration": 2976, "src": "1068:6:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } }, - "id": 2946, + "id": 2998, "nodeType": "InheritanceSpecifier", "src": "1068:6:18" }, @@ -561,17 +561,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2947, + "id": 2999, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "1076:11:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2948, + "id": 3000, "nodeType": "InheritanceSpecifier", "src": "1076:11:18" }, @@ -579,47 +579,47 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2949, + "id": 3001, "name": "DSGuardEvents", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2944, + "referencedDeclaration": 2996, "src": "1089:13:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardEvents_$2944", + "typeIdentifier": "t_contract$_DSGuardEvents_$2996", "typeString": "contract DSGuardEvents" } }, - "id": 2950, + "id": 3002, "nodeType": "InheritanceSpecifier", "src": "1089:13:18" } ], "contractDependencies": [ - 2799, - 2808, - 2924, - 2944 + 2851, + 2860, + 2976, + 2996 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3163, + "id": 3215, "linearizedBaseContracts": [ - 3163, - 2944, - 2799, - 2924, - 2808 + 3215, + 2996, + 2851, + 2976, + 2860 ], "name": "DSGuard", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 2958, + "id": 3010, "name": "ANY", "nodeType": "VariableDeclaration", - "scope": 3163, + "scope": 3215, "src": "1109:47:18", "stateVariable": true, "storageLocation": "default", @@ -628,7 +628,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2951, + "id": 3003, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1109:7:18", @@ -645,7 +645,7 @@ "arguments": [ { "argumentTypes": null, - "id": 2955, + "id": 3007, "isConstant": false, "isLValue": false, "isPure": true, @@ -657,7 +657,7 @@ "subExpression": { "argumentTypes": null, "hexValue": "31", - "id": 2954, + "id": 3006, "isConstant": false, "isLValue": false, "isPure": true, @@ -685,7 +685,7 @@ "typeString": "int_const -1" } ], - "id": 2953, + "id": 3005, "isConstant": false, "isLValue": false, "isPure": true, @@ -698,7 +698,7 @@ }, "typeName": "uint" }, - "id": 2956, + "id": 3008, "isConstant": false, "isLValue": false, "isPure": true, @@ -720,7 +720,7 @@ "typeString": "uint256" } ], - "id": 2952, + "id": 3004, "isConstant": false, "isLValue": false, "isPure": true, @@ -733,7 +733,7 @@ }, "typeName": "bytes32" }, - "id": 2957, + "id": 3009, "isConstant": false, "isLValue": false, "isPure": true, @@ -751,10 +751,10 @@ }, { "constant": false, - "id": 2966, + "id": 3018, "name": "acl", "nodeType": "VariableDeclaration", - "scope": 3163, + "scope": 3215, "src": "1163:71:18", "stateVariable": true, "storageLocation": "default", @@ -763,9 +763,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" }, "typeName": { - "id": 2965, + "id": 3017, "keyType": { - "id": 2959, + "id": 3011, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1172:7:18", @@ -781,9 +781,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" }, "valueType": { - "id": 2964, + "id": 3016, "keyType": { - "id": 2960, + "id": 3012, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1192:7:18", @@ -799,9 +799,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" }, "valueType": { - "id": 2963, + "id": 3015, "keyType": { - "id": 2961, + "id": 3013, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1212:7:18", @@ -817,7 +817,7 @@ "typeString": "mapping(bytes32 => bool)" }, "valueType": { - "id": 2962, + "id": 3014, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1223:4:18", @@ -834,21 +834,21 @@ }, { "body": { - "id": 3057, + "id": 3109, "nodeType": "Block", "src": "1339:373:18", "statements": [ { "assignments": [ - 2978 + 3030 ], "declarations": [ { "constant": false, - "id": 2978, + "id": 3030, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3057, + "scope": 3109, "src": "1349:11:18", "stateVariable": false, "storageLocation": "default", @@ -857,7 +857,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2977, + "id": 3029, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1349:7:18", @@ -870,7 +870,7 @@ "visibility": "internal" } ], - "id": 2984, + "id": 3036, "initialValue": { "argumentTypes": null, "arguments": [ @@ -879,11 +879,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2981, + "id": 3033, "name": "src_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2968, + "referencedDeclaration": 3020, "src": "1379:4:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -898,7 +898,7 @@ "typeString": "address" } ], - "id": 2980, + "id": 3032, "isConstant": false, "isLValue": false, "isPure": true, @@ -911,7 +911,7 @@ }, "typeName": "bytes20" }, - "id": 2982, + "id": 3034, "isConstant": false, "isLValue": false, "isPure": false, @@ -933,7 +933,7 @@ "typeString": "bytes20" } ], - "id": 2979, + "id": 3031, "isConstant": false, "isLValue": false, "isPure": true, @@ -946,7 +946,7 @@ }, "typeName": "bytes32" }, - "id": 2983, + "id": 3035, "isConstant": false, "isLValue": false, "isPure": false, @@ -965,15 +965,15 @@ }, { "assignments": [ - 2986 + 3038 ], "declarations": [ { "constant": false, - "id": 2986, + "id": 3038, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3057, + "scope": 3109, "src": "1395:11:18", "stateVariable": false, "storageLocation": "default", @@ -982,7 +982,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2985, + "id": 3037, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1395:7:18", @@ -995,7 +995,7 @@ "visibility": "internal" } ], - "id": 2992, + "id": 3044, "initialValue": { "argumentTypes": null, "arguments": [ @@ -1004,11 +1004,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2989, + "id": 3041, "name": "dst_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2970, + "referencedDeclaration": 3022, "src": "1425:4:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1023,7 +1023,7 @@ "typeString": "address" } ], - "id": 2988, + "id": 3040, "isConstant": false, "isLValue": false, "isPure": true, @@ -1036,7 +1036,7 @@ }, "typeName": "bytes20" }, - "id": 2990, + "id": 3042, "isConstant": false, "isLValue": false, "isPure": false, @@ -1058,7 +1058,7 @@ "typeString": "bytes20" } ], - "id": 2987, + "id": 3039, "isConstant": false, "isLValue": false, "isPure": true, @@ -1071,7 +1071,7 @@ }, "typeName": "bytes32" }, - "id": 2991, + "id": 3043, "isConstant": false, "isLValue": false, "isPure": false, @@ -1095,7 +1095,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3055, + "id": 3107, "isConstant": false, "isLValue": false, "isPure": false, @@ -1106,7 +1106,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3047, + "id": 3099, "isConstant": false, "isLValue": false, "isPure": false, @@ -1117,7 +1117,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3039, + "id": 3091, "isConstant": false, "isLValue": false, "isPure": false, @@ -1128,7 +1128,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3031, + "id": 3083, "isConstant": false, "isLValue": false, "isPure": false, @@ -1139,7 +1139,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3023, + "id": 3075, "isConstant": false, "isLValue": false, "isPure": false, @@ -1150,7 +1150,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3015, + "id": 3067, "isConstant": false, "isLValue": false, "isPure": false, @@ -1161,7 +1161,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3007, + "id": 3059, "isConstant": false, "isLValue": false, "isPure": false, @@ -1174,25 +1174,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2993, + "id": 3045, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1449:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 2995, + "id": 3047, "indexExpression": { "argumentTypes": null, - "id": 2994, + "id": 3046, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1453:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1210,14 +1210,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 2997, + "id": 3049, "indexExpression": { "argumentTypes": null, - "id": 2996, + "id": 3048, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1458:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1235,14 +1235,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 2999, + "id": 3051, "indexExpression": { "argumentTypes": null, - "id": 2998, + "id": 3050, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1463:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1270,25 +1270,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3000, + "id": 3052, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1483:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3002, + "id": 3054, "indexExpression": { "argumentTypes": null, - "id": 3001, + "id": 3053, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1487:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1306,14 +1306,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3004, + "id": 3056, "indexExpression": { "argumentTypes": null, - "id": 3003, + "id": 3055, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1492:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1331,14 +1331,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3006, + "id": 3058, "indexExpression": { "argumentTypes": null, - "id": 3005, + "id": 3057, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1497:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1372,25 +1372,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3008, + "id": 3060, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1517:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3010, + "id": 3062, "indexExpression": { "argumentTypes": null, - "id": 3009, + "id": 3061, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1521:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1408,14 +1408,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3012, + "id": 3064, "indexExpression": { "argumentTypes": null, - "id": 3011, + "id": 3063, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1526:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1433,14 +1433,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3014, + "id": 3066, "indexExpression": { "argumentTypes": null, - "id": 3013, + "id": 3065, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1531:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1474,25 +1474,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3016, + "id": 3068, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1551:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3018, + "id": 3070, "indexExpression": { "argumentTypes": null, - "id": 3017, + "id": 3069, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1555:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1510,14 +1510,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3020, + "id": 3072, "indexExpression": { "argumentTypes": null, - "id": 3019, + "id": 3071, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1560:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1535,14 +1535,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3022, + "id": 3074, "indexExpression": { "argumentTypes": null, - "id": 3021, + "id": 3073, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1565:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1576,25 +1576,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3024, + "id": 3076, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1585:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3026, + "id": 3078, "indexExpression": { "argumentTypes": null, - "id": 3025, + "id": 3077, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1589:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1612,14 +1612,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3028, + "id": 3080, "indexExpression": { "argumentTypes": null, - "id": 3027, + "id": 3079, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1594:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1637,14 +1637,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3030, + "id": 3082, "indexExpression": { "argumentTypes": null, - "id": 3029, + "id": 3081, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1599:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1678,25 +1678,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3032, + "id": 3084, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1619:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3034, + "id": 3086, "indexExpression": { "argumentTypes": null, - "id": 3033, + "id": 3085, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1623:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1714,14 +1714,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3036, + "id": 3088, "indexExpression": { "argumentTypes": null, - "id": 3035, + "id": 3087, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1628:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1739,14 +1739,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3038, + "id": 3090, "indexExpression": { "argumentTypes": null, - "id": 3037, + "id": 3089, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1633:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1780,25 +1780,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3040, + "id": 3092, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1653:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3042, + "id": 3094, "indexExpression": { "argumentTypes": null, - "id": 3041, + "id": 3093, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1657:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1816,14 +1816,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3044, + "id": 3096, "indexExpression": { "argumentTypes": null, - "id": 3043, + "id": 3095, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1662:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1841,14 +1841,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3046, + "id": 3098, "indexExpression": { "argumentTypes": null, - "id": 3045, + "id": 3097, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1667:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1882,25 +1882,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3048, + "id": 3100, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1687:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3050, + "id": 3102, "indexExpression": { "argumentTypes": null, - "id": 3049, + "id": 3101, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1691:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1918,14 +1918,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3052, + "id": 3104, "indexExpression": { "argumentTypes": null, - "id": 3051, + "id": 3103, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1696:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1943,14 +1943,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3054, + "id": 3106, "indexExpression": { "argumentTypes": null, - "id": 3053, + "id": 3105, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1701:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1974,30 +1974,30 @@ "typeString": "bool" } }, - "functionReturnParameters": 2976, - "id": 3056, + "functionReturnParameters": 3028, + "id": 3108, "nodeType": "Return", "src": "1442:263:18" } ] }, "documentation": null, - "id": 3058, + "id": 3110, "implemented": true, "kind": "function", "modifiers": [], "name": "canCall", "nodeType": "FunctionDefinition", "parameters": { - "id": 2973, + "id": 3025, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2968, + "id": 3020, "name": "src_", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1267:12:18", "stateVariable": false, "storageLocation": "default", @@ -2006,7 +2006,7 @@ "typeString": "address" }, "typeName": { - "id": 2967, + "id": 3019, "name": "address", "nodeType": "ElementaryTypeName", "src": "1267:7:18", @@ -2021,10 +2021,10 @@ }, { "constant": false, - "id": 2970, + "id": 3022, "name": "dst_", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1281:12:18", "stateVariable": false, "storageLocation": "default", @@ -2033,7 +2033,7 @@ "typeString": "address" }, "typeName": { - "id": 2969, + "id": 3021, "name": "address", "nodeType": "ElementaryTypeName", "src": "1281:7:18", @@ -2048,10 +2048,10 @@ }, { "constant": false, - "id": 2972, + "id": 3024, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1295:10:18", "stateVariable": false, "storageLocation": "default", @@ -2060,7 +2060,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2971, + "id": 3023, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "1295:6:18", @@ -2076,15 +2076,15 @@ "src": "1257:54:18" }, "returnParameters": { - "id": 2976, + "id": 3028, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2975, + "id": 3027, "name": "", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1333:4:18", "stateVariable": false, "storageLocation": "default", @@ -2093,7 +2093,7 @@ "typeString": "bool" }, "typeName": { - "id": 2974, + "id": 3026, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1333:4:18", @@ -2108,22 +2108,22 @@ ], "src": "1332:6:18" }, - "scope": 3163, + "scope": 3215, "src": "1241:471:18", "stateMutability": "view", - "superFunction": 2798, + "superFunction": 2850, "visibility": "public" }, { "body": { - "id": 3085, + "id": 3137, "nodeType": "Block", "src": "1785:81:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3077, + "id": 3129, "isConstant": false, "isLValue": false, "isPure": false, @@ -2136,25 +2136,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3069, + "id": 3121, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1795:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3073, + "id": 3125, "indexExpression": { "argumentTypes": null, - "id": 3070, + "id": 3122, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3060, + "referencedDeclaration": 3112, "src": "1799:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2172,14 +2172,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3074, + "id": 3126, "indexExpression": { "argumentTypes": null, - "id": 3071, + "id": 3123, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3062, + "referencedDeclaration": 3114, "src": "1804:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2197,14 +2197,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3075, + "id": 3127, "indexExpression": { "argumentTypes": null, - "id": 3072, + "id": 3124, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3064, + "referencedDeclaration": 3116, "src": "1809:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2227,7 +2227,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3076, + "id": 3128, "isConstant": false, "isLValue": false, "isPure": true, @@ -2248,7 +2248,7 @@ "typeString": "bool" } }, - "id": 3078, + "id": 3130, "nodeType": "ExpressionStatement", "src": "1795:25:18" }, @@ -2258,11 +2258,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3080, + "id": 3132, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3060, + "referencedDeclaration": 3112, "src": "1845:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2271,11 +2271,11 @@ }, { "argumentTypes": null, - "id": 3081, + "id": 3133, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3062, + "referencedDeclaration": 3114, "src": "1850:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2284,11 +2284,11 @@ }, { "argumentTypes": null, - "id": 3082, + "id": 3134, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3064, + "referencedDeclaration": 3116, "src": "1855:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2311,18 +2311,18 @@ "typeString": "bytes32" } ], - "id": 3079, + "id": 3131, "name": "LogPermit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2935, + "referencedDeclaration": 2987, "src": "1835:9:18", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3083, + "id": 3135, "isConstant": false, "isLValue": false, "isPure": false, @@ -2336,27 +2336,27 @@ "typeString": "tuple()" } }, - "id": 3084, + "id": 3136, "nodeType": "EmitStatement", "src": "1830:29:18" } ] }, "documentation": null, - "id": 3086, + "id": 3138, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3067, + "id": 3119, "modifierName": { "argumentTypes": null, - "id": 3066, + "id": 3118, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1780:4:18", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2370,15 +2370,15 @@ "name": "permit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3065, + "id": 3117, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3060, + "id": 3112, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1734:11:18", "stateVariable": false, "storageLocation": "default", @@ -2387,7 +2387,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3059, + "id": 3111, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1734:7:18", @@ -2401,10 +2401,10 @@ }, { "constant": false, - "id": 3062, + "id": 3114, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1747:11:18", "stateVariable": false, "storageLocation": "default", @@ -2413,7 +2413,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3061, + "id": 3113, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1747:7:18", @@ -2427,10 +2427,10 @@ }, { "constant": false, - "id": 3064, + "id": 3116, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1760:11:18", "stateVariable": false, "storageLocation": "default", @@ -2439,7 +2439,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3063, + "id": 3115, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1760:7:18", @@ -2455,12 +2455,12 @@ "src": "1733:39:18" }, "returnParameters": { - "id": 3068, + "id": 3120, "nodeType": "ParameterList", "parameters": [], "src": "1785:0:18" }, - "scope": 3163, + "scope": 3215, "src": "1718:148:18", "stateMutability": "nonpayable", "superFunction": null, @@ -2468,14 +2468,14 @@ }, { "body": { - "id": 3113, + "id": 3165, "nodeType": "Block", "src": "1939:82:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3105, + "id": 3157, "isConstant": false, "isLValue": false, "isPure": false, @@ -2488,25 +2488,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3097, + "id": 3149, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1949:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3101, + "id": 3153, "indexExpression": { "argumentTypes": null, - "id": 3098, + "id": 3150, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3088, + "referencedDeclaration": 3140, "src": "1953:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2524,14 +2524,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3102, + "id": 3154, "indexExpression": { "argumentTypes": null, - "id": 3099, + "id": 3151, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3090, + "referencedDeclaration": 3142, "src": "1958:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2549,14 +2549,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3103, + "id": 3155, "indexExpression": { "argumentTypes": null, - "id": 3100, + "id": 3152, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3092, + "referencedDeclaration": 3144, "src": "1963:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2579,7 +2579,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 3104, + "id": 3156, "isConstant": false, "isLValue": false, "isPure": true, @@ -2600,7 +2600,7 @@ "typeString": "bool" } }, - "id": 3106, + "id": 3158, "nodeType": "ExpressionStatement", "src": "1949:26:18" }, @@ -2610,11 +2610,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3108, + "id": 3160, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3088, + "referencedDeclaration": 3140, "src": "2000:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2623,11 +2623,11 @@ }, { "argumentTypes": null, - "id": 3109, + "id": 3161, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3090, + "referencedDeclaration": 3142, "src": "2005:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2636,11 +2636,11 @@ }, { "argumentTypes": null, - "id": 3110, + "id": 3162, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3092, + "referencedDeclaration": 3144, "src": "2010:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2663,18 +2663,18 @@ "typeString": "bytes32" } ], - "id": 3107, + "id": 3159, "name": "LogForbid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2943, + "referencedDeclaration": 2995, "src": "1990:9:18", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3111, + "id": 3163, "isConstant": false, "isLValue": false, "isPure": false, @@ -2688,27 +2688,27 @@ "typeString": "tuple()" } }, - "id": 3112, + "id": 3164, "nodeType": "EmitStatement", "src": "1985:29:18" } ] }, "documentation": null, - "id": 3114, + "id": 3166, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3095, + "id": 3147, "modifierName": { "argumentTypes": null, - "id": 3094, + "id": 3146, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1934:4:18", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2722,15 +2722,15 @@ "name": "forbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 3093, + "id": 3145, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3088, + "id": 3140, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1888:11:18", "stateVariable": false, "storageLocation": "default", @@ -2739,7 +2739,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3087, + "id": 3139, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1888:7:18", @@ -2753,10 +2753,10 @@ }, { "constant": false, - "id": 3090, + "id": 3142, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1901:11:18", "stateVariable": false, "storageLocation": "default", @@ -2765,7 +2765,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3089, + "id": 3141, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1901:7:18", @@ -2779,10 +2779,10 @@ }, { "constant": false, - "id": 3092, + "id": 3144, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1914:11:18", "stateVariable": false, "storageLocation": "default", @@ -2791,7 +2791,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3091, + "id": 3143, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1914:7:18", @@ -2807,12 +2807,12 @@ "src": "1887:39:18" }, "returnParameters": { - "id": 3096, + "id": 3148, "nodeType": "ParameterList", "parameters": [], "src": "1939:0:18" }, - "scope": 3163, + "scope": 3215, "src": "1872:149:18", "stateMutability": "nonpayable", "superFunction": null, @@ -2820,7 +2820,7 @@ }, { "body": { - "id": 3137, + "id": 3189, "nodeType": "Block", "src": "2089:74:18", "statements": [ @@ -2836,11 +2836,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3126, + "id": 3178, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3116, + "referencedDeclaration": 3168, "src": "2122:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2855,7 +2855,7 @@ "typeString": "address" } ], - "id": 3125, + "id": 3177, "isConstant": false, "isLValue": false, "isPure": true, @@ -2868,7 +2868,7 @@ }, "typeName": "bytes20" }, - "id": 3127, + "id": 3179, "isConstant": false, "isLValue": false, "isPure": false, @@ -2890,7 +2890,7 @@ "typeString": "bytes20" } ], - "id": 3124, + "id": 3176, "isConstant": false, "isLValue": false, "isPure": true, @@ -2903,7 +2903,7 @@ }, "typeName": "bytes32" }, - "id": 3128, + "id": 3180, "isConstant": false, "isLValue": false, "isPure": false, @@ -2925,11 +2925,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3131, + "id": 3183, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3118, + "referencedDeclaration": 3170, "src": "2145:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2944,7 +2944,7 @@ "typeString": "address" } ], - "id": 3130, + "id": 3182, "isConstant": false, "isLValue": false, "isPure": true, @@ -2957,7 +2957,7 @@ }, "typeName": "bytes20" }, - "id": 3132, + "id": 3184, "isConstant": false, "isLValue": false, "isPure": false, @@ -2979,7 +2979,7 @@ "typeString": "bytes20" } ], - "id": 3129, + "id": 3181, "isConstant": false, "isLValue": false, "isPure": true, @@ -2992,7 +2992,7 @@ }, "typeName": "bytes32" }, - "id": 3133, + "id": 3185, "isConstant": false, "isLValue": false, "isPure": false, @@ -3008,11 +3008,11 @@ }, { "argumentTypes": null, - "id": 3134, + "id": 3186, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3120, + "referencedDeclaration": 3172, "src": "2152:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -3035,21 +3035,21 @@ "typeString": "bytes32" } ], - "id": 3123, + "id": 3175, "name": "permit", "nodeType": "Identifier", "overloadedDeclarations": [ - 3086, - 3138 + 3138, + 3190 ], - "referencedDeclaration": 3086, + "referencedDeclaration": 3138, "src": "2099:6:18", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3135, + "id": 3187, "isConstant": false, "isLValue": false, "isPure": false, @@ -3063,29 +3063,29 @@ "typeString": "tuple()" } }, - "id": 3136, + "id": 3188, "nodeType": "ExpressionStatement", "src": "2099:57:18" } ] }, "documentation": null, - "id": 3138, + "id": 3190, "implemented": true, "kind": "function", "modifiers": [], "name": "permit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3121, + "id": 3173, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3116, + "id": 3168, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2043:11:18", "stateVariable": false, "storageLocation": "default", @@ -3094,7 +3094,7 @@ "typeString": "address" }, "typeName": { - "id": 3115, + "id": 3167, "name": "address", "nodeType": "ElementaryTypeName", "src": "2043:7:18", @@ -3109,10 +3109,10 @@ }, { "constant": false, - "id": 3118, + "id": 3170, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2056:11:18", "stateVariable": false, "storageLocation": "default", @@ -3121,7 +3121,7 @@ "typeString": "address" }, "typeName": { - "id": 3117, + "id": 3169, "name": "address", "nodeType": "ElementaryTypeName", "src": "2056:7:18", @@ -3136,10 +3136,10 @@ }, { "constant": false, - "id": 3120, + "id": 3172, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2069:11:18", "stateVariable": false, "storageLocation": "default", @@ -3148,7 +3148,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3119, + "id": 3171, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2069:7:18", @@ -3164,12 +3164,12 @@ "src": "2042:39:18" }, "returnParameters": { - "id": 3122, + "id": 3174, "nodeType": "ParameterList", "parameters": [], "src": "2089:0:18" }, - "scope": 3163, + "scope": 3215, "src": "2027:136:18", "stateMutability": "nonpayable", "superFunction": null, @@ -3177,7 +3177,7 @@ }, { "body": { - "id": 3161, + "id": 3213, "nodeType": "Block", "src": "2230:74:18", "statements": [ @@ -3193,11 +3193,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3150, + "id": 3202, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3140, + "referencedDeclaration": 3192, "src": "2263:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3212,7 +3212,7 @@ "typeString": "address" } ], - "id": 3149, + "id": 3201, "isConstant": false, "isLValue": false, "isPure": true, @@ -3225,7 +3225,7 @@ }, "typeName": "bytes20" }, - "id": 3151, + "id": 3203, "isConstant": false, "isLValue": false, "isPure": false, @@ -3247,7 +3247,7 @@ "typeString": "bytes20" } ], - "id": 3148, + "id": 3200, "isConstant": false, "isLValue": false, "isPure": true, @@ -3260,7 +3260,7 @@ }, "typeName": "bytes32" }, - "id": 3152, + "id": 3204, "isConstant": false, "isLValue": false, "isPure": false, @@ -3282,11 +3282,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3155, + "id": 3207, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3142, + "referencedDeclaration": 3194, "src": "2286:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3301,7 +3301,7 @@ "typeString": "address" } ], - "id": 3154, + "id": 3206, "isConstant": false, "isLValue": false, "isPure": true, @@ -3314,7 +3314,7 @@ }, "typeName": "bytes20" }, - "id": 3156, + "id": 3208, "isConstant": false, "isLValue": false, "isPure": false, @@ -3336,7 +3336,7 @@ "typeString": "bytes20" } ], - "id": 3153, + "id": 3205, "isConstant": false, "isLValue": false, "isPure": true, @@ -3349,7 +3349,7 @@ }, "typeName": "bytes32" }, - "id": 3157, + "id": 3209, "isConstant": false, "isLValue": false, "isPure": false, @@ -3365,11 +3365,11 @@ }, { "argumentTypes": null, - "id": 3158, + "id": 3210, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3144, + "referencedDeclaration": 3196, "src": "2293:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -3392,21 +3392,21 @@ "typeString": "bytes32" } ], - "id": 3147, + "id": 3199, "name": "forbid", "nodeType": "Identifier", "overloadedDeclarations": [ - 3114, - 3162 + 3166, + 3214 ], - "referencedDeclaration": 3114, + "referencedDeclaration": 3166, "src": "2240:6:18", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3159, + "id": 3211, "isConstant": false, "isLValue": false, "isPure": false, @@ -3420,29 +3420,29 @@ "typeString": "tuple()" } }, - "id": 3160, + "id": 3212, "nodeType": "ExpressionStatement", "src": "2240:57:18" } ] }, "documentation": null, - "id": 3162, + "id": 3214, "implemented": true, "kind": "function", "modifiers": [], "name": "forbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 3145, + "id": 3197, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3140, + "id": 3192, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2184:11:18", "stateVariable": false, "storageLocation": "default", @@ -3451,7 +3451,7 @@ "typeString": "address" }, "typeName": { - "id": 3139, + "id": 3191, "name": "address", "nodeType": "ElementaryTypeName", "src": "2184:7:18", @@ -3466,10 +3466,10 @@ }, { "constant": false, - "id": 3142, + "id": 3194, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2197:11:18", "stateVariable": false, "storageLocation": "default", @@ -3478,7 +3478,7 @@ "typeString": "address" }, "typeName": { - "id": 3141, + "id": 3193, "name": "address", "nodeType": "ElementaryTypeName", "src": "2197:7:18", @@ -3493,10 +3493,10 @@ }, { "constant": false, - "id": 3144, + "id": 3196, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2210:11:18", "stateVariable": false, "storageLocation": "default", @@ -3505,7 +3505,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3143, + "id": 3195, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2210:7:18", @@ -3521,42 +3521,42 @@ "src": "2183:39:18" }, "returnParameters": { - "id": 3146, + "id": 3198, "nodeType": "ParameterList", "parameters": [], "src": "2230:0:18" }, - "scope": 3163, + "scope": 3215, "src": "2168:136:18", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3196, + "scope": 3248, "src": "1048:1259:18" }, { "baseContracts": [], "contractDependencies": [ - 3163 + 3215 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3195, + "id": 3247, "linearizedBaseContracts": [ - 3195 + 3247 ], "name": "DSGuardFactory", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3167, + "id": 3219, "name": "isGuard", "nodeType": "VariableDeclaration", - "scope": 3195, + "scope": 3247, "src": "2339:42:18", "stateVariable": true, "storageLocation": "default", @@ -3565,9 +3565,9 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 3166, + "id": 3218, "keyType": { - "id": 3164, + "id": 3216, "name": "address", "nodeType": "ElementaryTypeName", "src": "2348:7:18", @@ -3583,7 +3583,7 @@ "typeString": "mapping(address => bool)" }, "valueType": { - "id": 3165, + "id": 3217, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2359:4:18", @@ -3598,28 +3598,28 @@ }, { "body": { - "id": 3193, + "id": 3245, "nodeType": "Block", "src": "2439:114:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3176, + "id": 3228, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3172, + "id": 3224, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2449:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -3630,7 +3630,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3174, + "id": 3226, "isConstant": false, "isLValue": false, "isPure": false, @@ -3638,23 +3638,23 @@ "nodeType": "NewExpression", "src": "2457:11:18", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuard_$3215_$", "typeString": "function () returns (contract DSGuard)" }, "typeName": { "contractScope": null, - "id": 3173, + "id": 3225, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2461:7:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } }, - "id": 3175, + "id": 3227, "isConstant": false, "isLValue": false, "isPure": false, @@ -3664,17 +3664,17 @@ "nodeType": "FunctionCall", "src": "2457:13:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, "src": "2449:21:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 3177, + "id": 3229, "nodeType": "ExpressionStatement", "src": "2449:21:18" }, @@ -3686,18 +3686,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3181, + "id": 3233, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "2495:3:18", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3182, + "id": 3234, "isConstant": false, "isLValue": false, "isPure": false, @@ -3721,32 +3721,32 @@ ], "expression": { "argumentTypes": null, - "id": 3178, + "id": 3230, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2480:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 3180, + "id": 3232, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "2480:14:18", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 3183, + "id": 3235, "isConstant": false, "isLValue": false, "isPure": false, @@ -3760,14 +3760,14 @@ "typeString": "tuple()" } }, - "id": 3184, + "id": 3236, "nodeType": "ExpressionStatement", "src": "2480:26:18" }, { "expression": { "argumentTypes": null, - "id": 3191, + "id": 3243, "isConstant": false, "isLValue": false, "isPure": false, @@ -3776,31 +3776,31 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3185, + "id": 3237, "name": "isGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3167, + "referencedDeclaration": 3219, "src": "2516:7:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 3189, + "id": 3241, "indexExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3187, + "id": 3239, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2532:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } @@ -3808,11 +3808,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } ], - "id": 3186, + "id": 3238, "isConstant": false, "isLValue": false, "isPure": true, @@ -3825,7 +3825,7 @@ }, "typeName": "address" }, - "id": 3188, + "id": 3240, "isConstant": false, "isLValue": false, "isPure": false, @@ -3855,7 +3855,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3190, + "id": 3242, "isConstant": false, "isLValue": false, "isPure": true, @@ -3876,51 +3876,51 @@ "typeString": "bool" } }, - "id": 3192, + "id": 3244, "nodeType": "ExpressionStatement", "src": "2516:30:18" } ] }, "documentation": null, - "id": 3194, + "id": 3246, "implemented": true, "kind": "function", "modifiers": [], "name": "newGuard", "nodeType": "FunctionDefinition", "parameters": { - "id": 3168, + "id": 3220, "nodeType": "ParameterList", "parameters": [], "src": "2405:2:18" }, "returnParameters": { - "id": 3171, + "id": 3223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3170, + "id": 3222, "name": "guard", "nodeType": "VariableDeclaration", - "scope": 3194, + "scope": 3246, "src": "2424:13:18", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" }, "typeName": { "contractScope": null, - "id": 3169, + "id": 3221, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2424:7:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -3930,14 +3930,14 @@ ], "src": "2423:15:18" }, - "scope": 3195, + "scope": 3247, "src": "2388:165:18", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3196, + "scope": 3248, "src": "2309:246:18" } ], @@ -3947,20 +3947,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "exportedSymbols": { "DSGuard": [ - 3163 + 3215 ], "DSGuardEvents": [ - 2944 + 2996 ], "DSGuardFactory": [ - 3195 + 3247 ] }, - "id": 3196, + "id": 3248, "nodeType": "SourceUnit", "nodes": [ { - "id": 2926, + "id": 2978, "literals": [ "solidity", "0.5", @@ -3972,10 +3972,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "file": "./Auth.sol", - "id": 2927, + "id": 2979, "nodeType": "ImportDirective", - "scope": 3196, - "sourceUnit": 2925, + "scope": 3248, + "sourceUnit": 2977, "src": "769:20:18", "symbolAliases": [], "unitAlias": "" @@ -3986,9 +3986,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2944, + "id": 2996, "linearizedBaseContracts": [ - 2944 + 2996 ], "name": "DSGuardEvents", "nodeType": "ContractDefinition", @@ -3996,20 +3996,20 @@ { "anonymous": false, "documentation": null, - "id": 2935, + "id": 2987, "name": "LogPermit", "nodeType": "EventDefinition", "parameters": { - "id": 2934, + "id": 2986, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2929, + "id": 2981, "indexed": true, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "845:19:18", "stateVariable": false, "storageLocation": "default", @@ -4018,7 +4018,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2928, + "id": 2980, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "845:7:18", @@ -4032,11 +4032,11 @@ }, { "constant": false, - "id": 2931, + "id": 2983, "indexed": true, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "874:19:18", "stateVariable": false, "storageLocation": "default", @@ -4045,7 +4045,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2930, + "id": 2982, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "874:7:18", @@ -4059,11 +4059,11 @@ }, { "constant": false, - "id": 2933, + "id": 2985, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "903:19:18", "stateVariable": false, "storageLocation": "default", @@ -4072,7 +4072,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2932, + "id": 2984, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "903:7:18", @@ -4092,20 +4092,20 @@ { "anonymous": false, "documentation": null, - "id": 2943, + "id": 2995, "name": "LogForbid", "nodeType": "EventDefinition", "parameters": { - "id": 2942, + "id": 2994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2937, + "id": 2989, "indexed": true, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "960:19:18", "stateVariable": false, "storageLocation": "default", @@ -4114,7 +4114,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2936, + "id": 2988, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "960:7:18", @@ -4128,11 +4128,11 @@ }, { "constant": false, - "id": 2939, + "id": 2991, "indexed": true, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "989:19:18", "stateVariable": false, "storageLocation": "default", @@ -4141,7 +4141,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2938, + "id": 2990, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "989:7:18", @@ -4155,11 +4155,11 @@ }, { "constant": false, - "id": 2941, + "id": 2993, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "1018:19:18", "stateVariable": false, "storageLocation": "default", @@ -4168,7 +4168,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2940, + "id": 2992, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1018:7:18", @@ -4186,7 +4186,7 @@ "src": "935:109:18" } ], - "scope": 3196, + "scope": 3248, "src": "791:255:18" }, { @@ -4195,17 +4195,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2945, + "id": 2997, "name": "DSAuth", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2924, + "referencedDeclaration": 2976, "src": "1068:6:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } }, - "id": 2946, + "id": 2998, "nodeType": "InheritanceSpecifier", "src": "1068:6:18" }, @@ -4213,17 +4213,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2947, + "id": 2999, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "1076:11:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2948, + "id": 3000, "nodeType": "InheritanceSpecifier", "src": "1076:11:18" }, @@ -4231,47 +4231,47 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2949, + "id": 3001, "name": "DSGuardEvents", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2944, + "referencedDeclaration": 2996, "src": "1089:13:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardEvents_$2944", + "typeIdentifier": "t_contract$_DSGuardEvents_$2996", "typeString": "contract DSGuardEvents" } }, - "id": 2950, + "id": 3002, "nodeType": "InheritanceSpecifier", "src": "1089:13:18" } ], "contractDependencies": [ - 2799, - 2808, - 2924, - 2944 + 2851, + 2860, + 2976, + 2996 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3163, + "id": 3215, "linearizedBaseContracts": [ - 3163, - 2944, - 2799, - 2924, - 2808 + 3215, + 2996, + 2851, + 2976, + 2860 ], "name": "DSGuard", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 2958, + "id": 3010, "name": "ANY", "nodeType": "VariableDeclaration", - "scope": 3163, + "scope": 3215, "src": "1109:47:18", "stateVariable": true, "storageLocation": "default", @@ -4280,7 +4280,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2951, + "id": 3003, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1109:7:18", @@ -4297,7 +4297,7 @@ "arguments": [ { "argumentTypes": null, - "id": 2955, + "id": 3007, "isConstant": false, "isLValue": false, "isPure": true, @@ -4309,7 +4309,7 @@ "subExpression": { "argumentTypes": null, "hexValue": "31", - "id": 2954, + "id": 3006, "isConstant": false, "isLValue": false, "isPure": true, @@ -4337,7 +4337,7 @@ "typeString": "int_const -1" } ], - "id": 2953, + "id": 3005, "isConstant": false, "isLValue": false, "isPure": true, @@ -4350,7 +4350,7 @@ }, "typeName": "uint" }, - "id": 2956, + "id": 3008, "isConstant": false, "isLValue": false, "isPure": true, @@ -4372,7 +4372,7 @@ "typeString": "uint256" } ], - "id": 2952, + "id": 3004, "isConstant": false, "isLValue": false, "isPure": true, @@ -4385,7 +4385,7 @@ }, "typeName": "bytes32" }, - "id": 2957, + "id": 3009, "isConstant": false, "isLValue": false, "isPure": true, @@ -4403,10 +4403,10 @@ }, { "constant": false, - "id": 2966, + "id": 3018, "name": "acl", "nodeType": "VariableDeclaration", - "scope": 3163, + "scope": 3215, "src": "1163:71:18", "stateVariable": true, "storageLocation": "default", @@ -4415,9 +4415,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" }, "typeName": { - "id": 2965, + "id": 3017, "keyType": { - "id": 2959, + "id": 3011, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1172:7:18", @@ -4433,9 +4433,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" }, "valueType": { - "id": 2964, + "id": 3016, "keyType": { - "id": 2960, + "id": 3012, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1192:7:18", @@ -4451,9 +4451,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" }, "valueType": { - "id": 2963, + "id": 3015, "keyType": { - "id": 2961, + "id": 3013, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1212:7:18", @@ -4469,7 +4469,7 @@ "typeString": "mapping(bytes32 => bool)" }, "valueType": { - "id": 2962, + "id": 3014, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1223:4:18", @@ -4486,21 +4486,21 @@ }, { "body": { - "id": 3057, + "id": 3109, "nodeType": "Block", "src": "1339:373:18", "statements": [ { "assignments": [ - 2978 + 3030 ], "declarations": [ { "constant": false, - "id": 2978, + "id": 3030, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3057, + "scope": 3109, "src": "1349:11:18", "stateVariable": false, "storageLocation": "default", @@ -4509,7 +4509,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2977, + "id": 3029, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1349:7:18", @@ -4522,7 +4522,7 @@ "visibility": "internal" } ], - "id": 2984, + "id": 3036, "initialValue": { "argumentTypes": null, "arguments": [ @@ -4531,11 +4531,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2981, + "id": 3033, "name": "src_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2968, + "referencedDeclaration": 3020, "src": "1379:4:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4550,7 +4550,7 @@ "typeString": "address" } ], - "id": 2980, + "id": 3032, "isConstant": false, "isLValue": false, "isPure": true, @@ -4563,7 +4563,7 @@ }, "typeName": "bytes20" }, - "id": 2982, + "id": 3034, "isConstant": false, "isLValue": false, "isPure": false, @@ -4585,7 +4585,7 @@ "typeString": "bytes20" } ], - "id": 2979, + "id": 3031, "isConstant": false, "isLValue": false, "isPure": true, @@ -4598,7 +4598,7 @@ }, "typeName": "bytes32" }, - "id": 2983, + "id": 3035, "isConstant": false, "isLValue": false, "isPure": false, @@ -4617,15 +4617,15 @@ }, { "assignments": [ - 2986 + 3038 ], "declarations": [ { "constant": false, - "id": 2986, + "id": 3038, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3057, + "scope": 3109, "src": "1395:11:18", "stateVariable": false, "storageLocation": "default", @@ -4634,7 +4634,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2985, + "id": 3037, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1395:7:18", @@ -4647,7 +4647,7 @@ "visibility": "internal" } ], - "id": 2992, + "id": 3044, "initialValue": { "argumentTypes": null, "arguments": [ @@ -4656,11 +4656,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2989, + "id": 3041, "name": "dst_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2970, + "referencedDeclaration": 3022, "src": "1425:4:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4675,7 +4675,7 @@ "typeString": "address" } ], - "id": 2988, + "id": 3040, "isConstant": false, "isLValue": false, "isPure": true, @@ -4688,7 +4688,7 @@ }, "typeName": "bytes20" }, - "id": 2990, + "id": 3042, "isConstant": false, "isLValue": false, "isPure": false, @@ -4710,7 +4710,7 @@ "typeString": "bytes20" } ], - "id": 2987, + "id": 3039, "isConstant": false, "isLValue": false, "isPure": true, @@ -4723,7 +4723,7 @@ }, "typeName": "bytes32" }, - "id": 2991, + "id": 3043, "isConstant": false, "isLValue": false, "isPure": false, @@ -4747,7 +4747,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3055, + "id": 3107, "isConstant": false, "isLValue": false, "isPure": false, @@ -4758,7 +4758,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3047, + "id": 3099, "isConstant": false, "isLValue": false, "isPure": false, @@ -4769,7 +4769,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3039, + "id": 3091, "isConstant": false, "isLValue": false, "isPure": false, @@ -4780,7 +4780,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3031, + "id": 3083, "isConstant": false, "isLValue": false, "isPure": false, @@ -4791,7 +4791,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3023, + "id": 3075, "isConstant": false, "isLValue": false, "isPure": false, @@ -4802,7 +4802,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3015, + "id": 3067, "isConstant": false, "isLValue": false, "isPure": false, @@ -4813,7 +4813,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3007, + "id": 3059, "isConstant": false, "isLValue": false, "isPure": false, @@ -4826,25 +4826,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2993, + "id": 3045, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1449:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 2995, + "id": 3047, "indexExpression": { "argumentTypes": null, - "id": 2994, + "id": 3046, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1453:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4862,14 +4862,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 2997, + "id": 3049, "indexExpression": { "argumentTypes": null, - "id": 2996, + "id": 3048, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1458:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4887,14 +4887,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 2999, + "id": 3051, "indexExpression": { "argumentTypes": null, - "id": 2998, + "id": 3050, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1463:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -4922,25 +4922,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3000, + "id": 3052, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1483:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3002, + "id": 3054, "indexExpression": { "argumentTypes": null, - "id": 3001, + "id": 3053, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1487:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4958,14 +4958,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3004, + "id": 3056, "indexExpression": { "argumentTypes": null, - "id": 3003, + "id": 3055, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1492:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4983,14 +4983,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3006, + "id": 3058, "indexExpression": { "argumentTypes": null, - "id": 3005, + "id": 3057, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1497:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5024,25 +5024,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3008, + "id": 3060, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1517:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3010, + "id": 3062, "indexExpression": { "argumentTypes": null, - "id": 3009, + "id": 3061, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1521:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5060,14 +5060,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3012, + "id": 3064, "indexExpression": { "argumentTypes": null, - "id": 3011, + "id": 3063, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1526:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5085,14 +5085,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3014, + "id": 3066, "indexExpression": { "argumentTypes": null, - "id": 3013, + "id": 3065, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1531:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -5126,25 +5126,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3016, + "id": 3068, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1551:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3018, + "id": 3070, "indexExpression": { "argumentTypes": null, - "id": 3017, + "id": 3069, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1555:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5162,14 +5162,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3020, + "id": 3072, "indexExpression": { "argumentTypes": null, - "id": 3019, + "id": 3071, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1560:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5187,14 +5187,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3022, + "id": 3074, "indexExpression": { "argumentTypes": null, - "id": 3021, + "id": 3073, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1565:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5228,25 +5228,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3024, + "id": 3076, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1585:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3026, + "id": 3078, "indexExpression": { "argumentTypes": null, - "id": 3025, + "id": 3077, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1589:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5264,14 +5264,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3028, + "id": 3080, "indexExpression": { "argumentTypes": null, - "id": 3027, + "id": 3079, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1594:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5289,14 +5289,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3030, + "id": 3082, "indexExpression": { "argumentTypes": null, - "id": 3029, + "id": 3081, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1599:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -5330,25 +5330,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3032, + "id": 3084, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1619:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3034, + "id": 3086, "indexExpression": { "argumentTypes": null, - "id": 3033, + "id": 3085, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1623:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5366,14 +5366,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3036, + "id": 3088, "indexExpression": { "argumentTypes": null, - "id": 3035, + "id": 3087, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1628:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5391,14 +5391,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3038, + "id": 3090, "indexExpression": { "argumentTypes": null, - "id": 3037, + "id": 3089, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1633:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5432,25 +5432,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3040, + "id": 3092, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1653:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3042, + "id": 3094, "indexExpression": { "argumentTypes": null, - "id": 3041, + "id": 3093, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1657:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5468,14 +5468,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3044, + "id": 3096, "indexExpression": { "argumentTypes": null, - "id": 3043, + "id": 3095, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1662:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5493,14 +5493,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3046, + "id": 3098, "indexExpression": { "argumentTypes": null, - "id": 3045, + "id": 3097, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1667:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -5534,25 +5534,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3048, + "id": 3100, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1687:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3050, + "id": 3102, "indexExpression": { "argumentTypes": null, - "id": 3049, + "id": 3101, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1691:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5570,14 +5570,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3052, + "id": 3104, "indexExpression": { "argumentTypes": null, - "id": 3051, + "id": 3103, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1696:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5595,14 +5595,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3054, + "id": 3106, "indexExpression": { "argumentTypes": null, - "id": 3053, + "id": 3105, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1701:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5626,30 +5626,30 @@ "typeString": "bool" } }, - "functionReturnParameters": 2976, - "id": 3056, + "functionReturnParameters": 3028, + "id": 3108, "nodeType": "Return", "src": "1442:263:18" } ] }, "documentation": null, - "id": 3058, + "id": 3110, "implemented": true, "kind": "function", "modifiers": [], "name": "canCall", "nodeType": "FunctionDefinition", "parameters": { - "id": 2973, + "id": 3025, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2968, + "id": 3020, "name": "src_", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1267:12:18", "stateVariable": false, "storageLocation": "default", @@ -5658,7 +5658,7 @@ "typeString": "address" }, "typeName": { - "id": 2967, + "id": 3019, "name": "address", "nodeType": "ElementaryTypeName", "src": "1267:7:18", @@ -5673,10 +5673,10 @@ }, { "constant": false, - "id": 2970, + "id": 3022, "name": "dst_", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1281:12:18", "stateVariable": false, "storageLocation": "default", @@ -5685,7 +5685,7 @@ "typeString": "address" }, "typeName": { - "id": 2969, + "id": 3021, "name": "address", "nodeType": "ElementaryTypeName", "src": "1281:7:18", @@ -5700,10 +5700,10 @@ }, { "constant": false, - "id": 2972, + "id": 3024, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1295:10:18", "stateVariable": false, "storageLocation": "default", @@ -5712,7 +5712,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2971, + "id": 3023, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "1295:6:18", @@ -5728,15 +5728,15 @@ "src": "1257:54:18" }, "returnParameters": { - "id": 2976, + "id": 3028, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2975, + "id": 3027, "name": "", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1333:4:18", "stateVariable": false, "storageLocation": "default", @@ -5745,7 +5745,7 @@ "typeString": "bool" }, "typeName": { - "id": 2974, + "id": 3026, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1333:4:18", @@ -5760,22 +5760,22 @@ ], "src": "1332:6:18" }, - "scope": 3163, + "scope": 3215, "src": "1241:471:18", "stateMutability": "view", - "superFunction": 2798, + "superFunction": 2850, "visibility": "public" }, { "body": { - "id": 3085, + "id": 3137, "nodeType": "Block", "src": "1785:81:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3077, + "id": 3129, "isConstant": false, "isLValue": false, "isPure": false, @@ -5788,25 +5788,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3069, + "id": 3121, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1795:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3073, + "id": 3125, "indexExpression": { "argumentTypes": null, - "id": 3070, + "id": 3122, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3060, + "referencedDeclaration": 3112, "src": "1799:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5824,14 +5824,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3074, + "id": 3126, "indexExpression": { "argumentTypes": null, - "id": 3071, + "id": 3123, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3062, + "referencedDeclaration": 3114, "src": "1804:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5849,14 +5849,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3075, + "id": 3127, "indexExpression": { "argumentTypes": null, - "id": 3072, + "id": 3124, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3064, + "referencedDeclaration": 3116, "src": "1809:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5879,7 +5879,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3076, + "id": 3128, "isConstant": false, "isLValue": false, "isPure": true, @@ -5900,7 +5900,7 @@ "typeString": "bool" } }, - "id": 3078, + "id": 3130, "nodeType": "ExpressionStatement", "src": "1795:25:18" }, @@ -5910,11 +5910,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3080, + "id": 3132, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3060, + "referencedDeclaration": 3112, "src": "1845:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5923,11 +5923,11 @@ }, { "argumentTypes": null, - "id": 3081, + "id": 3133, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3062, + "referencedDeclaration": 3114, "src": "1850:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5936,11 +5936,11 @@ }, { "argumentTypes": null, - "id": 3082, + "id": 3134, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3064, + "referencedDeclaration": 3116, "src": "1855:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5963,18 +5963,18 @@ "typeString": "bytes32" } ], - "id": 3079, + "id": 3131, "name": "LogPermit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2935, + "referencedDeclaration": 2987, "src": "1835:9:18", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3083, + "id": 3135, "isConstant": false, "isLValue": false, "isPure": false, @@ -5988,27 +5988,27 @@ "typeString": "tuple()" } }, - "id": 3084, + "id": 3136, "nodeType": "EmitStatement", "src": "1830:29:18" } ] }, "documentation": null, - "id": 3086, + "id": 3138, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3067, + "id": 3119, "modifierName": { "argumentTypes": null, - "id": 3066, + "id": 3118, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1780:4:18", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -6022,15 +6022,15 @@ "name": "permit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3065, + "id": 3117, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3060, + "id": 3112, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1734:11:18", "stateVariable": false, "storageLocation": "default", @@ -6039,7 +6039,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3059, + "id": 3111, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1734:7:18", @@ -6053,10 +6053,10 @@ }, { "constant": false, - "id": 3062, + "id": 3114, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1747:11:18", "stateVariable": false, "storageLocation": "default", @@ -6065,7 +6065,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3061, + "id": 3113, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1747:7:18", @@ -6079,10 +6079,10 @@ }, { "constant": false, - "id": 3064, + "id": 3116, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1760:11:18", "stateVariable": false, "storageLocation": "default", @@ -6091,7 +6091,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3063, + "id": 3115, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1760:7:18", @@ -6107,12 +6107,12 @@ "src": "1733:39:18" }, "returnParameters": { - "id": 3068, + "id": 3120, "nodeType": "ParameterList", "parameters": [], "src": "1785:0:18" }, - "scope": 3163, + "scope": 3215, "src": "1718:148:18", "stateMutability": "nonpayable", "superFunction": null, @@ -6120,14 +6120,14 @@ }, { "body": { - "id": 3113, + "id": 3165, "nodeType": "Block", "src": "1939:82:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3105, + "id": 3157, "isConstant": false, "isLValue": false, "isPure": false, @@ -6140,25 +6140,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3097, + "id": 3149, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1949:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3101, + "id": 3153, "indexExpression": { "argumentTypes": null, - "id": 3098, + "id": 3150, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3088, + "referencedDeclaration": 3140, "src": "1953:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6176,14 +6176,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3102, + "id": 3154, "indexExpression": { "argumentTypes": null, - "id": 3099, + "id": 3151, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3090, + "referencedDeclaration": 3142, "src": "1958:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6201,14 +6201,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3103, + "id": 3155, "indexExpression": { "argumentTypes": null, - "id": 3100, + "id": 3152, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3092, + "referencedDeclaration": 3144, "src": "1963:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6231,7 +6231,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 3104, + "id": 3156, "isConstant": false, "isLValue": false, "isPure": true, @@ -6252,7 +6252,7 @@ "typeString": "bool" } }, - "id": 3106, + "id": 3158, "nodeType": "ExpressionStatement", "src": "1949:26:18" }, @@ -6262,11 +6262,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3108, + "id": 3160, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3088, + "referencedDeclaration": 3140, "src": "2000:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6275,11 +6275,11 @@ }, { "argumentTypes": null, - "id": 3109, + "id": 3161, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3090, + "referencedDeclaration": 3142, "src": "2005:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6288,11 +6288,11 @@ }, { "argumentTypes": null, - "id": 3110, + "id": 3162, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3092, + "referencedDeclaration": 3144, "src": "2010:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6315,18 +6315,18 @@ "typeString": "bytes32" } ], - "id": 3107, + "id": 3159, "name": "LogForbid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2943, + "referencedDeclaration": 2995, "src": "1990:9:18", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3111, + "id": 3163, "isConstant": false, "isLValue": false, "isPure": false, @@ -6340,27 +6340,27 @@ "typeString": "tuple()" } }, - "id": 3112, + "id": 3164, "nodeType": "EmitStatement", "src": "1985:29:18" } ] }, "documentation": null, - "id": 3114, + "id": 3166, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3095, + "id": 3147, "modifierName": { "argumentTypes": null, - "id": 3094, + "id": 3146, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1934:4:18", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -6374,15 +6374,15 @@ "name": "forbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 3093, + "id": 3145, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3088, + "id": 3140, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1888:11:18", "stateVariable": false, "storageLocation": "default", @@ -6391,7 +6391,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3087, + "id": 3139, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1888:7:18", @@ -6405,10 +6405,10 @@ }, { "constant": false, - "id": 3090, + "id": 3142, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1901:11:18", "stateVariable": false, "storageLocation": "default", @@ -6417,7 +6417,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3089, + "id": 3141, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1901:7:18", @@ -6431,10 +6431,10 @@ }, { "constant": false, - "id": 3092, + "id": 3144, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1914:11:18", "stateVariable": false, "storageLocation": "default", @@ -6443,7 +6443,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3091, + "id": 3143, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1914:7:18", @@ -6459,12 +6459,12 @@ "src": "1887:39:18" }, "returnParameters": { - "id": 3096, + "id": 3148, "nodeType": "ParameterList", "parameters": [], "src": "1939:0:18" }, - "scope": 3163, + "scope": 3215, "src": "1872:149:18", "stateMutability": "nonpayable", "superFunction": null, @@ -6472,7 +6472,7 @@ }, { "body": { - "id": 3137, + "id": 3189, "nodeType": "Block", "src": "2089:74:18", "statements": [ @@ -6488,11 +6488,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3126, + "id": 3178, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3116, + "referencedDeclaration": 3168, "src": "2122:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6507,7 +6507,7 @@ "typeString": "address" } ], - "id": 3125, + "id": 3177, "isConstant": false, "isLValue": false, "isPure": true, @@ -6520,7 +6520,7 @@ }, "typeName": "bytes20" }, - "id": 3127, + "id": 3179, "isConstant": false, "isLValue": false, "isPure": false, @@ -6542,7 +6542,7 @@ "typeString": "bytes20" } ], - "id": 3124, + "id": 3176, "isConstant": false, "isLValue": false, "isPure": true, @@ -6555,7 +6555,7 @@ }, "typeName": "bytes32" }, - "id": 3128, + "id": 3180, "isConstant": false, "isLValue": false, "isPure": false, @@ -6577,11 +6577,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3131, + "id": 3183, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3118, + "referencedDeclaration": 3170, "src": "2145:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6596,7 +6596,7 @@ "typeString": "address" } ], - "id": 3130, + "id": 3182, "isConstant": false, "isLValue": false, "isPure": true, @@ -6609,7 +6609,7 @@ }, "typeName": "bytes20" }, - "id": 3132, + "id": 3184, "isConstant": false, "isLValue": false, "isPure": false, @@ -6631,7 +6631,7 @@ "typeString": "bytes20" } ], - "id": 3129, + "id": 3181, "isConstant": false, "isLValue": false, "isPure": true, @@ -6644,7 +6644,7 @@ }, "typeName": "bytes32" }, - "id": 3133, + "id": 3185, "isConstant": false, "isLValue": false, "isPure": false, @@ -6660,11 +6660,11 @@ }, { "argumentTypes": null, - "id": 3134, + "id": 3186, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3120, + "referencedDeclaration": 3172, "src": "2152:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6687,21 +6687,21 @@ "typeString": "bytes32" } ], - "id": 3123, + "id": 3175, "name": "permit", "nodeType": "Identifier", "overloadedDeclarations": [ - 3086, - 3138 + 3138, + 3190 ], - "referencedDeclaration": 3086, + "referencedDeclaration": 3138, "src": "2099:6:18", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3135, + "id": 3187, "isConstant": false, "isLValue": false, "isPure": false, @@ -6715,29 +6715,29 @@ "typeString": "tuple()" } }, - "id": 3136, + "id": 3188, "nodeType": "ExpressionStatement", "src": "2099:57:18" } ] }, "documentation": null, - "id": 3138, + "id": 3190, "implemented": true, "kind": "function", "modifiers": [], "name": "permit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3121, + "id": 3173, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3116, + "id": 3168, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2043:11:18", "stateVariable": false, "storageLocation": "default", @@ -6746,7 +6746,7 @@ "typeString": "address" }, "typeName": { - "id": 3115, + "id": 3167, "name": "address", "nodeType": "ElementaryTypeName", "src": "2043:7:18", @@ -6761,10 +6761,10 @@ }, { "constant": false, - "id": 3118, + "id": 3170, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2056:11:18", "stateVariable": false, "storageLocation": "default", @@ -6773,7 +6773,7 @@ "typeString": "address" }, "typeName": { - "id": 3117, + "id": 3169, "name": "address", "nodeType": "ElementaryTypeName", "src": "2056:7:18", @@ -6788,10 +6788,10 @@ }, { "constant": false, - "id": 3120, + "id": 3172, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2069:11:18", "stateVariable": false, "storageLocation": "default", @@ -6800,7 +6800,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3119, + "id": 3171, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2069:7:18", @@ -6816,12 +6816,12 @@ "src": "2042:39:18" }, "returnParameters": { - "id": 3122, + "id": 3174, "nodeType": "ParameterList", "parameters": [], "src": "2089:0:18" }, - "scope": 3163, + "scope": 3215, "src": "2027:136:18", "stateMutability": "nonpayable", "superFunction": null, @@ -6829,7 +6829,7 @@ }, { "body": { - "id": 3161, + "id": 3213, "nodeType": "Block", "src": "2230:74:18", "statements": [ @@ -6845,11 +6845,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3150, + "id": 3202, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3140, + "referencedDeclaration": 3192, "src": "2263:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6864,7 +6864,7 @@ "typeString": "address" } ], - "id": 3149, + "id": 3201, "isConstant": false, "isLValue": false, "isPure": true, @@ -6877,7 +6877,7 @@ }, "typeName": "bytes20" }, - "id": 3151, + "id": 3203, "isConstant": false, "isLValue": false, "isPure": false, @@ -6899,7 +6899,7 @@ "typeString": "bytes20" } ], - "id": 3148, + "id": 3200, "isConstant": false, "isLValue": false, "isPure": true, @@ -6912,7 +6912,7 @@ }, "typeName": "bytes32" }, - "id": 3152, + "id": 3204, "isConstant": false, "isLValue": false, "isPure": false, @@ -6934,11 +6934,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3155, + "id": 3207, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3142, + "referencedDeclaration": 3194, "src": "2286:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6953,7 +6953,7 @@ "typeString": "address" } ], - "id": 3154, + "id": 3206, "isConstant": false, "isLValue": false, "isPure": true, @@ -6966,7 +6966,7 @@ }, "typeName": "bytes20" }, - "id": 3156, + "id": 3208, "isConstant": false, "isLValue": false, "isPure": false, @@ -6988,7 +6988,7 @@ "typeString": "bytes20" } ], - "id": 3153, + "id": 3205, "isConstant": false, "isLValue": false, "isPure": true, @@ -7001,7 +7001,7 @@ }, "typeName": "bytes32" }, - "id": 3157, + "id": 3209, "isConstant": false, "isLValue": false, "isPure": false, @@ -7017,11 +7017,11 @@ }, { "argumentTypes": null, - "id": 3158, + "id": 3210, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3144, + "referencedDeclaration": 3196, "src": "2293:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7044,21 +7044,21 @@ "typeString": "bytes32" } ], - "id": 3147, + "id": 3199, "name": "forbid", "nodeType": "Identifier", "overloadedDeclarations": [ - 3114, - 3162 + 3166, + 3214 ], - "referencedDeclaration": 3114, + "referencedDeclaration": 3166, "src": "2240:6:18", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3159, + "id": 3211, "isConstant": false, "isLValue": false, "isPure": false, @@ -7072,29 +7072,29 @@ "typeString": "tuple()" } }, - "id": 3160, + "id": 3212, "nodeType": "ExpressionStatement", "src": "2240:57:18" } ] }, "documentation": null, - "id": 3162, + "id": 3214, "implemented": true, "kind": "function", "modifiers": [], "name": "forbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 3145, + "id": 3197, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3140, + "id": 3192, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2184:11:18", "stateVariable": false, "storageLocation": "default", @@ -7103,7 +7103,7 @@ "typeString": "address" }, "typeName": { - "id": 3139, + "id": 3191, "name": "address", "nodeType": "ElementaryTypeName", "src": "2184:7:18", @@ -7118,10 +7118,10 @@ }, { "constant": false, - "id": 3142, + "id": 3194, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2197:11:18", "stateVariable": false, "storageLocation": "default", @@ -7130,7 +7130,7 @@ "typeString": "address" }, "typeName": { - "id": 3141, + "id": 3193, "name": "address", "nodeType": "ElementaryTypeName", "src": "2197:7:18", @@ -7145,10 +7145,10 @@ }, { "constant": false, - "id": 3144, + "id": 3196, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2210:11:18", "stateVariable": false, "storageLocation": "default", @@ -7157,7 +7157,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3143, + "id": 3195, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2210:7:18", @@ -7173,42 +7173,42 @@ "src": "2183:39:18" }, "returnParameters": { - "id": 3146, + "id": 3198, "nodeType": "ParameterList", "parameters": [], "src": "2230:0:18" }, - "scope": 3163, + "scope": 3215, "src": "2168:136:18", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3196, + "scope": 3248, "src": "1048:1259:18" }, { "baseContracts": [], "contractDependencies": [ - 3163 + 3215 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3195, + "id": 3247, "linearizedBaseContracts": [ - 3195 + 3247 ], "name": "DSGuardFactory", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3167, + "id": 3219, "name": "isGuard", "nodeType": "VariableDeclaration", - "scope": 3195, + "scope": 3247, "src": "2339:42:18", "stateVariable": true, "storageLocation": "default", @@ -7217,9 +7217,9 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 3166, + "id": 3218, "keyType": { - "id": 3164, + "id": 3216, "name": "address", "nodeType": "ElementaryTypeName", "src": "2348:7:18", @@ -7235,7 +7235,7 @@ "typeString": "mapping(address => bool)" }, "valueType": { - "id": 3165, + "id": 3217, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2359:4:18", @@ -7250,28 +7250,28 @@ }, { "body": { - "id": 3193, + "id": 3245, "nodeType": "Block", "src": "2439:114:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3176, + "id": 3228, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3172, + "id": 3224, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2449:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -7282,7 +7282,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3174, + "id": 3226, "isConstant": false, "isLValue": false, "isPure": false, @@ -7290,23 +7290,23 @@ "nodeType": "NewExpression", "src": "2457:11:18", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuard_$3215_$", "typeString": "function () returns (contract DSGuard)" }, "typeName": { "contractScope": null, - "id": 3173, + "id": 3225, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2461:7:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } }, - "id": 3175, + "id": 3227, "isConstant": false, "isLValue": false, "isPure": false, @@ -7316,17 +7316,17 @@ "nodeType": "FunctionCall", "src": "2457:13:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, "src": "2449:21:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 3177, + "id": 3229, "nodeType": "ExpressionStatement", "src": "2449:21:18" }, @@ -7338,18 +7338,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3181, + "id": 3233, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "2495:3:18", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3182, + "id": 3234, "isConstant": false, "isLValue": false, "isPure": false, @@ -7373,32 +7373,32 @@ ], "expression": { "argumentTypes": null, - "id": 3178, + "id": 3230, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2480:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 3180, + "id": 3232, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "2480:14:18", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 3183, + "id": 3235, "isConstant": false, "isLValue": false, "isPure": false, @@ -7412,14 +7412,14 @@ "typeString": "tuple()" } }, - "id": 3184, + "id": 3236, "nodeType": "ExpressionStatement", "src": "2480:26:18" }, { "expression": { "argumentTypes": null, - "id": 3191, + "id": 3243, "isConstant": false, "isLValue": false, "isPure": false, @@ -7428,31 +7428,31 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3185, + "id": 3237, "name": "isGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3167, + "referencedDeclaration": 3219, "src": "2516:7:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 3189, + "id": 3241, "indexExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3187, + "id": 3239, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2532:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } @@ -7460,11 +7460,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } ], - "id": 3186, + "id": 3238, "isConstant": false, "isLValue": false, "isPure": true, @@ -7477,7 +7477,7 @@ }, "typeName": "address" }, - "id": 3188, + "id": 3240, "isConstant": false, "isLValue": false, "isPure": false, @@ -7507,7 +7507,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3190, + "id": 3242, "isConstant": false, "isLValue": false, "isPure": true, @@ -7528,51 +7528,51 @@ "typeString": "bool" } }, - "id": 3192, + "id": 3244, "nodeType": "ExpressionStatement", "src": "2516:30:18" } ] }, "documentation": null, - "id": 3194, + "id": 3246, "implemented": true, "kind": "function", "modifiers": [], "name": "newGuard", "nodeType": "FunctionDefinition", "parameters": { - "id": 3168, + "id": 3220, "nodeType": "ParameterList", "parameters": [], "src": "2405:2:18" }, "returnParameters": { - "id": 3171, + "id": 3223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3170, + "id": 3222, "name": "guard", "nodeType": "VariableDeclaration", - "scope": 3194, + "scope": 3246, "src": "2424:13:18", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" }, "typeName": { "contractScope": null, - "id": 3169, + "id": 3221, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2424:7:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -7582,14 +7582,14 @@ ], "src": "2423:15:18" }, - "scope": 3195, + "scope": 3247, "src": "2388:165:18", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3196, + "scope": 3248, "src": "2309:246:18" } ], @@ -7601,7 +7601,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.494Z", + "updatedAt": "2020-04-08T12:21:13.731Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DSGuardEvents.json b/packages/smart-contracts/artifacts/DSGuardEvents.json index e734d3b..cc0a5cd 100644 --- a/packages/smart-contracts/artifacts/DSGuardEvents.json +++ b/packages/smart-contracts/artifacts/DSGuardEvents.json @@ -63,20 +63,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "exportedSymbols": { "DSGuard": [ - 3163 + 3215 ], "DSGuardEvents": [ - 2944 + 2996 ], "DSGuardFactory": [ - 3195 + 3247 ] }, - "id": 3196, + "id": 3248, "nodeType": "SourceUnit", "nodes": [ { - "id": 2926, + "id": 2978, "literals": [ "solidity", "0.5", @@ -88,10 +88,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "file": "./Auth.sol", - "id": 2927, + "id": 2979, "nodeType": "ImportDirective", - "scope": 3196, - "sourceUnit": 2925, + "scope": 3248, + "sourceUnit": 2977, "src": "769:20:18", "symbolAliases": [], "unitAlias": "" @@ -102,9 +102,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2944, + "id": 2996, "linearizedBaseContracts": [ - 2944 + 2996 ], "name": "DSGuardEvents", "nodeType": "ContractDefinition", @@ -112,20 +112,20 @@ { "anonymous": false, "documentation": null, - "id": 2935, + "id": 2987, "name": "LogPermit", "nodeType": "EventDefinition", "parameters": { - "id": 2934, + "id": 2986, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2929, + "id": 2981, "indexed": true, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "845:19:18", "stateVariable": false, "storageLocation": "default", @@ -134,7 +134,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2928, + "id": 2980, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "845:7:18", @@ -148,11 +148,11 @@ }, { "constant": false, - "id": 2931, + "id": 2983, "indexed": true, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "874:19:18", "stateVariable": false, "storageLocation": "default", @@ -161,7 +161,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2930, + "id": 2982, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "874:7:18", @@ -175,11 +175,11 @@ }, { "constant": false, - "id": 2933, + "id": 2985, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "903:19:18", "stateVariable": false, "storageLocation": "default", @@ -188,7 +188,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2932, + "id": 2984, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "903:7:18", @@ -208,20 +208,20 @@ { "anonymous": false, "documentation": null, - "id": 2943, + "id": 2995, "name": "LogForbid", "nodeType": "EventDefinition", "parameters": { - "id": 2942, + "id": 2994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2937, + "id": 2989, "indexed": true, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "960:19:18", "stateVariable": false, "storageLocation": "default", @@ -230,7 +230,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2936, + "id": 2988, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "960:7:18", @@ -244,11 +244,11 @@ }, { "constant": false, - "id": 2939, + "id": 2991, "indexed": true, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "989:19:18", "stateVariable": false, "storageLocation": "default", @@ -257,7 +257,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2938, + "id": 2990, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "989:7:18", @@ -271,11 +271,11 @@ }, { "constant": false, - "id": 2941, + "id": 2993, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "1018:19:18", "stateVariable": false, "storageLocation": "default", @@ -284,7 +284,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2940, + "id": 2992, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1018:7:18", @@ -302,7 +302,7 @@ "src": "935:109:18" } ], - "scope": 3196, + "scope": 3248, "src": "791:255:18" }, { @@ -311,17 +311,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2945, + "id": 2997, "name": "DSAuth", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2924, + "referencedDeclaration": 2976, "src": "1068:6:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } }, - "id": 2946, + "id": 2998, "nodeType": "InheritanceSpecifier", "src": "1068:6:18" }, @@ -329,17 +329,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2947, + "id": 2999, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "1076:11:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2948, + "id": 3000, "nodeType": "InheritanceSpecifier", "src": "1076:11:18" }, @@ -347,47 +347,47 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2949, + "id": 3001, "name": "DSGuardEvents", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2944, + "referencedDeclaration": 2996, "src": "1089:13:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardEvents_$2944", + "typeIdentifier": "t_contract$_DSGuardEvents_$2996", "typeString": "contract DSGuardEvents" } }, - "id": 2950, + "id": 3002, "nodeType": "InheritanceSpecifier", "src": "1089:13:18" } ], "contractDependencies": [ - 2799, - 2808, - 2924, - 2944 + 2851, + 2860, + 2976, + 2996 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3163, + "id": 3215, "linearizedBaseContracts": [ - 3163, - 2944, - 2799, - 2924, - 2808 + 3215, + 2996, + 2851, + 2976, + 2860 ], "name": "DSGuard", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 2958, + "id": 3010, "name": "ANY", "nodeType": "VariableDeclaration", - "scope": 3163, + "scope": 3215, "src": "1109:47:18", "stateVariable": true, "storageLocation": "default", @@ -396,7 +396,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2951, + "id": 3003, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1109:7:18", @@ -413,7 +413,7 @@ "arguments": [ { "argumentTypes": null, - "id": 2955, + "id": 3007, "isConstant": false, "isLValue": false, "isPure": true, @@ -425,7 +425,7 @@ "subExpression": { "argumentTypes": null, "hexValue": "31", - "id": 2954, + "id": 3006, "isConstant": false, "isLValue": false, "isPure": true, @@ -453,7 +453,7 @@ "typeString": "int_const -1" } ], - "id": 2953, + "id": 3005, "isConstant": false, "isLValue": false, "isPure": true, @@ -466,7 +466,7 @@ }, "typeName": "uint" }, - "id": 2956, + "id": 3008, "isConstant": false, "isLValue": false, "isPure": true, @@ -488,7 +488,7 @@ "typeString": "uint256" } ], - "id": 2952, + "id": 3004, "isConstant": false, "isLValue": false, "isPure": true, @@ -501,7 +501,7 @@ }, "typeName": "bytes32" }, - "id": 2957, + "id": 3009, "isConstant": false, "isLValue": false, "isPure": true, @@ -519,10 +519,10 @@ }, { "constant": false, - "id": 2966, + "id": 3018, "name": "acl", "nodeType": "VariableDeclaration", - "scope": 3163, + "scope": 3215, "src": "1163:71:18", "stateVariable": true, "storageLocation": "default", @@ -531,9 +531,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" }, "typeName": { - "id": 2965, + "id": 3017, "keyType": { - "id": 2959, + "id": 3011, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1172:7:18", @@ -549,9 +549,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" }, "valueType": { - "id": 2964, + "id": 3016, "keyType": { - "id": 2960, + "id": 3012, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1192:7:18", @@ -567,9 +567,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" }, "valueType": { - "id": 2963, + "id": 3015, "keyType": { - "id": 2961, + "id": 3013, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1212:7:18", @@ -585,7 +585,7 @@ "typeString": "mapping(bytes32 => bool)" }, "valueType": { - "id": 2962, + "id": 3014, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1223:4:18", @@ -602,21 +602,21 @@ }, { "body": { - "id": 3057, + "id": 3109, "nodeType": "Block", "src": "1339:373:18", "statements": [ { "assignments": [ - 2978 + 3030 ], "declarations": [ { "constant": false, - "id": 2978, + "id": 3030, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3057, + "scope": 3109, "src": "1349:11:18", "stateVariable": false, "storageLocation": "default", @@ -625,7 +625,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2977, + "id": 3029, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1349:7:18", @@ -638,7 +638,7 @@ "visibility": "internal" } ], - "id": 2984, + "id": 3036, "initialValue": { "argumentTypes": null, "arguments": [ @@ -647,11 +647,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2981, + "id": 3033, "name": "src_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2968, + "referencedDeclaration": 3020, "src": "1379:4:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -666,7 +666,7 @@ "typeString": "address" } ], - "id": 2980, + "id": 3032, "isConstant": false, "isLValue": false, "isPure": true, @@ -679,7 +679,7 @@ }, "typeName": "bytes20" }, - "id": 2982, + "id": 3034, "isConstant": false, "isLValue": false, "isPure": false, @@ -701,7 +701,7 @@ "typeString": "bytes20" } ], - "id": 2979, + "id": 3031, "isConstant": false, "isLValue": false, "isPure": true, @@ -714,7 +714,7 @@ }, "typeName": "bytes32" }, - "id": 2983, + "id": 3035, "isConstant": false, "isLValue": false, "isPure": false, @@ -733,15 +733,15 @@ }, { "assignments": [ - 2986 + 3038 ], "declarations": [ { "constant": false, - "id": 2986, + "id": 3038, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3057, + "scope": 3109, "src": "1395:11:18", "stateVariable": false, "storageLocation": "default", @@ -750,7 +750,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2985, + "id": 3037, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1395:7:18", @@ -763,7 +763,7 @@ "visibility": "internal" } ], - "id": 2992, + "id": 3044, "initialValue": { "argumentTypes": null, "arguments": [ @@ -772,11 +772,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2989, + "id": 3041, "name": "dst_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2970, + "referencedDeclaration": 3022, "src": "1425:4:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -791,7 +791,7 @@ "typeString": "address" } ], - "id": 2988, + "id": 3040, "isConstant": false, "isLValue": false, "isPure": true, @@ -804,7 +804,7 @@ }, "typeName": "bytes20" }, - "id": 2990, + "id": 3042, "isConstant": false, "isLValue": false, "isPure": false, @@ -826,7 +826,7 @@ "typeString": "bytes20" } ], - "id": 2987, + "id": 3039, "isConstant": false, "isLValue": false, "isPure": true, @@ -839,7 +839,7 @@ }, "typeName": "bytes32" }, - "id": 2991, + "id": 3043, "isConstant": false, "isLValue": false, "isPure": false, @@ -863,7 +863,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3055, + "id": 3107, "isConstant": false, "isLValue": false, "isPure": false, @@ -874,7 +874,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3047, + "id": 3099, "isConstant": false, "isLValue": false, "isPure": false, @@ -885,7 +885,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3039, + "id": 3091, "isConstant": false, "isLValue": false, "isPure": false, @@ -896,7 +896,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3031, + "id": 3083, "isConstant": false, "isLValue": false, "isPure": false, @@ -907,7 +907,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3023, + "id": 3075, "isConstant": false, "isLValue": false, "isPure": false, @@ -918,7 +918,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3015, + "id": 3067, "isConstant": false, "isLValue": false, "isPure": false, @@ -929,7 +929,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3007, + "id": 3059, "isConstant": false, "isLValue": false, "isPure": false, @@ -942,25 +942,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2993, + "id": 3045, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1449:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 2995, + "id": 3047, "indexExpression": { "argumentTypes": null, - "id": 2994, + "id": 3046, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1453:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -978,14 +978,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 2997, + "id": 3049, "indexExpression": { "argumentTypes": null, - "id": 2996, + "id": 3048, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1458:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1003,14 +1003,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 2999, + "id": 3051, "indexExpression": { "argumentTypes": null, - "id": 2998, + "id": 3050, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1463:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1038,25 +1038,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3000, + "id": 3052, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1483:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3002, + "id": 3054, "indexExpression": { "argumentTypes": null, - "id": 3001, + "id": 3053, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1487:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1074,14 +1074,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3004, + "id": 3056, "indexExpression": { "argumentTypes": null, - "id": 3003, + "id": 3055, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1492:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1099,14 +1099,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3006, + "id": 3058, "indexExpression": { "argumentTypes": null, - "id": 3005, + "id": 3057, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1497:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1140,25 +1140,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3008, + "id": 3060, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1517:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3010, + "id": 3062, "indexExpression": { "argumentTypes": null, - "id": 3009, + "id": 3061, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1521:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1176,14 +1176,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3012, + "id": 3064, "indexExpression": { "argumentTypes": null, - "id": 3011, + "id": 3063, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1526:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1201,14 +1201,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3014, + "id": 3066, "indexExpression": { "argumentTypes": null, - "id": 3013, + "id": 3065, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1531:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1242,25 +1242,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3016, + "id": 3068, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1551:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3018, + "id": 3070, "indexExpression": { "argumentTypes": null, - "id": 3017, + "id": 3069, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1555:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1278,14 +1278,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3020, + "id": 3072, "indexExpression": { "argumentTypes": null, - "id": 3019, + "id": 3071, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1560:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1303,14 +1303,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3022, + "id": 3074, "indexExpression": { "argumentTypes": null, - "id": 3021, + "id": 3073, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1565:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1344,25 +1344,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3024, + "id": 3076, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1585:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3026, + "id": 3078, "indexExpression": { "argumentTypes": null, - "id": 3025, + "id": 3077, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1589:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1380,14 +1380,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3028, + "id": 3080, "indexExpression": { "argumentTypes": null, - "id": 3027, + "id": 3079, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1594:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1405,14 +1405,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3030, + "id": 3082, "indexExpression": { "argumentTypes": null, - "id": 3029, + "id": 3081, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1599:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1446,25 +1446,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3032, + "id": 3084, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1619:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3034, + "id": 3086, "indexExpression": { "argumentTypes": null, - "id": 3033, + "id": 3085, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1623:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1482,14 +1482,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3036, + "id": 3088, "indexExpression": { "argumentTypes": null, - "id": 3035, + "id": 3087, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1628:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1507,14 +1507,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3038, + "id": 3090, "indexExpression": { "argumentTypes": null, - "id": 3037, + "id": 3089, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1633:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1548,25 +1548,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3040, + "id": 3092, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1653:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3042, + "id": 3094, "indexExpression": { "argumentTypes": null, - "id": 3041, + "id": 3093, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1657:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1584,14 +1584,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3044, + "id": 3096, "indexExpression": { "argumentTypes": null, - "id": 3043, + "id": 3095, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1662:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1609,14 +1609,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3046, + "id": 3098, "indexExpression": { "argumentTypes": null, - "id": 3045, + "id": 3097, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1667:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1650,25 +1650,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3048, + "id": 3100, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1687:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3050, + "id": 3102, "indexExpression": { "argumentTypes": null, - "id": 3049, + "id": 3101, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1691:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1686,14 +1686,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3052, + "id": 3104, "indexExpression": { "argumentTypes": null, - "id": 3051, + "id": 3103, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1696:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1711,14 +1711,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3054, + "id": 3106, "indexExpression": { "argumentTypes": null, - "id": 3053, + "id": 3105, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1701:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1742,30 +1742,30 @@ "typeString": "bool" } }, - "functionReturnParameters": 2976, - "id": 3056, + "functionReturnParameters": 3028, + "id": 3108, "nodeType": "Return", "src": "1442:263:18" } ] }, "documentation": null, - "id": 3058, + "id": 3110, "implemented": true, "kind": "function", "modifiers": [], "name": "canCall", "nodeType": "FunctionDefinition", "parameters": { - "id": 2973, + "id": 3025, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2968, + "id": 3020, "name": "src_", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1267:12:18", "stateVariable": false, "storageLocation": "default", @@ -1774,7 +1774,7 @@ "typeString": "address" }, "typeName": { - "id": 2967, + "id": 3019, "name": "address", "nodeType": "ElementaryTypeName", "src": "1267:7:18", @@ -1789,10 +1789,10 @@ }, { "constant": false, - "id": 2970, + "id": 3022, "name": "dst_", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1281:12:18", "stateVariable": false, "storageLocation": "default", @@ -1801,7 +1801,7 @@ "typeString": "address" }, "typeName": { - "id": 2969, + "id": 3021, "name": "address", "nodeType": "ElementaryTypeName", "src": "1281:7:18", @@ -1816,10 +1816,10 @@ }, { "constant": false, - "id": 2972, + "id": 3024, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1295:10:18", "stateVariable": false, "storageLocation": "default", @@ -1828,7 +1828,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2971, + "id": 3023, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "1295:6:18", @@ -1844,15 +1844,15 @@ "src": "1257:54:18" }, "returnParameters": { - "id": 2976, + "id": 3028, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2975, + "id": 3027, "name": "", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1333:4:18", "stateVariable": false, "storageLocation": "default", @@ -1861,7 +1861,7 @@ "typeString": "bool" }, "typeName": { - "id": 2974, + "id": 3026, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1333:4:18", @@ -1876,22 +1876,22 @@ ], "src": "1332:6:18" }, - "scope": 3163, + "scope": 3215, "src": "1241:471:18", "stateMutability": "view", - "superFunction": 2798, + "superFunction": 2850, "visibility": "public" }, { "body": { - "id": 3085, + "id": 3137, "nodeType": "Block", "src": "1785:81:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3077, + "id": 3129, "isConstant": false, "isLValue": false, "isPure": false, @@ -1904,25 +1904,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3069, + "id": 3121, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1795:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3073, + "id": 3125, "indexExpression": { "argumentTypes": null, - "id": 3070, + "id": 3122, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3060, + "referencedDeclaration": 3112, "src": "1799:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1940,14 +1940,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3074, + "id": 3126, "indexExpression": { "argumentTypes": null, - "id": 3071, + "id": 3123, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3062, + "referencedDeclaration": 3114, "src": "1804:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1965,14 +1965,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3075, + "id": 3127, "indexExpression": { "argumentTypes": null, - "id": 3072, + "id": 3124, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3064, + "referencedDeclaration": 3116, "src": "1809:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1995,7 +1995,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3076, + "id": 3128, "isConstant": false, "isLValue": false, "isPure": true, @@ -2016,7 +2016,7 @@ "typeString": "bool" } }, - "id": 3078, + "id": 3130, "nodeType": "ExpressionStatement", "src": "1795:25:18" }, @@ -2026,11 +2026,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3080, + "id": 3132, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3060, + "referencedDeclaration": 3112, "src": "1845:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2039,11 +2039,11 @@ }, { "argumentTypes": null, - "id": 3081, + "id": 3133, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3062, + "referencedDeclaration": 3114, "src": "1850:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2052,11 +2052,11 @@ }, { "argumentTypes": null, - "id": 3082, + "id": 3134, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3064, + "referencedDeclaration": 3116, "src": "1855:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2079,18 +2079,18 @@ "typeString": "bytes32" } ], - "id": 3079, + "id": 3131, "name": "LogPermit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2935, + "referencedDeclaration": 2987, "src": "1835:9:18", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3083, + "id": 3135, "isConstant": false, "isLValue": false, "isPure": false, @@ -2104,27 +2104,27 @@ "typeString": "tuple()" } }, - "id": 3084, + "id": 3136, "nodeType": "EmitStatement", "src": "1830:29:18" } ] }, "documentation": null, - "id": 3086, + "id": 3138, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3067, + "id": 3119, "modifierName": { "argumentTypes": null, - "id": 3066, + "id": 3118, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1780:4:18", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2138,15 +2138,15 @@ "name": "permit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3065, + "id": 3117, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3060, + "id": 3112, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1734:11:18", "stateVariable": false, "storageLocation": "default", @@ -2155,7 +2155,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3059, + "id": 3111, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1734:7:18", @@ -2169,10 +2169,10 @@ }, { "constant": false, - "id": 3062, + "id": 3114, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1747:11:18", "stateVariable": false, "storageLocation": "default", @@ -2181,7 +2181,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3061, + "id": 3113, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1747:7:18", @@ -2195,10 +2195,10 @@ }, { "constant": false, - "id": 3064, + "id": 3116, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1760:11:18", "stateVariable": false, "storageLocation": "default", @@ -2207,7 +2207,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3063, + "id": 3115, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1760:7:18", @@ -2223,12 +2223,12 @@ "src": "1733:39:18" }, "returnParameters": { - "id": 3068, + "id": 3120, "nodeType": "ParameterList", "parameters": [], "src": "1785:0:18" }, - "scope": 3163, + "scope": 3215, "src": "1718:148:18", "stateMutability": "nonpayable", "superFunction": null, @@ -2236,14 +2236,14 @@ }, { "body": { - "id": 3113, + "id": 3165, "nodeType": "Block", "src": "1939:82:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3105, + "id": 3157, "isConstant": false, "isLValue": false, "isPure": false, @@ -2256,25 +2256,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3097, + "id": 3149, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1949:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3101, + "id": 3153, "indexExpression": { "argumentTypes": null, - "id": 3098, + "id": 3150, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3088, + "referencedDeclaration": 3140, "src": "1953:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2292,14 +2292,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3102, + "id": 3154, "indexExpression": { "argumentTypes": null, - "id": 3099, + "id": 3151, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3090, + "referencedDeclaration": 3142, "src": "1958:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2317,14 +2317,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3103, + "id": 3155, "indexExpression": { "argumentTypes": null, - "id": 3100, + "id": 3152, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3092, + "referencedDeclaration": 3144, "src": "1963:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2347,7 +2347,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 3104, + "id": 3156, "isConstant": false, "isLValue": false, "isPure": true, @@ -2368,7 +2368,7 @@ "typeString": "bool" } }, - "id": 3106, + "id": 3158, "nodeType": "ExpressionStatement", "src": "1949:26:18" }, @@ -2378,11 +2378,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3108, + "id": 3160, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3088, + "referencedDeclaration": 3140, "src": "2000:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2391,11 +2391,11 @@ }, { "argumentTypes": null, - "id": 3109, + "id": 3161, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3090, + "referencedDeclaration": 3142, "src": "2005:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2404,11 +2404,11 @@ }, { "argumentTypes": null, - "id": 3110, + "id": 3162, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3092, + "referencedDeclaration": 3144, "src": "2010:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2431,18 +2431,18 @@ "typeString": "bytes32" } ], - "id": 3107, + "id": 3159, "name": "LogForbid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2943, + "referencedDeclaration": 2995, "src": "1990:9:18", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3111, + "id": 3163, "isConstant": false, "isLValue": false, "isPure": false, @@ -2456,27 +2456,27 @@ "typeString": "tuple()" } }, - "id": 3112, + "id": 3164, "nodeType": "EmitStatement", "src": "1985:29:18" } ] }, "documentation": null, - "id": 3114, + "id": 3166, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3095, + "id": 3147, "modifierName": { "argumentTypes": null, - "id": 3094, + "id": 3146, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1934:4:18", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2490,15 +2490,15 @@ "name": "forbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 3093, + "id": 3145, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3088, + "id": 3140, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1888:11:18", "stateVariable": false, "storageLocation": "default", @@ -2507,7 +2507,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3087, + "id": 3139, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1888:7:18", @@ -2521,10 +2521,10 @@ }, { "constant": false, - "id": 3090, + "id": 3142, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1901:11:18", "stateVariable": false, "storageLocation": "default", @@ -2533,7 +2533,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3089, + "id": 3141, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1901:7:18", @@ -2547,10 +2547,10 @@ }, { "constant": false, - "id": 3092, + "id": 3144, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1914:11:18", "stateVariable": false, "storageLocation": "default", @@ -2559,7 +2559,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3091, + "id": 3143, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1914:7:18", @@ -2575,12 +2575,12 @@ "src": "1887:39:18" }, "returnParameters": { - "id": 3096, + "id": 3148, "nodeType": "ParameterList", "parameters": [], "src": "1939:0:18" }, - "scope": 3163, + "scope": 3215, "src": "1872:149:18", "stateMutability": "nonpayable", "superFunction": null, @@ -2588,7 +2588,7 @@ }, { "body": { - "id": 3137, + "id": 3189, "nodeType": "Block", "src": "2089:74:18", "statements": [ @@ -2604,11 +2604,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3126, + "id": 3178, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3116, + "referencedDeclaration": 3168, "src": "2122:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2623,7 +2623,7 @@ "typeString": "address" } ], - "id": 3125, + "id": 3177, "isConstant": false, "isLValue": false, "isPure": true, @@ -2636,7 +2636,7 @@ }, "typeName": "bytes20" }, - "id": 3127, + "id": 3179, "isConstant": false, "isLValue": false, "isPure": false, @@ -2658,7 +2658,7 @@ "typeString": "bytes20" } ], - "id": 3124, + "id": 3176, "isConstant": false, "isLValue": false, "isPure": true, @@ -2671,7 +2671,7 @@ }, "typeName": "bytes32" }, - "id": 3128, + "id": 3180, "isConstant": false, "isLValue": false, "isPure": false, @@ -2693,11 +2693,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3131, + "id": 3183, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3118, + "referencedDeclaration": 3170, "src": "2145:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2712,7 +2712,7 @@ "typeString": "address" } ], - "id": 3130, + "id": 3182, "isConstant": false, "isLValue": false, "isPure": true, @@ -2725,7 +2725,7 @@ }, "typeName": "bytes20" }, - "id": 3132, + "id": 3184, "isConstant": false, "isLValue": false, "isPure": false, @@ -2747,7 +2747,7 @@ "typeString": "bytes20" } ], - "id": 3129, + "id": 3181, "isConstant": false, "isLValue": false, "isPure": true, @@ -2760,7 +2760,7 @@ }, "typeName": "bytes32" }, - "id": 3133, + "id": 3185, "isConstant": false, "isLValue": false, "isPure": false, @@ -2776,11 +2776,11 @@ }, { "argumentTypes": null, - "id": 3134, + "id": 3186, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3120, + "referencedDeclaration": 3172, "src": "2152:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2803,21 +2803,21 @@ "typeString": "bytes32" } ], - "id": 3123, + "id": 3175, "name": "permit", "nodeType": "Identifier", "overloadedDeclarations": [ - 3086, - 3138 + 3138, + 3190 ], - "referencedDeclaration": 3086, + "referencedDeclaration": 3138, "src": "2099:6:18", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3135, + "id": 3187, "isConstant": false, "isLValue": false, "isPure": false, @@ -2831,29 +2831,29 @@ "typeString": "tuple()" } }, - "id": 3136, + "id": 3188, "nodeType": "ExpressionStatement", "src": "2099:57:18" } ] }, "documentation": null, - "id": 3138, + "id": 3190, "implemented": true, "kind": "function", "modifiers": [], "name": "permit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3121, + "id": 3173, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3116, + "id": 3168, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2043:11:18", "stateVariable": false, "storageLocation": "default", @@ -2862,7 +2862,7 @@ "typeString": "address" }, "typeName": { - "id": 3115, + "id": 3167, "name": "address", "nodeType": "ElementaryTypeName", "src": "2043:7:18", @@ -2877,10 +2877,10 @@ }, { "constant": false, - "id": 3118, + "id": 3170, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2056:11:18", "stateVariable": false, "storageLocation": "default", @@ -2889,7 +2889,7 @@ "typeString": "address" }, "typeName": { - "id": 3117, + "id": 3169, "name": "address", "nodeType": "ElementaryTypeName", "src": "2056:7:18", @@ -2904,10 +2904,10 @@ }, { "constant": false, - "id": 3120, + "id": 3172, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2069:11:18", "stateVariable": false, "storageLocation": "default", @@ -2916,7 +2916,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3119, + "id": 3171, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2069:7:18", @@ -2932,12 +2932,12 @@ "src": "2042:39:18" }, "returnParameters": { - "id": 3122, + "id": 3174, "nodeType": "ParameterList", "parameters": [], "src": "2089:0:18" }, - "scope": 3163, + "scope": 3215, "src": "2027:136:18", "stateMutability": "nonpayable", "superFunction": null, @@ -2945,7 +2945,7 @@ }, { "body": { - "id": 3161, + "id": 3213, "nodeType": "Block", "src": "2230:74:18", "statements": [ @@ -2961,11 +2961,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3150, + "id": 3202, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3140, + "referencedDeclaration": 3192, "src": "2263:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2980,7 +2980,7 @@ "typeString": "address" } ], - "id": 3149, + "id": 3201, "isConstant": false, "isLValue": false, "isPure": true, @@ -2993,7 +2993,7 @@ }, "typeName": "bytes20" }, - "id": 3151, + "id": 3203, "isConstant": false, "isLValue": false, "isPure": false, @@ -3015,7 +3015,7 @@ "typeString": "bytes20" } ], - "id": 3148, + "id": 3200, "isConstant": false, "isLValue": false, "isPure": true, @@ -3028,7 +3028,7 @@ }, "typeName": "bytes32" }, - "id": 3152, + "id": 3204, "isConstant": false, "isLValue": false, "isPure": false, @@ -3050,11 +3050,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3155, + "id": 3207, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3142, + "referencedDeclaration": 3194, "src": "2286:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3069,7 +3069,7 @@ "typeString": "address" } ], - "id": 3154, + "id": 3206, "isConstant": false, "isLValue": false, "isPure": true, @@ -3082,7 +3082,7 @@ }, "typeName": "bytes20" }, - "id": 3156, + "id": 3208, "isConstant": false, "isLValue": false, "isPure": false, @@ -3104,7 +3104,7 @@ "typeString": "bytes20" } ], - "id": 3153, + "id": 3205, "isConstant": false, "isLValue": false, "isPure": true, @@ -3117,7 +3117,7 @@ }, "typeName": "bytes32" }, - "id": 3157, + "id": 3209, "isConstant": false, "isLValue": false, "isPure": false, @@ -3133,11 +3133,11 @@ }, { "argumentTypes": null, - "id": 3158, + "id": 3210, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3144, + "referencedDeclaration": 3196, "src": "2293:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -3160,21 +3160,21 @@ "typeString": "bytes32" } ], - "id": 3147, + "id": 3199, "name": "forbid", "nodeType": "Identifier", "overloadedDeclarations": [ - 3114, - 3162 + 3166, + 3214 ], - "referencedDeclaration": 3114, + "referencedDeclaration": 3166, "src": "2240:6:18", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3159, + "id": 3211, "isConstant": false, "isLValue": false, "isPure": false, @@ -3188,29 +3188,29 @@ "typeString": "tuple()" } }, - "id": 3160, + "id": 3212, "nodeType": "ExpressionStatement", "src": "2240:57:18" } ] }, "documentation": null, - "id": 3162, + "id": 3214, "implemented": true, "kind": "function", "modifiers": [], "name": "forbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 3145, + "id": 3197, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3140, + "id": 3192, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2184:11:18", "stateVariable": false, "storageLocation": "default", @@ -3219,7 +3219,7 @@ "typeString": "address" }, "typeName": { - "id": 3139, + "id": 3191, "name": "address", "nodeType": "ElementaryTypeName", "src": "2184:7:18", @@ -3234,10 +3234,10 @@ }, { "constant": false, - "id": 3142, + "id": 3194, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2197:11:18", "stateVariable": false, "storageLocation": "default", @@ -3246,7 +3246,7 @@ "typeString": "address" }, "typeName": { - "id": 3141, + "id": 3193, "name": "address", "nodeType": "ElementaryTypeName", "src": "2197:7:18", @@ -3261,10 +3261,10 @@ }, { "constant": false, - "id": 3144, + "id": 3196, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2210:11:18", "stateVariable": false, "storageLocation": "default", @@ -3273,7 +3273,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3143, + "id": 3195, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2210:7:18", @@ -3289,42 +3289,42 @@ "src": "2183:39:18" }, "returnParameters": { - "id": 3146, + "id": 3198, "nodeType": "ParameterList", "parameters": [], "src": "2230:0:18" }, - "scope": 3163, + "scope": 3215, "src": "2168:136:18", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3196, + "scope": 3248, "src": "1048:1259:18" }, { "baseContracts": [], "contractDependencies": [ - 3163 + 3215 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3195, + "id": 3247, "linearizedBaseContracts": [ - 3195 + 3247 ], "name": "DSGuardFactory", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3167, + "id": 3219, "name": "isGuard", "nodeType": "VariableDeclaration", - "scope": 3195, + "scope": 3247, "src": "2339:42:18", "stateVariable": true, "storageLocation": "default", @@ -3333,9 +3333,9 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 3166, + "id": 3218, "keyType": { - "id": 3164, + "id": 3216, "name": "address", "nodeType": "ElementaryTypeName", "src": "2348:7:18", @@ -3351,7 +3351,7 @@ "typeString": "mapping(address => bool)" }, "valueType": { - "id": 3165, + "id": 3217, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2359:4:18", @@ -3366,28 +3366,28 @@ }, { "body": { - "id": 3193, + "id": 3245, "nodeType": "Block", "src": "2439:114:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3176, + "id": 3228, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3172, + "id": 3224, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2449:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -3398,7 +3398,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3174, + "id": 3226, "isConstant": false, "isLValue": false, "isPure": false, @@ -3406,23 +3406,23 @@ "nodeType": "NewExpression", "src": "2457:11:18", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuard_$3215_$", "typeString": "function () returns (contract DSGuard)" }, "typeName": { "contractScope": null, - "id": 3173, + "id": 3225, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2461:7:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } }, - "id": 3175, + "id": 3227, "isConstant": false, "isLValue": false, "isPure": false, @@ -3432,17 +3432,17 @@ "nodeType": "FunctionCall", "src": "2457:13:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, "src": "2449:21:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 3177, + "id": 3229, "nodeType": "ExpressionStatement", "src": "2449:21:18" }, @@ -3454,18 +3454,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3181, + "id": 3233, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "2495:3:18", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3182, + "id": 3234, "isConstant": false, "isLValue": false, "isPure": false, @@ -3489,32 +3489,32 @@ ], "expression": { "argumentTypes": null, - "id": 3178, + "id": 3230, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2480:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 3180, + "id": 3232, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "2480:14:18", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 3183, + "id": 3235, "isConstant": false, "isLValue": false, "isPure": false, @@ -3528,14 +3528,14 @@ "typeString": "tuple()" } }, - "id": 3184, + "id": 3236, "nodeType": "ExpressionStatement", "src": "2480:26:18" }, { "expression": { "argumentTypes": null, - "id": 3191, + "id": 3243, "isConstant": false, "isLValue": false, "isPure": false, @@ -3544,31 +3544,31 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3185, + "id": 3237, "name": "isGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3167, + "referencedDeclaration": 3219, "src": "2516:7:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 3189, + "id": 3241, "indexExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3187, + "id": 3239, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2532:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } @@ -3576,11 +3576,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } ], - "id": 3186, + "id": 3238, "isConstant": false, "isLValue": false, "isPure": true, @@ -3593,7 +3593,7 @@ }, "typeName": "address" }, - "id": 3188, + "id": 3240, "isConstant": false, "isLValue": false, "isPure": false, @@ -3623,7 +3623,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3190, + "id": 3242, "isConstant": false, "isLValue": false, "isPure": true, @@ -3644,51 +3644,51 @@ "typeString": "bool" } }, - "id": 3192, + "id": 3244, "nodeType": "ExpressionStatement", "src": "2516:30:18" } ] }, "documentation": null, - "id": 3194, + "id": 3246, "implemented": true, "kind": "function", "modifiers": [], "name": "newGuard", "nodeType": "FunctionDefinition", "parameters": { - "id": 3168, + "id": 3220, "nodeType": "ParameterList", "parameters": [], "src": "2405:2:18" }, "returnParameters": { - "id": 3171, + "id": 3223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3170, + "id": 3222, "name": "guard", "nodeType": "VariableDeclaration", - "scope": 3194, + "scope": 3246, "src": "2424:13:18", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" }, "typeName": { "contractScope": null, - "id": 3169, + "id": 3221, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2424:7:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -3698,14 +3698,14 @@ ], "src": "2423:15:18" }, - "scope": 3195, + "scope": 3247, "src": "2388:165:18", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3196, + "scope": 3248, "src": "2309:246:18" } ], @@ -3715,20 +3715,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "exportedSymbols": { "DSGuard": [ - 3163 + 3215 ], "DSGuardEvents": [ - 2944 + 2996 ], "DSGuardFactory": [ - 3195 + 3247 ] }, - "id": 3196, + "id": 3248, "nodeType": "SourceUnit", "nodes": [ { - "id": 2926, + "id": 2978, "literals": [ "solidity", "0.5", @@ -3740,10 +3740,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "file": "./Auth.sol", - "id": 2927, + "id": 2979, "nodeType": "ImportDirective", - "scope": 3196, - "sourceUnit": 2925, + "scope": 3248, + "sourceUnit": 2977, "src": "769:20:18", "symbolAliases": [], "unitAlias": "" @@ -3754,9 +3754,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2944, + "id": 2996, "linearizedBaseContracts": [ - 2944 + 2996 ], "name": "DSGuardEvents", "nodeType": "ContractDefinition", @@ -3764,20 +3764,20 @@ { "anonymous": false, "documentation": null, - "id": 2935, + "id": 2987, "name": "LogPermit", "nodeType": "EventDefinition", "parameters": { - "id": 2934, + "id": 2986, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2929, + "id": 2981, "indexed": true, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "845:19:18", "stateVariable": false, "storageLocation": "default", @@ -3786,7 +3786,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2928, + "id": 2980, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "845:7:18", @@ -3800,11 +3800,11 @@ }, { "constant": false, - "id": 2931, + "id": 2983, "indexed": true, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "874:19:18", "stateVariable": false, "storageLocation": "default", @@ -3813,7 +3813,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2930, + "id": 2982, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "874:7:18", @@ -3827,11 +3827,11 @@ }, { "constant": false, - "id": 2933, + "id": 2985, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "903:19:18", "stateVariable": false, "storageLocation": "default", @@ -3840,7 +3840,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2932, + "id": 2984, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "903:7:18", @@ -3860,20 +3860,20 @@ { "anonymous": false, "documentation": null, - "id": 2943, + "id": 2995, "name": "LogForbid", "nodeType": "EventDefinition", "parameters": { - "id": 2942, + "id": 2994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2937, + "id": 2989, "indexed": true, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "960:19:18", "stateVariable": false, "storageLocation": "default", @@ -3882,7 +3882,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2936, + "id": 2988, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "960:7:18", @@ -3896,11 +3896,11 @@ }, { "constant": false, - "id": 2939, + "id": 2991, "indexed": true, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "989:19:18", "stateVariable": false, "storageLocation": "default", @@ -3909,7 +3909,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2938, + "id": 2990, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "989:7:18", @@ -3923,11 +3923,11 @@ }, { "constant": false, - "id": 2941, + "id": 2993, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "1018:19:18", "stateVariable": false, "storageLocation": "default", @@ -3936,7 +3936,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2940, + "id": 2992, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1018:7:18", @@ -3954,7 +3954,7 @@ "src": "935:109:18" } ], - "scope": 3196, + "scope": 3248, "src": "791:255:18" }, { @@ -3963,17 +3963,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2945, + "id": 2997, "name": "DSAuth", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2924, + "referencedDeclaration": 2976, "src": "1068:6:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } }, - "id": 2946, + "id": 2998, "nodeType": "InheritanceSpecifier", "src": "1068:6:18" }, @@ -3981,17 +3981,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2947, + "id": 2999, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "1076:11:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2948, + "id": 3000, "nodeType": "InheritanceSpecifier", "src": "1076:11:18" }, @@ -3999,47 +3999,47 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2949, + "id": 3001, "name": "DSGuardEvents", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2944, + "referencedDeclaration": 2996, "src": "1089:13:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardEvents_$2944", + "typeIdentifier": "t_contract$_DSGuardEvents_$2996", "typeString": "contract DSGuardEvents" } }, - "id": 2950, + "id": 3002, "nodeType": "InheritanceSpecifier", "src": "1089:13:18" } ], "contractDependencies": [ - 2799, - 2808, - 2924, - 2944 + 2851, + 2860, + 2976, + 2996 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3163, + "id": 3215, "linearizedBaseContracts": [ - 3163, - 2944, - 2799, - 2924, - 2808 + 3215, + 2996, + 2851, + 2976, + 2860 ], "name": "DSGuard", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 2958, + "id": 3010, "name": "ANY", "nodeType": "VariableDeclaration", - "scope": 3163, + "scope": 3215, "src": "1109:47:18", "stateVariable": true, "storageLocation": "default", @@ -4048,7 +4048,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2951, + "id": 3003, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1109:7:18", @@ -4065,7 +4065,7 @@ "arguments": [ { "argumentTypes": null, - "id": 2955, + "id": 3007, "isConstant": false, "isLValue": false, "isPure": true, @@ -4077,7 +4077,7 @@ "subExpression": { "argumentTypes": null, "hexValue": "31", - "id": 2954, + "id": 3006, "isConstant": false, "isLValue": false, "isPure": true, @@ -4105,7 +4105,7 @@ "typeString": "int_const -1" } ], - "id": 2953, + "id": 3005, "isConstant": false, "isLValue": false, "isPure": true, @@ -4118,7 +4118,7 @@ }, "typeName": "uint" }, - "id": 2956, + "id": 3008, "isConstant": false, "isLValue": false, "isPure": true, @@ -4140,7 +4140,7 @@ "typeString": "uint256" } ], - "id": 2952, + "id": 3004, "isConstant": false, "isLValue": false, "isPure": true, @@ -4153,7 +4153,7 @@ }, "typeName": "bytes32" }, - "id": 2957, + "id": 3009, "isConstant": false, "isLValue": false, "isPure": true, @@ -4171,10 +4171,10 @@ }, { "constant": false, - "id": 2966, + "id": 3018, "name": "acl", "nodeType": "VariableDeclaration", - "scope": 3163, + "scope": 3215, "src": "1163:71:18", "stateVariable": true, "storageLocation": "default", @@ -4183,9 +4183,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" }, "typeName": { - "id": 2965, + "id": 3017, "keyType": { - "id": 2959, + "id": 3011, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1172:7:18", @@ -4201,9 +4201,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" }, "valueType": { - "id": 2964, + "id": 3016, "keyType": { - "id": 2960, + "id": 3012, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1192:7:18", @@ -4219,9 +4219,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" }, "valueType": { - "id": 2963, + "id": 3015, "keyType": { - "id": 2961, + "id": 3013, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1212:7:18", @@ -4237,7 +4237,7 @@ "typeString": "mapping(bytes32 => bool)" }, "valueType": { - "id": 2962, + "id": 3014, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1223:4:18", @@ -4254,21 +4254,21 @@ }, { "body": { - "id": 3057, + "id": 3109, "nodeType": "Block", "src": "1339:373:18", "statements": [ { "assignments": [ - 2978 + 3030 ], "declarations": [ { "constant": false, - "id": 2978, + "id": 3030, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3057, + "scope": 3109, "src": "1349:11:18", "stateVariable": false, "storageLocation": "default", @@ -4277,7 +4277,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2977, + "id": 3029, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1349:7:18", @@ -4290,7 +4290,7 @@ "visibility": "internal" } ], - "id": 2984, + "id": 3036, "initialValue": { "argumentTypes": null, "arguments": [ @@ -4299,11 +4299,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2981, + "id": 3033, "name": "src_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2968, + "referencedDeclaration": 3020, "src": "1379:4:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4318,7 +4318,7 @@ "typeString": "address" } ], - "id": 2980, + "id": 3032, "isConstant": false, "isLValue": false, "isPure": true, @@ -4331,7 +4331,7 @@ }, "typeName": "bytes20" }, - "id": 2982, + "id": 3034, "isConstant": false, "isLValue": false, "isPure": false, @@ -4353,7 +4353,7 @@ "typeString": "bytes20" } ], - "id": 2979, + "id": 3031, "isConstant": false, "isLValue": false, "isPure": true, @@ -4366,7 +4366,7 @@ }, "typeName": "bytes32" }, - "id": 2983, + "id": 3035, "isConstant": false, "isLValue": false, "isPure": false, @@ -4385,15 +4385,15 @@ }, { "assignments": [ - 2986 + 3038 ], "declarations": [ { "constant": false, - "id": 2986, + "id": 3038, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3057, + "scope": 3109, "src": "1395:11:18", "stateVariable": false, "storageLocation": "default", @@ -4402,7 +4402,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2985, + "id": 3037, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1395:7:18", @@ -4415,7 +4415,7 @@ "visibility": "internal" } ], - "id": 2992, + "id": 3044, "initialValue": { "argumentTypes": null, "arguments": [ @@ -4424,11 +4424,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2989, + "id": 3041, "name": "dst_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2970, + "referencedDeclaration": 3022, "src": "1425:4:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4443,7 +4443,7 @@ "typeString": "address" } ], - "id": 2988, + "id": 3040, "isConstant": false, "isLValue": false, "isPure": true, @@ -4456,7 +4456,7 @@ }, "typeName": "bytes20" }, - "id": 2990, + "id": 3042, "isConstant": false, "isLValue": false, "isPure": false, @@ -4478,7 +4478,7 @@ "typeString": "bytes20" } ], - "id": 2987, + "id": 3039, "isConstant": false, "isLValue": false, "isPure": true, @@ -4491,7 +4491,7 @@ }, "typeName": "bytes32" }, - "id": 2991, + "id": 3043, "isConstant": false, "isLValue": false, "isPure": false, @@ -4515,7 +4515,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3055, + "id": 3107, "isConstant": false, "isLValue": false, "isPure": false, @@ -4526,7 +4526,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3047, + "id": 3099, "isConstant": false, "isLValue": false, "isPure": false, @@ -4537,7 +4537,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3039, + "id": 3091, "isConstant": false, "isLValue": false, "isPure": false, @@ -4548,7 +4548,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3031, + "id": 3083, "isConstant": false, "isLValue": false, "isPure": false, @@ -4559,7 +4559,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3023, + "id": 3075, "isConstant": false, "isLValue": false, "isPure": false, @@ -4570,7 +4570,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3015, + "id": 3067, "isConstant": false, "isLValue": false, "isPure": false, @@ -4581,7 +4581,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3007, + "id": 3059, "isConstant": false, "isLValue": false, "isPure": false, @@ -4594,25 +4594,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2993, + "id": 3045, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1449:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 2995, + "id": 3047, "indexExpression": { "argumentTypes": null, - "id": 2994, + "id": 3046, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1453:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4630,14 +4630,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 2997, + "id": 3049, "indexExpression": { "argumentTypes": null, - "id": 2996, + "id": 3048, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1458:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4655,14 +4655,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 2999, + "id": 3051, "indexExpression": { "argumentTypes": null, - "id": 2998, + "id": 3050, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1463:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -4690,25 +4690,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3000, + "id": 3052, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1483:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3002, + "id": 3054, "indexExpression": { "argumentTypes": null, - "id": 3001, + "id": 3053, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1487:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4726,14 +4726,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3004, + "id": 3056, "indexExpression": { "argumentTypes": null, - "id": 3003, + "id": 3055, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1492:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4751,14 +4751,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3006, + "id": 3058, "indexExpression": { "argumentTypes": null, - "id": 3005, + "id": 3057, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1497:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4792,25 +4792,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3008, + "id": 3060, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1517:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3010, + "id": 3062, "indexExpression": { "argumentTypes": null, - "id": 3009, + "id": 3061, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1521:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4828,14 +4828,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3012, + "id": 3064, "indexExpression": { "argumentTypes": null, - "id": 3011, + "id": 3063, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1526:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4853,14 +4853,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3014, + "id": 3066, "indexExpression": { "argumentTypes": null, - "id": 3013, + "id": 3065, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1531:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -4894,25 +4894,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3016, + "id": 3068, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1551:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3018, + "id": 3070, "indexExpression": { "argumentTypes": null, - "id": 3017, + "id": 3069, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1555:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4930,14 +4930,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3020, + "id": 3072, "indexExpression": { "argumentTypes": null, - "id": 3019, + "id": 3071, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1560:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4955,14 +4955,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3022, + "id": 3074, "indexExpression": { "argumentTypes": null, - "id": 3021, + "id": 3073, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1565:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4996,25 +4996,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3024, + "id": 3076, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1585:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3026, + "id": 3078, "indexExpression": { "argumentTypes": null, - "id": 3025, + "id": 3077, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1589:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5032,14 +5032,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3028, + "id": 3080, "indexExpression": { "argumentTypes": null, - "id": 3027, + "id": 3079, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1594:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5057,14 +5057,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3030, + "id": 3082, "indexExpression": { "argumentTypes": null, - "id": 3029, + "id": 3081, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1599:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -5098,25 +5098,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3032, + "id": 3084, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1619:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3034, + "id": 3086, "indexExpression": { "argumentTypes": null, - "id": 3033, + "id": 3085, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1623:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5134,14 +5134,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3036, + "id": 3088, "indexExpression": { "argumentTypes": null, - "id": 3035, + "id": 3087, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1628:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5159,14 +5159,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3038, + "id": 3090, "indexExpression": { "argumentTypes": null, - "id": 3037, + "id": 3089, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1633:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5200,25 +5200,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3040, + "id": 3092, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1653:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3042, + "id": 3094, "indexExpression": { "argumentTypes": null, - "id": 3041, + "id": 3093, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1657:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5236,14 +5236,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3044, + "id": 3096, "indexExpression": { "argumentTypes": null, - "id": 3043, + "id": 3095, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1662:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5261,14 +5261,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3046, + "id": 3098, "indexExpression": { "argumentTypes": null, - "id": 3045, + "id": 3097, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1667:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -5302,25 +5302,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3048, + "id": 3100, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1687:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3050, + "id": 3102, "indexExpression": { "argumentTypes": null, - "id": 3049, + "id": 3101, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1691:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5338,14 +5338,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3052, + "id": 3104, "indexExpression": { "argumentTypes": null, - "id": 3051, + "id": 3103, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1696:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5363,14 +5363,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3054, + "id": 3106, "indexExpression": { "argumentTypes": null, - "id": 3053, + "id": 3105, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1701:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5394,30 +5394,30 @@ "typeString": "bool" } }, - "functionReturnParameters": 2976, - "id": 3056, + "functionReturnParameters": 3028, + "id": 3108, "nodeType": "Return", "src": "1442:263:18" } ] }, "documentation": null, - "id": 3058, + "id": 3110, "implemented": true, "kind": "function", "modifiers": [], "name": "canCall", "nodeType": "FunctionDefinition", "parameters": { - "id": 2973, + "id": 3025, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2968, + "id": 3020, "name": "src_", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1267:12:18", "stateVariable": false, "storageLocation": "default", @@ -5426,7 +5426,7 @@ "typeString": "address" }, "typeName": { - "id": 2967, + "id": 3019, "name": "address", "nodeType": "ElementaryTypeName", "src": "1267:7:18", @@ -5441,10 +5441,10 @@ }, { "constant": false, - "id": 2970, + "id": 3022, "name": "dst_", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1281:12:18", "stateVariable": false, "storageLocation": "default", @@ -5453,7 +5453,7 @@ "typeString": "address" }, "typeName": { - "id": 2969, + "id": 3021, "name": "address", "nodeType": "ElementaryTypeName", "src": "1281:7:18", @@ -5468,10 +5468,10 @@ }, { "constant": false, - "id": 2972, + "id": 3024, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1295:10:18", "stateVariable": false, "storageLocation": "default", @@ -5480,7 +5480,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2971, + "id": 3023, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "1295:6:18", @@ -5496,15 +5496,15 @@ "src": "1257:54:18" }, "returnParameters": { - "id": 2976, + "id": 3028, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2975, + "id": 3027, "name": "", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1333:4:18", "stateVariable": false, "storageLocation": "default", @@ -5513,7 +5513,7 @@ "typeString": "bool" }, "typeName": { - "id": 2974, + "id": 3026, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1333:4:18", @@ -5528,22 +5528,22 @@ ], "src": "1332:6:18" }, - "scope": 3163, + "scope": 3215, "src": "1241:471:18", "stateMutability": "view", - "superFunction": 2798, + "superFunction": 2850, "visibility": "public" }, { "body": { - "id": 3085, + "id": 3137, "nodeType": "Block", "src": "1785:81:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3077, + "id": 3129, "isConstant": false, "isLValue": false, "isPure": false, @@ -5556,25 +5556,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3069, + "id": 3121, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1795:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3073, + "id": 3125, "indexExpression": { "argumentTypes": null, - "id": 3070, + "id": 3122, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3060, + "referencedDeclaration": 3112, "src": "1799:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5592,14 +5592,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3074, + "id": 3126, "indexExpression": { "argumentTypes": null, - "id": 3071, + "id": 3123, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3062, + "referencedDeclaration": 3114, "src": "1804:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5617,14 +5617,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3075, + "id": 3127, "indexExpression": { "argumentTypes": null, - "id": 3072, + "id": 3124, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3064, + "referencedDeclaration": 3116, "src": "1809:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5647,7 +5647,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3076, + "id": 3128, "isConstant": false, "isLValue": false, "isPure": true, @@ -5668,7 +5668,7 @@ "typeString": "bool" } }, - "id": 3078, + "id": 3130, "nodeType": "ExpressionStatement", "src": "1795:25:18" }, @@ -5678,11 +5678,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3080, + "id": 3132, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3060, + "referencedDeclaration": 3112, "src": "1845:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5691,11 +5691,11 @@ }, { "argumentTypes": null, - "id": 3081, + "id": 3133, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3062, + "referencedDeclaration": 3114, "src": "1850:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5704,11 +5704,11 @@ }, { "argumentTypes": null, - "id": 3082, + "id": 3134, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3064, + "referencedDeclaration": 3116, "src": "1855:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5731,18 +5731,18 @@ "typeString": "bytes32" } ], - "id": 3079, + "id": 3131, "name": "LogPermit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2935, + "referencedDeclaration": 2987, "src": "1835:9:18", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3083, + "id": 3135, "isConstant": false, "isLValue": false, "isPure": false, @@ -5756,27 +5756,27 @@ "typeString": "tuple()" } }, - "id": 3084, + "id": 3136, "nodeType": "EmitStatement", "src": "1830:29:18" } ] }, "documentation": null, - "id": 3086, + "id": 3138, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3067, + "id": 3119, "modifierName": { "argumentTypes": null, - "id": 3066, + "id": 3118, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1780:4:18", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -5790,15 +5790,15 @@ "name": "permit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3065, + "id": 3117, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3060, + "id": 3112, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1734:11:18", "stateVariable": false, "storageLocation": "default", @@ -5807,7 +5807,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3059, + "id": 3111, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1734:7:18", @@ -5821,10 +5821,10 @@ }, { "constant": false, - "id": 3062, + "id": 3114, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1747:11:18", "stateVariable": false, "storageLocation": "default", @@ -5833,7 +5833,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3061, + "id": 3113, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1747:7:18", @@ -5847,10 +5847,10 @@ }, { "constant": false, - "id": 3064, + "id": 3116, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1760:11:18", "stateVariable": false, "storageLocation": "default", @@ -5859,7 +5859,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3063, + "id": 3115, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1760:7:18", @@ -5875,12 +5875,12 @@ "src": "1733:39:18" }, "returnParameters": { - "id": 3068, + "id": 3120, "nodeType": "ParameterList", "parameters": [], "src": "1785:0:18" }, - "scope": 3163, + "scope": 3215, "src": "1718:148:18", "stateMutability": "nonpayable", "superFunction": null, @@ -5888,14 +5888,14 @@ }, { "body": { - "id": 3113, + "id": 3165, "nodeType": "Block", "src": "1939:82:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3105, + "id": 3157, "isConstant": false, "isLValue": false, "isPure": false, @@ -5908,25 +5908,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3097, + "id": 3149, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1949:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3101, + "id": 3153, "indexExpression": { "argumentTypes": null, - "id": 3098, + "id": 3150, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3088, + "referencedDeclaration": 3140, "src": "1953:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5944,14 +5944,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3102, + "id": 3154, "indexExpression": { "argumentTypes": null, - "id": 3099, + "id": 3151, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3090, + "referencedDeclaration": 3142, "src": "1958:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5969,14 +5969,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3103, + "id": 3155, "indexExpression": { "argumentTypes": null, - "id": 3100, + "id": 3152, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3092, + "referencedDeclaration": 3144, "src": "1963:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5999,7 +5999,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 3104, + "id": 3156, "isConstant": false, "isLValue": false, "isPure": true, @@ -6020,7 +6020,7 @@ "typeString": "bool" } }, - "id": 3106, + "id": 3158, "nodeType": "ExpressionStatement", "src": "1949:26:18" }, @@ -6030,11 +6030,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3108, + "id": 3160, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3088, + "referencedDeclaration": 3140, "src": "2000:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6043,11 +6043,11 @@ }, { "argumentTypes": null, - "id": 3109, + "id": 3161, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3090, + "referencedDeclaration": 3142, "src": "2005:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6056,11 +6056,11 @@ }, { "argumentTypes": null, - "id": 3110, + "id": 3162, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3092, + "referencedDeclaration": 3144, "src": "2010:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6083,18 +6083,18 @@ "typeString": "bytes32" } ], - "id": 3107, + "id": 3159, "name": "LogForbid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2943, + "referencedDeclaration": 2995, "src": "1990:9:18", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3111, + "id": 3163, "isConstant": false, "isLValue": false, "isPure": false, @@ -6108,27 +6108,27 @@ "typeString": "tuple()" } }, - "id": 3112, + "id": 3164, "nodeType": "EmitStatement", "src": "1985:29:18" } ] }, "documentation": null, - "id": 3114, + "id": 3166, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3095, + "id": 3147, "modifierName": { "argumentTypes": null, - "id": 3094, + "id": 3146, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1934:4:18", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -6142,15 +6142,15 @@ "name": "forbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 3093, + "id": 3145, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3088, + "id": 3140, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1888:11:18", "stateVariable": false, "storageLocation": "default", @@ -6159,7 +6159,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3087, + "id": 3139, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1888:7:18", @@ -6173,10 +6173,10 @@ }, { "constant": false, - "id": 3090, + "id": 3142, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1901:11:18", "stateVariable": false, "storageLocation": "default", @@ -6185,7 +6185,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3089, + "id": 3141, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1901:7:18", @@ -6199,10 +6199,10 @@ }, { "constant": false, - "id": 3092, + "id": 3144, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1914:11:18", "stateVariable": false, "storageLocation": "default", @@ -6211,7 +6211,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3091, + "id": 3143, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1914:7:18", @@ -6227,12 +6227,12 @@ "src": "1887:39:18" }, "returnParameters": { - "id": 3096, + "id": 3148, "nodeType": "ParameterList", "parameters": [], "src": "1939:0:18" }, - "scope": 3163, + "scope": 3215, "src": "1872:149:18", "stateMutability": "nonpayable", "superFunction": null, @@ -6240,7 +6240,7 @@ }, { "body": { - "id": 3137, + "id": 3189, "nodeType": "Block", "src": "2089:74:18", "statements": [ @@ -6256,11 +6256,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3126, + "id": 3178, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3116, + "referencedDeclaration": 3168, "src": "2122:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6275,7 +6275,7 @@ "typeString": "address" } ], - "id": 3125, + "id": 3177, "isConstant": false, "isLValue": false, "isPure": true, @@ -6288,7 +6288,7 @@ }, "typeName": "bytes20" }, - "id": 3127, + "id": 3179, "isConstant": false, "isLValue": false, "isPure": false, @@ -6310,7 +6310,7 @@ "typeString": "bytes20" } ], - "id": 3124, + "id": 3176, "isConstant": false, "isLValue": false, "isPure": true, @@ -6323,7 +6323,7 @@ }, "typeName": "bytes32" }, - "id": 3128, + "id": 3180, "isConstant": false, "isLValue": false, "isPure": false, @@ -6345,11 +6345,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3131, + "id": 3183, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3118, + "referencedDeclaration": 3170, "src": "2145:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6364,7 +6364,7 @@ "typeString": "address" } ], - "id": 3130, + "id": 3182, "isConstant": false, "isLValue": false, "isPure": true, @@ -6377,7 +6377,7 @@ }, "typeName": "bytes20" }, - "id": 3132, + "id": 3184, "isConstant": false, "isLValue": false, "isPure": false, @@ -6399,7 +6399,7 @@ "typeString": "bytes20" } ], - "id": 3129, + "id": 3181, "isConstant": false, "isLValue": false, "isPure": true, @@ -6412,7 +6412,7 @@ }, "typeName": "bytes32" }, - "id": 3133, + "id": 3185, "isConstant": false, "isLValue": false, "isPure": false, @@ -6428,11 +6428,11 @@ }, { "argumentTypes": null, - "id": 3134, + "id": 3186, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3120, + "referencedDeclaration": 3172, "src": "2152:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6455,21 +6455,21 @@ "typeString": "bytes32" } ], - "id": 3123, + "id": 3175, "name": "permit", "nodeType": "Identifier", "overloadedDeclarations": [ - 3086, - 3138 + 3138, + 3190 ], - "referencedDeclaration": 3086, + "referencedDeclaration": 3138, "src": "2099:6:18", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3135, + "id": 3187, "isConstant": false, "isLValue": false, "isPure": false, @@ -6483,29 +6483,29 @@ "typeString": "tuple()" } }, - "id": 3136, + "id": 3188, "nodeType": "ExpressionStatement", "src": "2099:57:18" } ] }, "documentation": null, - "id": 3138, + "id": 3190, "implemented": true, "kind": "function", "modifiers": [], "name": "permit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3121, + "id": 3173, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3116, + "id": 3168, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2043:11:18", "stateVariable": false, "storageLocation": "default", @@ -6514,7 +6514,7 @@ "typeString": "address" }, "typeName": { - "id": 3115, + "id": 3167, "name": "address", "nodeType": "ElementaryTypeName", "src": "2043:7:18", @@ -6529,10 +6529,10 @@ }, { "constant": false, - "id": 3118, + "id": 3170, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2056:11:18", "stateVariable": false, "storageLocation": "default", @@ -6541,7 +6541,7 @@ "typeString": "address" }, "typeName": { - "id": 3117, + "id": 3169, "name": "address", "nodeType": "ElementaryTypeName", "src": "2056:7:18", @@ -6556,10 +6556,10 @@ }, { "constant": false, - "id": 3120, + "id": 3172, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2069:11:18", "stateVariable": false, "storageLocation": "default", @@ -6568,7 +6568,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3119, + "id": 3171, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2069:7:18", @@ -6584,12 +6584,12 @@ "src": "2042:39:18" }, "returnParameters": { - "id": 3122, + "id": 3174, "nodeType": "ParameterList", "parameters": [], "src": "2089:0:18" }, - "scope": 3163, + "scope": 3215, "src": "2027:136:18", "stateMutability": "nonpayable", "superFunction": null, @@ -6597,7 +6597,7 @@ }, { "body": { - "id": 3161, + "id": 3213, "nodeType": "Block", "src": "2230:74:18", "statements": [ @@ -6613,11 +6613,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3150, + "id": 3202, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3140, + "referencedDeclaration": 3192, "src": "2263:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6632,7 +6632,7 @@ "typeString": "address" } ], - "id": 3149, + "id": 3201, "isConstant": false, "isLValue": false, "isPure": true, @@ -6645,7 +6645,7 @@ }, "typeName": "bytes20" }, - "id": 3151, + "id": 3203, "isConstant": false, "isLValue": false, "isPure": false, @@ -6667,7 +6667,7 @@ "typeString": "bytes20" } ], - "id": 3148, + "id": 3200, "isConstant": false, "isLValue": false, "isPure": true, @@ -6680,7 +6680,7 @@ }, "typeName": "bytes32" }, - "id": 3152, + "id": 3204, "isConstant": false, "isLValue": false, "isPure": false, @@ -6702,11 +6702,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3155, + "id": 3207, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3142, + "referencedDeclaration": 3194, "src": "2286:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6721,7 +6721,7 @@ "typeString": "address" } ], - "id": 3154, + "id": 3206, "isConstant": false, "isLValue": false, "isPure": true, @@ -6734,7 +6734,7 @@ }, "typeName": "bytes20" }, - "id": 3156, + "id": 3208, "isConstant": false, "isLValue": false, "isPure": false, @@ -6756,7 +6756,7 @@ "typeString": "bytes20" } ], - "id": 3153, + "id": 3205, "isConstant": false, "isLValue": false, "isPure": true, @@ -6769,7 +6769,7 @@ }, "typeName": "bytes32" }, - "id": 3157, + "id": 3209, "isConstant": false, "isLValue": false, "isPure": false, @@ -6785,11 +6785,11 @@ }, { "argumentTypes": null, - "id": 3158, + "id": 3210, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3144, + "referencedDeclaration": 3196, "src": "2293:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6812,21 +6812,21 @@ "typeString": "bytes32" } ], - "id": 3147, + "id": 3199, "name": "forbid", "nodeType": "Identifier", "overloadedDeclarations": [ - 3114, - 3162 + 3166, + 3214 ], - "referencedDeclaration": 3114, + "referencedDeclaration": 3166, "src": "2240:6:18", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3159, + "id": 3211, "isConstant": false, "isLValue": false, "isPure": false, @@ -6840,29 +6840,29 @@ "typeString": "tuple()" } }, - "id": 3160, + "id": 3212, "nodeType": "ExpressionStatement", "src": "2240:57:18" } ] }, "documentation": null, - "id": 3162, + "id": 3214, "implemented": true, "kind": "function", "modifiers": [], "name": "forbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 3145, + "id": 3197, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3140, + "id": 3192, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2184:11:18", "stateVariable": false, "storageLocation": "default", @@ -6871,7 +6871,7 @@ "typeString": "address" }, "typeName": { - "id": 3139, + "id": 3191, "name": "address", "nodeType": "ElementaryTypeName", "src": "2184:7:18", @@ -6886,10 +6886,10 @@ }, { "constant": false, - "id": 3142, + "id": 3194, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2197:11:18", "stateVariable": false, "storageLocation": "default", @@ -6898,7 +6898,7 @@ "typeString": "address" }, "typeName": { - "id": 3141, + "id": 3193, "name": "address", "nodeType": "ElementaryTypeName", "src": "2197:7:18", @@ -6913,10 +6913,10 @@ }, { "constant": false, - "id": 3144, + "id": 3196, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2210:11:18", "stateVariable": false, "storageLocation": "default", @@ -6925,7 +6925,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3143, + "id": 3195, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2210:7:18", @@ -6941,42 +6941,42 @@ "src": "2183:39:18" }, "returnParameters": { - "id": 3146, + "id": 3198, "nodeType": "ParameterList", "parameters": [], "src": "2230:0:18" }, - "scope": 3163, + "scope": 3215, "src": "2168:136:18", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3196, + "scope": 3248, "src": "1048:1259:18" }, { "baseContracts": [], "contractDependencies": [ - 3163 + 3215 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3195, + "id": 3247, "linearizedBaseContracts": [ - 3195 + 3247 ], "name": "DSGuardFactory", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3167, + "id": 3219, "name": "isGuard", "nodeType": "VariableDeclaration", - "scope": 3195, + "scope": 3247, "src": "2339:42:18", "stateVariable": true, "storageLocation": "default", @@ -6985,9 +6985,9 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 3166, + "id": 3218, "keyType": { - "id": 3164, + "id": 3216, "name": "address", "nodeType": "ElementaryTypeName", "src": "2348:7:18", @@ -7003,7 +7003,7 @@ "typeString": "mapping(address => bool)" }, "valueType": { - "id": 3165, + "id": 3217, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2359:4:18", @@ -7018,28 +7018,28 @@ }, { "body": { - "id": 3193, + "id": 3245, "nodeType": "Block", "src": "2439:114:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3176, + "id": 3228, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3172, + "id": 3224, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2449:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -7050,7 +7050,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3174, + "id": 3226, "isConstant": false, "isLValue": false, "isPure": false, @@ -7058,23 +7058,23 @@ "nodeType": "NewExpression", "src": "2457:11:18", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuard_$3215_$", "typeString": "function () returns (contract DSGuard)" }, "typeName": { "contractScope": null, - "id": 3173, + "id": 3225, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2461:7:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } }, - "id": 3175, + "id": 3227, "isConstant": false, "isLValue": false, "isPure": false, @@ -7084,17 +7084,17 @@ "nodeType": "FunctionCall", "src": "2457:13:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, "src": "2449:21:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 3177, + "id": 3229, "nodeType": "ExpressionStatement", "src": "2449:21:18" }, @@ -7106,18 +7106,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3181, + "id": 3233, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "2495:3:18", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3182, + "id": 3234, "isConstant": false, "isLValue": false, "isPure": false, @@ -7141,32 +7141,32 @@ ], "expression": { "argumentTypes": null, - "id": 3178, + "id": 3230, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2480:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 3180, + "id": 3232, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "2480:14:18", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 3183, + "id": 3235, "isConstant": false, "isLValue": false, "isPure": false, @@ -7180,14 +7180,14 @@ "typeString": "tuple()" } }, - "id": 3184, + "id": 3236, "nodeType": "ExpressionStatement", "src": "2480:26:18" }, { "expression": { "argumentTypes": null, - "id": 3191, + "id": 3243, "isConstant": false, "isLValue": false, "isPure": false, @@ -7196,31 +7196,31 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3185, + "id": 3237, "name": "isGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3167, + "referencedDeclaration": 3219, "src": "2516:7:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 3189, + "id": 3241, "indexExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3187, + "id": 3239, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2532:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } @@ -7228,11 +7228,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } ], - "id": 3186, + "id": 3238, "isConstant": false, "isLValue": false, "isPure": true, @@ -7245,7 +7245,7 @@ }, "typeName": "address" }, - "id": 3188, + "id": 3240, "isConstant": false, "isLValue": false, "isPure": false, @@ -7275,7 +7275,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3190, + "id": 3242, "isConstant": false, "isLValue": false, "isPure": true, @@ -7296,51 +7296,51 @@ "typeString": "bool" } }, - "id": 3192, + "id": 3244, "nodeType": "ExpressionStatement", "src": "2516:30:18" } ] }, "documentation": null, - "id": 3194, + "id": 3246, "implemented": true, "kind": "function", "modifiers": [], "name": "newGuard", "nodeType": "FunctionDefinition", "parameters": { - "id": 3168, + "id": 3220, "nodeType": "ParameterList", "parameters": [], "src": "2405:2:18" }, "returnParameters": { - "id": 3171, + "id": 3223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3170, + "id": 3222, "name": "guard", "nodeType": "VariableDeclaration", - "scope": 3194, + "scope": 3246, "src": "2424:13:18", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" }, "typeName": { "contractScope": null, - "id": 3169, + "id": 3221, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2424:7:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -7350,14 +7350,14 @@ ], "src": "2423:15:18" }, - "scope": 3195, + "scope": 3247, "src": "2388:165:18", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3196, + "scope": 3248, "src": "2309:246:18" } ], @@ -7369,7 +7369,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.498Z", + "updatedAt": "2020-04-08T12:21:13.736Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DSGuardFactory.json b/packages/smart-contracts/artifacts/DSGuardFactory.json index 522138f..38e572d 100644 --- a/packages/smart-contracts/artifacts/DSGuardFactory.json +++ b/packages/smart-contracts/artifacts/DSGuardFactory.json @@ -49,20 +49,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "exportedSymbols": { "DSGuard": [ - 3163 + 3215 ], "DSGuardEvents": [ - 2944 + 2996 ], "DSGuardFactory": [ - 3195 + 3247 ] }, - "id": 3196, + "id": 3248, "nodeType": "SourceUnit", "nodes": [ { - "id": 2926, + "id": 2978, "literals": [ "solidity", "0.5", @@ -74,10 +74,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "file": "./Auth.sol", - "id": 2927, + "id": 2979, "nodeType": "ImportDirective", - "scope": 3196, - "sourceUnit": 2925, + "scope": 3248, + "sourceUnit": 2977, "src": "769:20:18", "symbolAliases": [], "unitAlias": "" @@ -88,9 +88,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2944, + "id": 2996, "linearizedBaseContracts": [ - 2944 + 2996 ], "name": "DSGuardEvents", "nodeType": "ContractDefinition", @@ -98,20 +98,20 @@ { "anonymous": false, "documentation": null, - "id": 2935, + "id": 2987, "name": "LogPermit", "nodeType": "EventDefinition", "parameters": { - "id": 2934, + "id": 2986, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2929, + "id": 2981, "indexed": true, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "845:19:18", "stateVariable": false, "storageLocation": "default", @@ -120,7 +120,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2928, + "id": 2980, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "845:7:18", @@ -134,11 +134,11 @@ }, { "constant": false, - "id": 2931, + "id": 2983, "indexed": true, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "874:19:18", "stateVariable": false, "storageLocation": "default", @@ -147,7 +147,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2930, + "id": 2982, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "874:7:18", @@ -161,11 +161,11 @@ }, { "constant": false, - "id": 2933, + "id": 2985, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "903:19:18", "stateVariable": false, "storageLocation": "default", @@ -174,7 +174,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2932, + "id": 2984, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "903:7:18", @@ -194,20 +194,20 @@ { "anonymous": false, "documentation": null, - "id": 2943, + "id": 2995, "name": "LogForbid", "nodeType": "EventDefinition", "parameters": { - "id": 2942, + "id": 2994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2937, + "id": 2989, "indexed": true, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "960:19:18", "stateVariable": false, "storageLocation": "default", @@ -216,7 +216,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2936, + "id": 2988, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "960:7:18", @@ -230,11 +230,11 @@ }, { "constant": false, - "id": 2939, + "id": 2991, "indexed": true, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "989:19:18", "stateVariable": false, "storageLocation": "default", @@ -243,7 +243,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2938, + "id": 2990, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "989:7:18", @@ -257,11 +257,11 @@ }, { "constant": false, - "id": 2941, + "id": 2993, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "1018:19:18", "stateVariable": false, "storageLocation": "default", @@ -270,7 +270,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2940, + "id": 2992, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1018:7:18", @@ -288,7 +288,7 @@ "src": "935:109:18" } ], - "scope": 3196, + "scope": 3248, "src": "791:255:18" }, { @@ -297,17 +297,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2945, + "id": 2997, "name": "DSAuth", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2924, + "referencedDeclaration": 2976, "src": "1068:6:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } }, - "id": 2946, + "id": 2998, "nodeType": "InheritanceSpecifier", "src": "1068:6:18" }, @@ -315,17 +315,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2947, + "id": 2999, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "1076:11:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2948, + "id": 3000, "nodeType": "InheritanceSpecifier", "src": "1076:11:18" }, @@ -333,47 +333,47 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2949, + "id": 3001, "name": "DSGuardEvents", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2944, + "referencedDeclaration": 2996, "src": "1089:13:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardEvents_$2944", + "typeIdentifier": "t_contract$_DSGuardEvents_$2996", "typeString": "contract DSGuardEvents" } }, - "id": 2950, + "id": 3002, "nodeType": "InheritanceSpecifier", "src": "1089:13:18" } ], "contractDependencies": [ - 2799, - 2808, - 2924, - 2944 + 2851, + 2860, + 2976, + 2996 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3163, + "id": 3215, "linearizedBaseContracts": [ - 3163, - 2944, - 2799, - 2924, - 2808 + 3215, + 2996, + 2851, + 2976, + 2860 ], "name": "DSGuard", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 2958, + "id": 3010, "name": "ANY", "nodeType": "VariableDeclaration", - "scope": 3163, + "scope": 3215, "src": "1109:47:18", "stateVariable": true, "storageLocation": "default", @@ -382,7 +382,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2951, + "id": 3003, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1109:7:18", @@ -399,7 +399,7 @@ "arguments": [ { "argumentTypes": null, - "id": 2955, + "id": 3007, "isConstant": false, "isLValue": false, "isPure": true, @@ -411,7 +411,7 @@ "subExpression": { "argumentTypes": null, "hexValue": "31", - "id": 2954, + "id": 3006, "isConstant": false, "isLValue": false, "isPure": true, @@ -439,7 +439,7 @@ "typeString": "int_const -1" } ], - "id": 2953, + "id": 3005, "isConstant": false, "isLValue": false, "isPure": true, @@ -452,7 +452,7 @@ }, "typeName": "uint" }, - "id": 2956, + "id": 3008, "isConstant": false, "isLValue": false, "isPure": true, @@ -474,7 +474,7 @@ "typeString": "uint256" } ], - "id": 2952, + "id": 3004, "isConstant": false, "isLValue": false, "isPure": true, @@ -487,7 +487,7 @@ }, "typeName": "bytes32" }, - "id": 2957, + "id": 3009, "isConstant": false, "isLValue": false, "isPure": true, @@ -505,10 +505,10 @@ }, { "constant": false, - "id": 2966, + "id": 3018, "name": "acl", "nodeType": "VariableDeclaration", - "scope": 3163, + "scope": 3215, "src": "1163:71:18", "stateVariable": true, "storageLocation": "default", @@ -517,9 +517,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" }, "typeName": { - "id": 2965, + "id": 3017, "keyType": { - "id": 2959, + "id": 3011, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1172:7:18", @@ -535,9 +535,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" }, "valueType": { - "id": 2964, + "id": 3016, "keyType": { - "id": 2960, + "id": 3012, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1192:7:18", @@ -553,9 +553,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" }, "valueType": { - "id": 2963, + "id": 3015, "keyType": { - "id": 2961, + "id": 3013, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1212:7:18", @@ -571,7 +571,7 @@ "typeString": "mapping(bytes32 => bool)" }, "valueType": { - "id": 2962, + "id": 3014, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1223:4:18", @@ -588,21 +588,21 @@ }, { "body": { - "id": 3057, + "id": 3109, "nodeType": "Block", "src": "1339:373:18", "statements": [ { "assignments": [ - 2978 + 3030 ], "declarations": [ { "constant": false, - "id": 2978, + "id": 3030, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3057, + "scope": 3109, "src": "1349:11:18", "stateVariable": false, "storageLocation": "default", @@ -611,7 +611,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2977, + "id": 3029, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1349:7:18", @@ -624,7 +624,7 @@ "visibility": "internal" } ], - "id": 2984, + "id": 3036, "initialValue": { "argumentTypes": null, "arguments": [ @@ -633,11 +633,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2981, + "id": 3033, "name": "src_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2968, + "referencedDeclaration": 3020, "src": "1379:4:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -652,7 +652,7 @@ "typeString": "address" } ], - "id": 2980, + "id": 3032, "isConstant": false, "isLValue": false, "isPure": true, @@ -665,7 +665,7 @@ }, "typeName": "bytes20" }, - "id": 2982, + "id": 3034, "isConstant": false, "isLValue": false, "isPure": false, @@ -687,7 +687,7 @@ "typeString": "bytes20" } ], - "id": 2979, + "id": 3031, "isConstant": false, "isLValue": false, "isPure": true, @@ -700,7 +700,7 @@ }, "typeName": "bytes32" }, - "id": 2983, + "id": 3035, "isConstant": false, "isLValue": false, "isPure": false, @@ -719,15 +719,15 @@ }, { "assignments": [ - 2986 + 3038 ], "declarations": [ { "constant": false, - "id": 2986, + "id": 3038, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3057, + "scope": 3109, "src": "1395:11:18", "stateVariable": false, "storageLocation": "default", @@ -736,7 +736,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2985, + "id": 3037, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1395:7:18", @@ -749,7 +749,7 @@ "visibility": "internal" } ], - "id": 2992, + "id": 3044, "initialValue": { "argumentTypes": null, "arguments": [ @@ -758,11 +758,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2989, + "id": 3041, "name": "dst_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2970, + "referencedDeclaration": 3022, "src": "1425:4:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -777,7 +777,7 @@ "typeString": "address" } ], - "id": 2988, + "id": 3040, "isConstant": false, "isLValue": false, "isPure": true, @@ -790,7 +790,7 @@ }, "typeName": "bytes20" }, - "id": 2990, + "id": 3042, "isConstant": false, "isLValue": false, "isPure": false, @@ -812,7 +812,7 @@ "typeString": "bytes20" } ], - "id": 2987, + "id": 3039, "isConstant": false, "isLValue": false, "isPure": true, @@ -825,7 +825,7 @@ }, "typeName": "bytes32" }, - "id": 2991, + "id": 3043, "isConstant": false, "isLValue": false, "isPure": false, @@ -849,7 +849,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3055, + "id": 3107, "isConstant": false, "isLValue": false, "isPure": false, @@ -860,7 +860,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3047, + "id": 3099, "isConstant": false, "isLValue": false, "isPure": false, @@ -871,7 +871,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3039, + "id": 3091, "isConstant": false, "isLValue": false, "isPure": false, @@ -882,7 +882,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3031, + "id": 3083, "isConstant": false, "isLValue": false, "isPure": false, @@ -893,7 +893,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3023, + "id": 3075, "isConstant": false, "isLValue": false, "isPure": false, @@ -904,7 +904,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3015, + "id": 3067, "isConstant": false, "isLValue": false, "isPure": false, @@ -915,7 +915,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3007, + "id": 3059, "isConstant": false, "isLValue": false, "isPure": false, @@ -928,25 +928,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2993, + "id": 3045, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1449:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 2995, + "id": 3047, "indexExpression": { "argumentTypes": null, - "id": 2994, + "id": 3046, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1453:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -964,14 +964,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 2997, + "id": 3049, "indexExpression": { "argumentTypes": null, - "id": 2996, + "id": 3048, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1458:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -989,14 +989,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 2999, + "id": 3051, "indexExpression": { "argumentTypes": null, - "id": 2998, + "id": 3050, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1463:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1024,25 +1024,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3000, + "id": 3052, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1483:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3002, + "id": 3054, "indexExpression": { "argumentTypes": null, - "id": 3001, + "id": 3053, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1487:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1060,14 +1060,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3004, + "id": 3056, "indexExpression": { "argumentTypes": null, - "id": 3003, + "id": 3055, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1492:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1085,14 +1085,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3006, + "id": 3058, "indexExpression": { "argumentTypes": null, - "id": 3005, + "id": 3057, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1497:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1126,25 +1126,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3008, + "id": 3060, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1517:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3010, + "id": 3062, "indexExpression": { "argumentTypes": null, - "id": 3009, + "id": 3061, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1521:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1162,14 +1162,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3012, + "id": 3064, "indexExpression": { "argumentTypes": null, - "id": 3011, + "id": 3063, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1526:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1187,14 +1187,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3014, + "id": 3066, "indexExpression": { "argumentTypes": null, - "id": 3013, + "id": 3065, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1531:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1228,25 +1228,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3016, + "id": 3068, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1551:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3018, + "id": 3070, "indexExpression": { "argumentTypes": null, - "id": 3017, + "id": 3069, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1555:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1264,14 +1264,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3020, + "id": 3072, "indexExpression": { "argumentTypes": null, - "id": 3019, + "id": 3071, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1560:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1289,14 +1289,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3022, + "id": 3074, "indexExpression": { "argumentTypes": null, - "id": 3021, + "id": 3073, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1565:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1330,25 +1330,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3024, + "id": 3076, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1585:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3026, + "id": 3078, "indexExpression": { "argumentTypes": null, - "id": 3025, + "id": 3077, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1589:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1366,14 +1366,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3028, + "id": 3080, "indexExpression": { "argumentTypes": null, - "id": 3027, + "id": 3079, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1594:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1391,14 +1391,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3030, + "id": 3082, "indexExpression": { "argumentTypes": null, - "id": 3029, + "id": 3081, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1599:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1432,25 +1432,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3032, + "id": 3084, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1619:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3034, + "id": 3086, "indexExpression": { "argumentTypes": null, - "id": 3033, + "id": 3085, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1623:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1468,14 +1468,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3036, + "id": 3088, "indexExpression": { "argumentTypes": null, - "id": 3035, + "id": 3087, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1628:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1493,14 +1493,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3038, + "id": 3090, "indexExpression": { "argumentTypes": null, - "id": 3037, + "id": 3089, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1633:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1534,25 +1534,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3040, + "id": 3092, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1653:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3042, + "id": 3094, "indexExpression": { "argumentTypes": null, - "id": 3041, + "id": 3093, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1657:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1570,14 +1570,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3044, + "id": 3096, "indexExpression": { "argumentTypes": null, - "id": 3043, + "id": 3095, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1662:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1595,14 +1595,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3046, + "id": 3098, "indexExpression": { "argumentTypes": null, - "id": 3045, + "id": 3097, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1667:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -1636,25 +1636,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3048, + "id": 3100, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1687:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3050, + "id": 3102, "indexExpression": { "argumentTypes": null, - "id": 3049, + "id": 3101, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1691:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1672,14 +1672,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3052, + "id": 3104, "indexExpression": { "argumentTypes": null, - "id": 3051, + "id": 3103, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1696:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1697,14 +1697,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3054, + "id": 3106, "indexExpression": { "argumentTypes": null, - "id": 3053, + "id": 3105, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1701:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1728,30 +1728,30 @@ "typeString": "bool" } }, - "functionReturnParameters": 2976, - "id": 3056, + "functionReturnParameters": 3028, + "id": 3108, "nodeType": "Return", "src": "1442:263:18" } ] }, "documentation": null, - "id": 3058, + "id": 3110, "implemented": true, "kind": "function", "modifiers": [], "name": "canCall", "nodeType": "FunctionDefinition", "parameters": { - "id": 2973, + "id": 3025, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2968, + "id": 3020, "name": "src_", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1267:12:18", "stateVariable": false, "storageLocation": "default", @@ -1760,7 +1760,7 @@ "typeString": "address" }, "typeName": { - "id": 2967, + "id": 3019, "name": "address", "nodeType": "ElementaryTypeName", "src": "1267:7:18", @@ -1775,10 +1775,10 @@ }, { "constant": false, - "id": 2970, + "id": 3022, "name": "dst_", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1281:12:18", "stateVariable": false, "storageLocation": "default", @@ -1787,7 +1787,7 @@ "typeString": "address" }, "typeName": { - "id": 2969, + "id": 3021, "name": "address", "nodeType": "ElementaryTypeName", "src": "1281:7:18", @@ -1802,10 +1802,10 @@ }, { "constant": false, - "id": 2972, + "id": 3024, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1295:10:18", "stateVariable": false, "storageLocation": "default", @@ -1814,7 +1814,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2971, + "id": 3023, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "1295:6:18", @@ -1830,15 +1830,15 @@ "src": "1257:54:18" }, "returnParameters": { - "id": 2976, + "id": 3028, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2975, + "id": 3027, "name": "", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1333:4:18", "stateVariable": false, "storageLocation": "default", @@ -1847,7 +1847,7 @@ "typeString": "bool" }, "typeName": { - "id": 2974, + "id": 3026, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1333:4:18", @@ -1862,22 +1862,22 @@ ], "src": "1332:6:18" }, - "scope": 3163, + "scope": 3215, "src": "1241:471:18", "stateMutability": "view", - "superFunction": 2798, + "superFunction": 2850, "visibility": "public" }, { "body": { - "id": 3085, + "id": 3137, "nodeType": "Block", "src": "1785:81:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3077, + "id": 3129, "isConstant": false, "isLValue": false, "isPure": false, @@ -1890,25 +1890,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3069, + "id": 3121, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1795:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3073, + "id": 3125, "indexExpression": { "argumentTypes": null, - "id": 3070, + "id": 3122, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3060, + "referencedDeclaration": 3112, "src": "1799:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1926,14 +1926,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3074, + "id": 3126, "indexExpression": { "argumentTypes": null, - "id": 3071, + "id": 3123, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3062, + "referencedDeclaration": 3114, "src": "1804:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1951,14 +1951,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3075, + "id": 3127, "indexExpression": { "argumentTypes": null, - "id": 3072, + "id": 3124, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3064, + "referencedDeclaration": 3116, "src": "1809:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1981,7 +1981,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3076, + "id": 3128, "isConstant": false, "isLValue": false, "isPure": true, @@ -2002,7 +2002,7 @@ "typeString": "bool" } }, - "id": 3078, + "id": 3130, "nodeType": "ExpressionStatement", "src": "1795:25:18" }, @@ -2012,11 +2012,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3080, + "id": 3132, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3060, + "referencedDeclaration": 3112, "src": "1845:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2025,11 +2025,11 @@ }, { "argumentTypes": null, - "id": 3081, + "id": 3133, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3062, + "referencedDeclaration": 3114, "src": "1850:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2038,11 +2038,11 @@ }, { "argumentTypes": null, - "id": 3082, + "id": 3134, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3064, + "referencedDeclaration": 3116, "src": "1855:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2065,18 +2065,18 @@ "typeString": "bytes32" } ], - "id": 3079, + "id": 3131, "name": "LogPermit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2935, + "referencedDeclaration": 2987, "src": "1835:9:18", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3083, + "id": 3135, "isConstant": false, "isLValue": false, "isPure": false, @@ -2090,27 +2090,27 @@ "typeString": "tuple()" } }, - "id": 3084, + "id": 3136, "nodeType": "EmitStatement", "src": "1830:29:18" } ] }, "documentation": null, - "id": 3086, + "id": 3138, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3067, + "id": 3119, "modifierName": { "argumentTypes": null, - "id": 3066, + "id": 3118, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1780:4:18", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2124,15 +2124,15 @@ "name": "permit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3065, + "id": 3117, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3060, + "id": 3112, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1734:11:18", "stateVariable": false, "storageLocation": "default", @@ -2141,7 +2141,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3059, + "id": 3111, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1734:7:18", @@ -2155,10 +2155,10 @@ }, { "constant": false, - "id": 3062, + "id": 3114, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1747:11:18", "stateVariable": false, "storageLocation": "default", @@ -2167,7 +2167,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3061, + "id": 3113, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1747:7:18", @@ -2181,10 +2181,10 @@ }, { "constant": false, - "id": 3064, + "id": 3116, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1760:11:18", "stateVariable": false, "storageLocation": "default", @@ -2193,7 +2193,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3063, + "id": 3115, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1760:7:18", @@ -2209,12 +2209,12 @@ "src": "1733:39:18" }, "returnParameters": { - "id": 3068, + "id": 3120, "nodeType": "ParameterList", "parameters": [], "src": "1785:0:18" }, - "scope": 3163, + "scope": 3215, "src": "1718:148:18", "stateMutability": "nonpayable", "superFunction": null, @@ -2222,14 +2222,14 @@ }, { "body": { - "id": 3113, + "id": 3165, "nodeType": "Block", "src": "1939:82:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3105, + "id": 3157, "isConstant": false, "isLValue": false, "isPure": false, @@ -2242,25 +2242,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3097, + "id": 3149, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1949:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3101, + "id": 3153, "indexExpression": { "argumentTypes": null, - "id": 3098, + "id": 3150, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3088, + "referencedDeclaration": 3140, "src": "1953:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2278,14 +2278,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3102, + "id": 3154, "indexExpression": { "argumentTypes": null, - "id": 3099, + "id": 3151, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3090, + "referencedDeclaration": 3142, "src": "1958:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2303,14 +2303,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3103, + "id": 3155, "indexExpression": { "argumentTypes": null, - "id": 3100, + "id": 3152, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3092, + "referencedDeclaration": 3144, "src": "1963:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2333,7 +2333,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 3104, + "id": 3156, "isConstant": false, "isLValue": false, "isPure": true, @@ -2354,7 +2354,7 @@ "typeString": "bool" } }, - "id": 3106, + "id": 3158, "nodeType": "ExpressionStatement", "src": "1949:26:18" }, @@ -2364,11 +2364,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3108, + "id": 3160, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3088, + "referencedDeclaration": 3140, "src": "2000:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2377,11 +2377,11 @@ }, { "argumentTypes": null, - "id": 3109, + "id": 3161, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3090, + "referencedDeclaration": 3142, "src": "2005:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2390,11 +2390,11 @@ }, { "argumentTypes": null, - "id": 3110, + "id": 3162, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3092, + "referencedDeclaration": 3144, "src": "2010:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2417,18 +2417,18 @@ "typeString": "bytes32" } ], - "id": 3107, + "id": 3159, "name": "LogForbid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2943, + "referencedDeclaration": 2995, "src": "1990:9:18", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3111, + "id": 3163, "isConstant": false, "isLValue": false, "isPure": false, @@ -2442,27 +2442,27 @@ "typeString": "tuple()" } }, - "id": 3112, + "id": 3164, "nodeType": "EmitStatement", "src": "1985:29:18" } ] }, "documentation": null, - "id": 3114, + "id": 3166, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3095, + "id": 3147, "modifierName": { "argumentTypes": null, - "id": 3094, + "id": 3146, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1934:4:18", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -2476,15 +2476,15 @@ "name": "forbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 3093, + "id": 3145, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3088, + "id": 3140, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1888:11:18", "stateVariable": false, "storageLocation": "default", @@ -2493,7 +2493,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3087, + "id": 3139, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1888:7:18", @@ -2507,10 +2507,10 @@ }, { "constant": false, - "id": 3090, + "id": 3142, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1901:11:18", "stateVariable": false, "storageLocation": "default", @@ -2519,7 +2519,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3089, + "id": 3141, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1901:7:18", @@ -2533,10 +2533,10 @@ }, { "constant": false, - "id": 3092, + "id": 3144, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1914:11:18", "stateVariable": false, "storageLocation": "default", @@ -2545,7 +2545,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3091, + "id": 3143, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1914:7:18", @@ -2561,12 +2561,12 @@ "src": "1887:39:18" }, "returnParameters": { - "id": 3096, + "id": 3148, "nodeType": "ParameterList", "parameters": [], "src": "1939:0:18" }, - "scope": 3163, + "scope": 3215, "src": "1872:149:18", "stateMutability": "nonpayable", "superFunction": null, @@ -2574,7 +2574,7 @@ }, { "body": { - "id": 3137, + "id": 3189, "nodeType": "Block", "src": "2089:74:18", "statements": [ @@ -2590,11 +2590,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3126, + "id": 3178, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3116, + "referencedDeclaration": 3168, "src": "2122:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2609,7 +2609,7 @@ "typeString": "address" } ], - "id": 3125, + "id": 3177, "isConstant": false, "isLValue": false, "isPure": true, @@ -2622,7 +2622,7 @@ }, "typeName": "bytes20" }, - "id": 3127, + "id": 3179, "isConstant": false, "isLValue": false, "isPure": false, @@ -2644,7 +2644,7 @@ "typeString": "bytes20" } ], - "id": 3124, + "id": 3176, "isConstant": false, "isLValue": false, "isPure": true, @@ -2657,7 +2657,7 @@ }, "typeName": "bytes32" }, - "id": 3128, + "id": 3180, "isConstant": false, "isLValue": false, "isPure": false, @@ -2679,11 +2679,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3131, + "id": 3183, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3118, + "referencedDeclaration": 3170, "src": "2145:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2698,7 +2698,7 @@ "typeString": "address" } ], - "id": 3130, + "id": 3182, "isConstant": false, "isLValue": false, "isPure": true, @@ -2711,7 +2711,7 @@ }, "typeName": "bytes20" }, - "id": 3132, + "id": 3184, "isConstant": false, "isLValue": false, "isPure": false, @@ -2733,7 +2733,7 @@ "typeString": "bytes20" } ], - "id": 3129, + "id": 3181, "isConstant": false, "isLValue": false, "isPure": true, @@ -2746,7 +2746,7 @@ }, "typeName": "bytes32" }, - "id": 3133, + "id": 3185, "isConstant": false, "isLValue": false, "isPure": false, @@ -2762,11 +2762,11 @@ }, { "argumentTypes": null, - "id": 3134, + "id": 3186, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3120, + "referencedDeclaration": 3172, "src": "2152:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2789,21 +2789,21 @@ "typeString": "bytes32" } ], - "id": 3123, + "id": 3175, "name": "permit", "nodeType": "Identifier", "overloadedDeclarations": [ - 3086, - 3138 + 3138, + 3190 ], - "referencedDeclaration": 3086, + "referencedDeclaration": 3138, "src": "2099:6:18", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3135, + "id": 3187, "isConstant": false, "isLValue": false, "isPure": false, @@ -2817,29 +2817,29 @@ "typeString": "tuple()" } }, - "id": 3136, + "id": 3188, "nodeType": "ExpressionStatement", "src": "2099:57:18" } ] }, "documentation": null, - "id": 3138, + "id": 3190, "implemented": true, "kind": "function", "modifiers": [], "name": "permit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3121, + "id": 3173, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3116, + "id": 3168, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2043:11:18", "stateVariable": false, "storageLocation": "default", @@ -2848,7 +2848,7 @@ "typeString": "address" }, "typeName": { - "id": 3115, + "id": 3167, "name": "address", "nodeType": "ElementaryTypeName", "src": "2043:7:18", @@ -2863,10 +2863,10 @@ }, { "constant": false, - "id": 3118, + "id": 3170, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2056:11:18", "stateVariable": false, "storageLocation": "default", @@ -2875,7 +2875,7 @@ "typeString": "address" }, "typeName": { - "id": 3117, + "id": 3169, "name": "address", "nodeType": "ElementaryTypeName", "src": "2056:7:18", @@ -2890,10 +2890,10 @@ }, { "constant": false, - "id": 3120, + "id": 3172, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2069:11:18", "stateVariable": false, "storageLocation": "default", @@ -2902,7 +2902,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3119, + "id": 3171, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2069:7:18", @@ -2918,12 +2918,12 @@ "src": "2042:39:18" }, "returnParameters": { - "id": 3122, + "id": 3174, "nodeType": "ParameterList", "parameters": [], "src": "2089:0:18" }, - "scope": 3163, + "scope": 3215, "src": "2027:136:18", "stateMutability": "nonpayable", "superFunction": null, @@ -2931,7 +2931,7 @@ }, { "body": { - "id": 3161, + "id": 3213, "nodeType": "Block", "src": "2230:74:18", "statements": [ @@ -2947,11 +2947,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3150, + "id": 3202, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3140, + "referencedDeclaration": 3192, "src": "2263:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2966,7 +2966,7 @@ "typeString": "address" } ], - "id": 3149, + "id": 3201, "isConstant": false, "isLValue": false, "isPure": true, @@ -2979,7 +2979,7 @@ }, "typeName": "bytes20" }, - "id": 3151, + "id": 3203, "isConstant": false, "isLValue": false, "isPure": false, @@ -3001,7 +3001,7 @@ "typeString": "bytes20" } ], - "id": 3148, + "id": 3200, "isConstant": false, "isLValue": false, "isPure": true, @@ -3014,7 +3014,7 @@ }, "typeName": "bytes32" }, - "id": 3152, + "id": 3204, "isConstant": false, "isLValue": false, "isPure": false, @@ -3036,11 +3036,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3155, + "id": 3207, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3142, + "referencedDeclaration": 3194, "src": "2286:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3055,7 +3055,7 @@ "typeString": "address" } ], - "id": 3154, + "id": 3206, "isConstant": false, "isLValue": false, "isPure": true, @@ -3068,7 +3068,7 @@ }, "typeName": "bytes20" }, - "id": 3156, + "id": 3208, "isConstant": false, "isLValue": false, "isPure": false, @@ -3090,7 +3090,7 @@ "typeString": "bytes20" } ], - "id": 3153, + "id": 3205, "isConstant": false, "isLValue": false, "isPure": true, @@ -3103,7 +3103,7 @@ }, "typeName": "bytes32" }, - "id": 3157, + "id": 3209, "isConstant": false, "isLValue": false, "isPure": false, @@ -3119,11 +3119,11 @@ }, { "argumentTypes": null, - "id": 3158, + "id": 3210, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3144, + "referencedDeclaration": 3196, "src": "2293:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -3146,21 +3146,21 @@ "typeString": "bytes32" } ], - "id": 3147, + "id": 3199, "name": "forbid", "nodeType": "Identifier", "overloadedDeclarations": [ - 3114, - 3162 + 3166, + 3214 ], - "referencedDeclaration": 3114, + "referencedDeclaration": 3166, "src": "2240:6:18", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3159, + "id": 3211, "isConstant": false, "isLValue": false, "isPure": false, @@ -3174,29 +3174,29 @@ "typeString": "tuple()" } }, - "id": 3160, + "id": 3212, "nodeType": "ExpressionStatement", "src": "2240:57:18" } ] }, "documentation": null, - "id": 3162, + "id": 3214, "implemented": true, "kind": "function", "modifiers": [], "name": "forbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 3145, + "id": 3197, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3140, + "id": 3192, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2184:11:18", "stateVariable": false, "storageLocation": "default", @@ -3205,7 +3205,7 @@ "typeString": "address" }, "typeName": { - "id": 3139, + "id": 3191, "name": "address", "nodeType": "ElementaryTypeName", "src": "2184:7:18", @@ -3220,10 +3220,10 @@ }, { "constant": false, - "id": 3142, + "id": 3194, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2197:11:18", "stateVariable": false, "storageLocation": "default", @@ -3232,7 +3232,7 @@ "typeString": "address" }, "typeName": { - "id": 3141, + "id": 3193, "name": "address", "nodeType": "ElementaryTypeName", "src": "2197:7:18", @@ -3247,10 +3247,10 @@ }, { "constant": false, - "id": 3144, + "id": 3196, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2210:11:18", "stateVariable": false, "storageLocation": "default", @@ -3259,7 +3259,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3143, + "id": 3195, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2210:7:18", @@ -3275,42 +3275,42 @@ "src": "2183:39:18" }, "returnParameters": { - "id": 3146, + "id": 3198, "nodeType": "ParameterList", "parameters": [], "src": "2230:0:18" }, - "scope": 3163, + "scope": 3215, "src": "2168:136:18", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3196, + "scope": 3248, "src": "1048:1259:18" }, { "baseContracts": [], "contractDependencies": [ - 3163 + 3215 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3195, + "id": 3247, "linearizedBaseContracts": [ - 3195 + 3247 ], "name": "DSGuardFactory", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3167, + "id": 3219, "name": "isGuard", "nodeType": "VariableDeclaration", - "scope": 3195, + "scope": 3247, "src": "2339:42:18", "stateVariable": true, "storageLocation": "default", @@ -3319,9 +3319,9 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 3166, + "id": 3218, "keyType": { - "id": 3164, + "id": 3216, "name": "address", "nodeType": "ElementaryTypeName", "src": "2348:7:18", @@ -3337,7 +3337,7 @@ "typeString": "mapping(address => bool)" }, "valueType": { - "id": 3165, + "id": 3217, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2359:4:18", @@ -3352,28 +3352,28 @@ }, { "body": { - "id": 3193, + "id": 3245, "nodeType": "Block", "src": "2439:114:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3176, + "id": 3228, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3172, + "id": 3224, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2449:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -3384,7 +3384,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3174, + "id": 3226, "isConstant": false, "isLValue": false, "isPure": false, @@ -3392,23 +3392,23 @@ "nodeType": "NewExpression", "src": "2457:11:18", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuard_$3215_$", "typeString": "function () returns (contract DSGuard)" }, "typeName": { "contractScope": null, - "id": 3173, + "id": 3225, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2461:7:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } }, - "id": 3175, + "id": 3227, "isConstant": false, "isLValue": false, "isPure": false, @@ -3418,17 +3418,17 @@ "nodeType": "FunctionCall", "src": "2457:13:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, "src": "2449:21:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 3177, + "id": 3229, "nodeType": "ExpressionStatement", "src": "2449:21:18" }, @@ -3440,18 +3440,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3181, + "id": 3233, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "2495:3:18", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3182, + "id": 3234, "isConstant": false, "isLValue": false, "isPure": false, @@ -3475,32 +3475,32 @@ ], "expression": { "argumentTypes": null, - "id": 3178, + "id": 3230, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2480:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 3180, + "id": 3232, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "2480:14:18", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 3183, + "id": 3235, "isConstant": false, "isLValue": false, "isPure": false, @@ -3514,14 +3514,14 @@ "typeString": "tuple()" } }, - "id": 3184, + "id": 3236, "nodeType": "ExpressionStatement", "src": "2480:26:18" }, { "expression": { "argumentTypes": null, - "id": 3191, + "id": 3243, "isConstant": false, "isLValue": false, "isPure": false, @@ -3530,31 +3530,31 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3185, + "id": 3237, "name": "isGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3167, + "referencedDeclaration": 3219, "src": "2516:7:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 3189, + "id": 3241, "indexExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3187, + "id": 3239, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2532:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } @@ -3562,11 +3562,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } ], - "id": 3186, + "id": 3238, "isConstant": false, "isLValue": false, "isPure": true, @@ -3579,7 +3579,7 @@ }, "typeName": "address" }, - "id": 3188, + "id": 3240, "isConstant": false, "isLValue": false, "isPure": false, @@ -3609,7 +3609,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3190, + "id": 3242, "isConstant": false, "isLValue": false, "isPure": true, @@ -3630,51 +3630,51 @@ "typeString": "bool" } }, - "id": 3192, + "id": 3244, "nodeType": "ExpressionStatement", "src": "2516:30:18" } ] }, "documentation": null, - "id": 3194, + "id": 3246, "implemented": true, "kind": "function", "modifiers": [], "name": "newGuard", "nodeType": "FunctionDefinition", "parameters": { - "id": 3168, + "id": 3220, "nodeType": "ParameterList", "parameters": [], "src": "2405:2:18" }, "returnParameters": { - "id": 3171, + "id": 3223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3170, + "id": 3222, "name": "guard", "nodeType": "VariableDeclaration", - "scope": 3194, + "scope": 3246, "src": "2424:13:18", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" }, "typeName": { "contractScope": null, - "id": 3169, + "id": 3221, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2424:7:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -3684,14 +3684,14 @@ ], "src": "2423:15:18" }, - "scope": 3195, + "scope": 3247, "src": "2388:165:18", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3196, + "scope": 3248, "src": "2309:246:18" } ], @@ -3701,20 +3701,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "exportedSymbols": { "DSGuard": [ - 3163 + 3215 ], "DSGuardEvents": [ - 2944 + 2996 ], "DSGuardFactory": [ - 3195 + 3247 ] }, - "id": 3196, + "id": 3248, "nodeType": "SourceUnit", "nodes": [ { - "id": 2926, + "id": 2978, "literals": [ "solidity", "0.5", @@ -3726,10 +3726,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "file": "./Auth.sol", - "id": 2927, + "id": 2979, "nodeType": "ImportDirective", - "scope": 3196, - "sourceUnit": 2925, + "scope": 3248, + "sourceUnit": 2977, "src": "769:20:18", "symbolAliases": [], "unitAlias": "" @@ -3740,9 +3740,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 2944, + "id": 2996, "linearizedBaseContracts": [ - 2944 + 2996 ], "name": "DSGuardEvents", "nodeType": "ContractDefinition", @@ -3750,20 +3750,20 @@ { "anonymous": false, "documentation": null, - "id": 2935, + "id": 2987, "name": "LogPermit", "nodeType": "EventDefinition", "parameters": { - "id": 2934, + "id": 2986, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2929, + "id": 2981, "indexed": true, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "845:19:18", "stateVariable": false, "storageLocation": "default", @@ -3772,7 +3772,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2928, + "id": 2980, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "845:7:18", @@ -3786,11 +3786,11 @@ }, { "constant": false, - "id": 2931, + "id": 2983, "indexed": true, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "874:19:18", "stateVariable": false, "storageLocation": "default", @@ -3799,7 +3799,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2930, + "id": 2982, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "874:7:18", @@ -3813,11 +3813,11 @@ }, { "constant": false, - "id": 2933, + "id": 2985, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2935, + "scope": 2987, "src": "903:19:18", "stateVariable": false, "storageLocation": "default", @@ -3826,7 +3826,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2932, + "id": 2984, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "903:7:18", @@ -3846,20 +3846,20 @@ { "anonymous": false, "documentation": null, - "id": 2943, + "id": 2995, "name": "LogForbid", "nodeType": "EventDefinition", "parameters": { - "id": 2942, + "id": 2994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2937, + "id": 2989, "indexed": true, "name": "src", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "960:19:18", "stateVariable": false, "storageLocation": "default", @@ -3868,7 +3868,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2936, + "id": 2988, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "960:7:18", @@ -3882,11 +3882,11 @@ }, { "constant": false, - "id": 2939, + "id": 2991, "indexed": true, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "989:19:18", "stateVariable": false, "storageLocation": "default", @@ -3895,7 +3895,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2938, + "id": 2990, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "989:7:18", @@ -3909,11 +3909,11 @@ }, { "constant": false, - "id": 2941, + "id": 2993, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 2943, + "scope": 2995, "src": "1018:19:18", "stateVariable": false, "storageLocation": "default", @@ -3922,7 +3922,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2940, + "id": 2992, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1018:7:18", @@ -3940,7 +3940,7 @@ "src": "935:109:18" } ], - "scope": 3196, + "scope": 3248, "src": "791:255:18" }, { @@ -3949,17 +3949,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2945, + "id": 2997, "name": "DSAuth", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2924, + "referencedDeclaration": 2976, "src": "1068:6:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } }, - "id": 2946, + "id": 2998, "nodeType": "InheritanceSpecifier", "src": "1068:6:18" }, @@ -3967,17 +3967,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2947, + "id": 2999, "name": "DSAuthority", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2799, + "referencedDeclaration": 2851, "src": "1076:11:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } }, - "id": 2948, + "id": 3000, "nodeType": "InheritanceSpecifier", "src": "1076:11:18" }, @@ -3985,47 +3985,47 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2949, + "id": 3001, "name": "DSGuardEvents", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2944, + "referencedDeclaration": 2996, "src": "1089:13:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuardEvents_$2944", + "typeIdentifier": "t_contract$_DSGuardEvents_$2996", "typeString": "contract DSGuardEvents" } }, - "id": 2950, + "id": 3002, "nodeType": "InheritanceSpecifier", "src": "1089:13:18" } ], "contractDependencies": [ - 2799, - 2808, - 2924, - 2944 + 2851, + 2860, + 2976, + 2996 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3163, + "id": 3215, "linearizedBaseContracts": [ - 3163, - 2944, - 2799, - 2924, - 2808 + 3215, + 2996, + 2851, + 2976, + 2860 ], "name": "DSGuard", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 2958, + "id": 3010, "name": "ANY", "nodeType": "VariableDeclaration", - "scope": 3163, + "scope": 3215, "src": "1109:47:18", "stateVariable": true, "storageLocation": "default", @@ -4034,7 +4034,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2951, + "id": 3003, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1109:7:18", @@ -4051,7 +4051,7 @@ "arguments": [ { "argumentTypes": null, - "id": 2955, + "id": 3007, "isConstant": false, "isLValue": false, "isPure": true, @@ -4063,7 +4063,7 @@ "subExpression": { "argumentTypes": null, "hexValue": "31", - "id": 2954, + "id": 3006, "isConstant": false, "isLValue": false, "isPure": true, @@ -4091,7 +4091,7 @@ "typeString": "int_const -1" } ], - "id": 2953, + "id": 3005, "isConstant": false, "isLValue": false, "isPure": true, @@ -4104,7 +4104,7 @@ }, "typeName": "uint" }, - "id": 2956, + "id": 3008, "isConstant": false, "isLValue": false, "isPure": true, @@ -4126,7 +4126,7 @@ "typeString": "uint256" } ], - "id": 2952, + "id": 3004, "isConstant": false, "isLValue": false, "isPure": true, @@ -4139,7 +4139,7 @@ }, "typeName": "bytes32" }, - "id": 2957, + "id": 3009, "isConstant": false, "isLValue": false, "isPure": true, @@ -4157,10 +4157,10 @@ }, { "constant": false, - "id": 2966, + "id": 3018, "name": "acl", "nodeType": "VariableDeclaration", - "scope": 3163, + "scope": 3215, "src": "1163:71:18", "stateVariable": true, "storageLocation": "default", @@ -4169,9 +4169,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" }, "typeName": { - "id": 2965, + "id": 3017, "keyType": { - "id": 2959, + "id": 3011, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1172:7:18", @@ -4187,9 +4187,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" }, "valueType": { - "id": 2964, + "id": 3016, "keyType": { - "id": 2960, + "id": 3012, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1192:7:18", @@ -4205,9 +4205,9 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" }, "valueType": { - "id": 2963, + "id": 3015, "keyType": { - "id": 2961, + "id": 3013, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1212:7:18", @@ -4223,7 +4223,7 @@ "typeString": "mapping(bytes32 => bool)" }, "valueType": { - "id": 2962, + "id": 3014, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1223:4:18", @@ -4240,21 +4240,21 @@ }, { "body": { - "id": 3057, + "id": 3109, "nodeType": "Block", "src": "1339:373:18", "statements": [ { "assignments": [ - 2978 + 3030 ], "declarations": [ { "constant": false, - "id": 2978, + "id": 3030, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3057, + "scope": 3109, "src": "1349:11:18", "stateVariable": false, "storageLocation": "default", @@ -4263,7 +4263,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2977, + "id": 3029, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1349:7:18", @@ -4276,7 +4276,7 @@ "visibility": "internal" } ], - "id": 2984, + "id": 3036, "initialValue": { "argumentTypes": null, "arguments": [ @@ -4285,11 +4285,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2981, + "id": 3033, "name": "src_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2968, + "referencedDeclaration": 3020, "src": "1379:4:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4304,7 +4304,7 @@ "typeString": "address" } ], - "id": 2980, + "id": 3032, "isConstant": false, "isLValue": false, "isPure": true, @@ -4317,7 +4317,7 @@ }, "typeName": "bytes20" }, - "id": 2982, + "id": 3034, "isConstant": false, "isLValue": false, "isPure": false, @@ -4339,7 +4339,7 @@ "typeString": "bytes20" } ], - "id": 2979, + "id": 3031, "isConstant": false, "isLValue": false, "isPure": true, @@ -4352,7 +4352,7 @@ }, "typeName": "bytes32" }, - "id": 2983, + "id": 3035, "isConstant": false, "isLValue": false, "isPure": false, @@ -4371,15 +4371,15 @@ }, { "assignments": [ - 2986 + 3038 ], "declarations": [ { "constant": false, - "id": 2986, + "id": 3038, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3057, + "scope": 3109, "src": "1395:11:18", "stateVariable": false, "storageLocation": "default", @@ -4388,7 +4388,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 2985, + "id": 3037, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1395:7:18", @@ -4401,7 +4401,7 @@ "visibility": "internal" } ], - "id": 2992, + "id": 3044, "initialValue": { "argumentTypes": null, "arguments": [ @@ -4410,11 +4410,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2989, + "id": 3041, "name": "dst_", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2970, + "referencedDeclaration": 3022, "src": "1425:4:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4429,7 +4429,7 @@ "typeString": "address" } ], - "id": 2988, + "id": 3040, "isConstant": false, "isLValue": false, "isPure": true, @@ -4442,7 +4442,7 @@ }, "typeName": "bytes20" }, - "id": 2990, + "id": 3042, "isConstant": false, "isLValue": false, "isPure": false, @@ -4464,7 +4464,7 @@ "typeString": "bytes20" } ], - "id": 2987, + "id": 3039, "isConstant": false, "isLValue": false, "isPure": true, @@ -4477,7 +4477,7 @@ }, "typeName": "bytes32" }, - "id": 2991, + "id": 3043, "isConstant": false, "isLValue": false, "isPure": false, @@ -4501,7 +4501,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3055, + "id": 3107, "isConstant": false, "isLValue": false, "isPure": false, @@ -4512,7 +4512,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3047, + "id": 3099, "isConstant": false, "isLValue": false, "isPure": false, @@ -4523,7 +4523,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3039, + "id": 3091, "isConstant": false, "isLValue": false, "isPure": false, @@ -4534,7 +4534,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3031, + "id": 3083, "isConstant": false, "isLValue": false, "isPure": false, @@ -4545,7 +4545,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3023, + "id": 3075, "isConstant": false, "isLValue": false, "isPure": false, @@ -4556,7 +4556,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3015, + "id": 3067, "isConstant": false, "isLValue": false, "isPure": false, @@ -4567,7 +4567,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3007, + "id": 3059, "isConstant": false, "isLValue": false, "isPure": false, @@ -4580,25 +4580,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 2993, + "id": 3045, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1449:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 2995, + "id": 3047, "indexExpression": { "argumentTypes": null, - "id": 2994, + "id": 3046, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1453:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4616,14 +4616,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 2997, + "id": 3049, "indexExpression": { "argumentTypes": null, - "id": 2996, + "id": 3048, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1458:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4641,14 +4641,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 2999, + "id": 3051, "indexExpression": { "argumentTypes": null, - "id": 2998, + "id": 3050, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1463:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -4676,25 +4676,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3000, + "id": 3052, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1483:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3002, + "id": 3054, "indexExpression": { "argumentTypes": null, - "id": 3001, + "id": 3053, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1487:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4712,14 +4712,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3004, + "id": 3056, "indexExpression": { "argumentTypes": null, - "id": 3003, + "id": 3055, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1492:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4737,14 +4737,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3006, + "id": 3058, "indexExpression": { "argumentTypes": null, - "id": 3005, + "id": 3057, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1497:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4778,25 +4778,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3008, + "id": 3060, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1517:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3010, + "id": 3062, "indexExpression": { "argumentTypes": null, - "id": 3009, + "id": 3061, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1521:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4814,14 +4814,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3012, + "id": 3064, "indexExpression": { "argumentTypes": null, - "id": 3011, + "id": 3063, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1526:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4839,14 +4839,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3014, + "id": 3066, "indexExpression": { "argumentTypes": null, - "id": 3013, + "id": 3065, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1531:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -4880,25 +4880,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3016, + "id": 3068, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1551:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3018, + "id": 3070, "indexExpression": { "argumentTypes": null, - "id": 3017, + "id": 3069, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2978, + "referencedDeclaration": 3030, "src": "1555:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4916,14 +4916,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3020, + "id": 3072, "indexExpression": { "argumentTypes": null, - "id": 3019, + "id": 3071, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1560:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4941,14 +4941,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3022, + "id": 3074, "indexExpression": { "argumentTypes": null, - "id": 3021, + "id": 3073, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1565:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -4982,25 +4982,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3024, + "id": 3076, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1585:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3026, + "id": 3078, "indexExpression": { "argumentTypes": null, - "id": 3025, + "id": 3077, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1589:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5018,14 +5018,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3028, + "id": 3080, "indexExpression": { "argumentTypes": null, - "id": 3027, + "id": 3079, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1594:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5043,14 +5043,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3030, + "id": 3082, "indexExpression": { "argumentTypes": null, - "id": 3029, + "id": 3081, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1599:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -5084,25 +5084,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3032, + "id": 3084, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1619:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3034, + "id": 3086, "indexExpression": { "argumentTypes": null, - "id": 3033, + "id": 3085, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1623:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5120,14 +5120,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3036, + "id": 3088, "indexExpression": { "argumentTypes": null, - "id": 3035, + "id": 3087, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2986, + "referencedDeclaration": 3038, "src": "1628:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5145,14 +5145,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3038, + "id": 3090, "indexExpression": { "argumentTypes": null, - "id": 3037, + "id": 3089, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1633:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5186,25 +5186,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3040, + "id": 3092, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1653:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3042, + "id": 3094, "indexExpression": { "argumentTypes": null, - "id": 3041, + "id": 3093, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1657:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5222,14 +5222,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3044, + "id": 3096, "indexExpression": { "argumentTypes": null, - "id": 3043, + "id": 3095, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1662:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5247,14 +5247,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3046, + "id": 3098, "indexExpression": { "argumentTypes": null, - "id": 3045, + "id": 3097, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2972, + "referencedDeclaration": 3024, "src": "1667:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes4", @@ -5288,25 +5288,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3048, + "id": 3100, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1687:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3050, + "id": 3102, "indexExpression": { "argumentTypes": null, - "id": 3049, + "id": 3101, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1691:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5324,14 +5324,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3052, + "id": 3104, "indexExpression": { "argumentTypes": null, - "id": 3051, + "id": 3103, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1696:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5349,14 +5349,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3054, + "id": 3106, "indexExpression": { "argumentTypes": null, - "id": 3053, + "id": 3105, "name": "ANY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1701:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5380,30 +5380,30 @@ "typeString": "bool" } }, - "functionReturnParameters": 2976, - "id": 3056, + "functionReturnParameters": 3028, + "id": 3108, "nodeType": "Return", "src": "1442:263:18" } ] }, "documentation": null, - "id": 3058, + "id": 3110, "implemented": true, "kind": "function", "modifiers": [], "name": "canCall", "nodeType": "FunctionDefinition", "parameters": { - "id": 2973, + "id": 3025, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2968, + "id": 3020, "name": "src_", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1267:12:18", "stateVariable": false, "storageLocation": "default", @@ -5412,7 +5412,7 @@ "typeString": "address" }, "typeName": { - "id": 2967, + "id": 3019, "name": "address", "nodeType": "ElementaryTypeName", "src": "1267:7:18", @@ -5427,10 +5427,10 @@ }, { "constant": false, - "id": 2970, + "id": 3022, "name": "dst_", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1281:12:18", "stateVariable": false, "storageLocation": "default", @@ -5439,7 +5439,7 @@ "typeString": "address" }, "typeName": { - "id": 2969, + "id": 3021, "name": "address", "nodeType": "ElementaryTypeName", "src": "1281:7:18", @@ -5454,10 +5454,10 @@ }, { "constant": false, - "id": 2972, + "id": 3024, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1295:10:18", "stateVariable": false, "storageLocation": "default", @@ -5466,7 +5466,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 2971, + "id": 3023, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "1295:6:18", @@ -5482,15 +5482,15 @@ "src": "1257:54:18" }, "returnParameters": { - "id": 2976, + "id": 3028, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2975, + "id": 3027, "name": "", "nodeType": "VariableDeclaration", - "scope": 3058, + "scope": 3110, "src": "1333:4:18", "stateVariable": false, "storageLocation": "default", @@ -5499,7 +5499,7 @@ "typeString": "bool" }, "typeName": { - "id": 2974, + "id": 3026, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1333:4:18", @@ -5514,22 +5514,22 @@ ], "src": "1332:6:18" }, - "scope": 3163, + "scope": 3215, "src": "1241:471:18", "stateMutability": "view", - "superFunction": 2798, + "superFunction": 2850, "visibility": "public" }, { "body": { - "id": 3085, + "id": 3137, "nodeType": "Block", "src": "1785:81:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3077, + "id": 3129, "isConstant": false, "isLValue": false, "isPure": false, @@ -5542,25 +5542,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3069, + "id": 3121, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1795:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3073, + "id": 3125, "indexExpression": { "argumentTypes": null, - "id": 3070, + "id": 3122, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3060, + "referencedDeclaration": 3112, "src": "1799:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5578,14 +5578,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3074, + "id": 3126, "indexExpression": { "argumentTypes": null, - "id": 3071, + "id": 3123, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3062, + "referencedDeclaration": 3114, "src": "1804:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5603,14 +5603,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3075, + "id": 3127, "indexExpression": { "argumentTypes": null, - "id": 3072, + "id": 3124, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3064, + "referencedDeclaration": 3116, "src": "1809:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5633,7 +5633,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3076, + "id": 3128, "isConstant": false, "isLValue": false, "isPure": true, @@ -5654,7 +5654,7 @@ "typeString": "bool" } }, - "id": 3078, + "id": 3130, "nodeType": "ExpressionStatement", "src": "1795:25:18" }, @@ -5664,11 +5664,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3080, + "id": 3132, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3060, + "referencedDeclaration": 3112, "src": "1845:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5677,11 +5677,11 @@ }, { "argumentTypes": null, - "id": 3081, + "id": 3133, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3062, + "referencedDeclaration": 3114, "src": "1850:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5690,11 +5690,11 @@ }, { "argumentTypes": null, - "id": 3082, + "id": 3134, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3064, + "referencedDeclaration": 3116, "src": "1855:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5717,18 +5717,18 @@ "typeString": "bytes32" } ], - "id": 3079, + "id": 3131, "name": "LogPermit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2935, + "referencedDeclaration": 2987, "src": "1835:9:18", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3083, + "id": 3135, "isConstant": false, "isLValue": false, "isPure": false, @@ -5742,27 +5742,27 @@ "typeString": "tuple()" } }, - "id": 3084, + "id": 3136, "nodeType": "EmitStatement", "src": "1830:29:18" } ] }, "documentation": null, - "id": 3086, + "id": 3138, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3067, + "id": 3119, "modifierName": { "argumentTypes": null, - "id": 3066, + "id": 3118, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1780:4:18", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -5776,15 +5776,15 @@ "name": "permit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3065, + "id": 3117, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3060, + "id": 3112, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1734:11:18", "stateVariable": false, "storageLocation": "default", @@ -5793,7 +5793,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3059, + "id": 3111, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1734:7:18", @@ -5807,10 +5807,10 @@ }, { "constant": false, - "id": 3062, + "id": 3114, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1747:11:18", "stateVariable": false, "storageLocation": "default", @@ -5819,7 +5819,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3061, + "id": 3113, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1747:7:18", @@ -5833,10 +5833,10 @@ }, { "constant": false, - "id": 3064, + "id": 3116, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3086, + "scope": 3138, "src": "1760:11:18", "stateVariable": false, "storageLocation": "default", @@ -5845,7 +5845,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3063, + "id": 3115, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1760:7:18", @@ -5861,12 +5861,12 @@ "src": "1733:39:18" }, "returnParameters": { - "id": 3068, + "id": 3120, "nodeType": "ParameterList", "parameters": [], "src": "1785:0:18" }, - "scope": 3163, + "scope": 3215, "src": "1718:148:18", "stateMutability": "nonpayable", "superFunction": null, @@ -5874,14 +5874,14 @@ }, { "body": { - "id": 3113, + "id": 3165, "nodeType": "Block", "src": "1939:82:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3105, + "id": 3157, "isConstant": false, "isLValue": false, "isPure": false, @@ -5894,25 +5894,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3097, + "id": 3149, "name": "acl", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2966, + "referencedDeclaration": 3018, "src": "1949:3:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_mapping$_t_bytes32_$_t_bool_$_$_$", "typeString": "mapping(bytes32 => mapping(bytes32 => mapping(bytes32 => bool)))" } }, - "id": 3101, + "id": 3153, "indexExpression": { "argumentTypes": null, - "id": 3098, + "id": 3150, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3088, + "referencedDeclaration": 3140, "src": "1953:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5930,14 +5930,14 @@ "typeString": "mapping(bytes32 => mapping(bytes32 => bool))" } }, - "id": 3102, + "id": 3154, "indexExpression": { "argumentTypes": null, - "id": 3099, + "id": 3151, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3090, + "referencedDeclaration": 3142, "src": "1958:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5955,14 +5955,14 @@ "typeString": "mapping(bytes32 => bool)" } }, - "id": 3103, + "id": 3155, "indexExpression": { "argumentTypes": null, - "id": 3100, + "id": 3152, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3092, + "referencedDeclaration": 3144, "src": "1963:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -5985,7 +5985,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "66616c7365", - "id": 3104, + "id": 3156, "isConstant": false, "isLValue": false, "isPure": true, @@ -6006,7 +6006,7 @@ "typeString": "bool" } }, - "id": 3106, + "id": 3158, "nodeType": "ExpressionStatement", "src": "1949:26:18" }, @@ -6016,11 +6016,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3108, + "id": 3160, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3088, + "referencedDeclaration": 3140, "src": "2000:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6029,11 +6029,11 @@ }, { "argumentTypes": null, - "id": 3109, + "id": 3161, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3090, + "referencedDeclaration": 3142, "src": "2005:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6042,11 +6042,11 @@ }, { "argumentTypes": null, - "id": 3110, + "id": 3162, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3092, + "referencedDeclaration": 3144, "src": "2010:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6069,18 +6069,18 @@ "typeString": "bytes32" } ], - "id": 3107, + "id": 3159, "name": "LogForbid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2943, + "referencedDeclaration": 2995, "src": "1990:9:18", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3111, + "id": 3163, "isConstant": false, "isLValue": false, "isPure": false, @@ -6094,27 +6094,27 @@ "typeString": "tuple()" } }, - "id": 3112, + "id": 3164, "nodeType": "EmitStatement", "src": "1985:29:18" } ] }, "documentation": null, - "id": 3114, + "id": 3166, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3095, + "id": 3147, "modifierName": { "argumentTypes": null, - "id": 3094, + "id": 3146, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1934:4:18", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -6128,15 +6128,15 @@ "name": "forbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 3093, + "id": 3145, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3088, + "id": 3140, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1888:11:18", "stateVariable": false, "storageLocation": "default", @@ -6145,7 +6145,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3087, + "id": 3139, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1888:7:18", @@ -6159,10 +6159,10 @@ }, { "constant": false, - "id": 3090, + "id": 3142, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1901:11:18", "stateVariable": false, "storageLocation": "default", @@ -6171,7 +6171,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3089, + "id": 3141, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1901:7:18", @@ -6185,10 +6185,10 @@ }, { "constant": false, - "id": 3092, + "id": 3144, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3114, + "scope": 3166, "src": "1914:11:18", "stateVariable": false, "storageLocation": "default", @@ -6197,7 +6197,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3091, + "id": 3143, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1914:7:18", @@ -6213,12 +6213,12 @@ "src": "1887:39:18" }, "returnParameters": { - "id": 3096, + "id": 3148, "nodeType": "ParameterList", "parameters": [], "src": "1939:0:18" }, - "scope": 3163, + "scope": 3215, "src": "1872:149:18", "stateMutability": "nonpayable", "superFunction": null, @@ -6226,7 +6226,7 @@ }, { "body": { - "id": 3137, + "id": 3189, "nodeType": "Block", "src": "2089:74:18", "statements": [ @@ -6242,11 +6242,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3126, + "id": 3178, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3116, + "referencedDeclaration": 3168, "src": "2122:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6261,7 +6261,7 @@ "typeString": "address" } ], - "id": 3125, + "id": 3177, "isConstant": false, "isLValue": false, "isPure": true, @@ -6274,7 +6274,7 @@ }, "typeName": "bytes20" }, - "id": 3127, + "id": 3179, "isConstant": false, "isLValue": false, "isPure": false, @@ -6296,7 +6296,7 @@ "typeString": "bytes20" } ], - "id": 3124, + "id": 3176, "isConstant": false, "isLValue": false, "isPure": true, @@ -6309,7 +6309,7 @@ }, "typeName": "bytes32" }, - "id": 3128, + "id": 3180, "isConstant": false, "isLValue": false, "isPure": false, @@ -6331,11 +6331,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3131, + "id": 3183, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3118, + "referencedDeclaration": 3170, "src": "2145:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6350,7 +6350,7 @@ "typeString": "address" } ], - "id": 3130, + "id": 3182, "isConstant": false, "isLValue": false, "isPure": true, @@ -6363,7 +6363,7 @@ }, "typeName": "bytes20" }, - "id": 3132, + "id": 3184, "isConstant": false, "isLValue": false, "isPure": false, @@ -6385,7 +6385,7 @@ "typeString": "bytes20" } ], - "id": 3129, + "id": 3181, "isConstant": false, "isLValue": false, "isPure": true, @@ -6398,7 +6398,7 @@ }, "typeName": "bytes32" }, - "id": 3133, + "id": 3185, "isConstant": false, "isLValue": false, "isPure": false, @@ -6414,11 +6414,11 @@ }, { "argumentTypes": null, - "id": 3134, + "id": 3186, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3120, + "referencedDeclaration": 3172, "src": "2152:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6441,21 +6441,21 @@ "typeString": "bytes32" } ], - "id": 3123, + "id": 3175, "name": "permit", "nodeType": "Identifier", "overloadedDeclarations": [ - 3086, - 3138 + 3138, + 3190 ], - "referencedDeclaration": 3086, + "referencedDeclaration": 3138, "src": "2099:6:18", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3135, + "id": 3187, "isConstant": false, "isLValue": false, "isPure": false, @@ -6469,29 +6469,29 @@ "typeString": "tuple()" } }, - "id": 3136, + "id": 3188, "nodeType": "ExpressionStatement", "src": "2099:57:18" } ] }, "documentation": null, - "id": 3138, + "id": 3190, "implemented": true, "kind": "function", "modifiers": [], "name": "permit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3121, + "id": 3173, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3116, + "id": 3168, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2043:11:18", "stateVariable": false, "storageLocation": "default", @@ -6500,7 +6500,7 @@ "typeString": "address" }, "typeName": { - "id": 3115, + "id": 3167, "name": "address", "nodeType": "ElementaryTypeName", "src": "2043:7:18", @@ -6515,10 +6515,10 @@ }, { "constant": false, - "id": 3118, + "id": 3170, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2056:11:18", "stateVariable": false, "storageLocation": "default", @@ -6527,7 +6527,7 @@ "typeString": "address" }, "typeName": { - "id": 3117, + "id": 3169, "name": "address", "nodeType": "ElementaryTypeName", "src": "2056:7:18", @@ -6542,10 +6542,10 @@ }, { "constant": false, - "id": 3120, + "id": 3172, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3138, + "scope": 3190, "src": "2069:11:18", "stateVariable": false, "storageLocation": "default", @@ -6554,7 +6554,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3119, + "id": 3171, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2069:7:18", @@ -6570,12 +6570,12 @@ "src": "2042:39:18" }, "returnParameters": { - "id": 3122, + "id": 3174, "nodeType": "ParameterList", "parameters": [], "src": "2089:0:18" }, - "scope": 3163, + "scope": 3215, "src": "2027:136:18", "stateMutability": "nonpayable", "superFunction": null, @@ -6583,7 +6583,7 @@ }, { "body": { - "id": 3161, + "id": 3213, "nodeType": "Block", "src": "2230:74:18", "statements": [ @@ -6599,11 +6599,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3150, + "id": 3202, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3140, + "referencedDeclaration": 3192, "src": "2263:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6618,7 +6618,7 @@ "typeString": "address" } ], - "id": 3149, + "id": 3201, "isConstant": false, "isLValue": false, "isPure": true, @@ -6631,7 +6631,7 @@ }, "typeName": "bytes20" }, - "id": 3151, + "id": 3203, "isConstant": false, "isLValue": false, "isPure": false, @@ -6653,7 +6653,7 @@ "typeString": "bytes20" } ], - "id": 3148, + "id": 3200, "isConstant": false, "isLValue": false, "isPure": true, @@ -6666,7 +6666,7 @@ }, "typeName": "bytes32" }, - "id": 3152, + "id": 3204, "isConstant": false, "isLValue": false, "isPure": false, @@ -6688,11 +6688,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3155, + "id": 3207, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3142, + "referencedDeclaration": 3194, "src": "2286:3:18", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6707,7 +6707,7 @@ "typeString": "address" } ], - "id": 3154, + "id": 3206, "isConstant": false, "isLValue": false, "isPure": true, @@ -6720,7 +6720,7 @@ }, "typeName": "bytes20" }, - "id": 3156, + "id": 3208, "isConstant": false, "isLValue": false, "isPure": false, @@ -6742,7 +6742,7 @@ "typeString": "bytes20" } ], - "id": 3153, + "id": 3205, "isConstant": false, "isLValue": false, "isPure": true, @@ -6755,7 +6755,7 @@ }, "typeName": "bytes32" }, - "id": 3157, + "id": 3209, "isConstant": false, "isLValue": false, "isPure": false, @@ -6771,11 +6771,11 @@ }, { "argumentTypes": null, - "id": 3158, + "id": 3210, "name": "sig", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3144, + "referencedDeclaration": 3196, "src": "2293:3:18", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6798,21 +6798,21 @@ "typeString": "bytes32" } ], - "id": 3147, + "id": 3199, "name": "forbid", "nodeType": "Identifier", "overloadedDeclarations": [ - 3114, - 3162 + 3166, + 3214 ], - "referencedDeclaration": 3114, + "referencedDeclaration": 3166, "src": "2240:6:18", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32)" } }, - "id": 3159, + "id": 3211, "isConstant": false, "isLValue": false, "isPure": false, @@ -6826,29 +6826,29 @@ "typeString": "tuple()" } }, - "id": 3160, + "id": 3212, "nodeType": "ExpressionStatement", "src": "2240:57:18" } ] }, "documentation": null, - "id": 3162, + "id": 3214, "implemented": true, "kind": "function", "modifiers": [], "name": "forbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 3145, + "id": 3197, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3140, + "id": 3192, "name": "src", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2184:11:18", "stateVariable": false, "storageLocation": "default", @@ -6857,7 +6857,7 @@ "typeString": "address" }, "typeName": { - "id": 3139, + "id": 3191, "name": "address", "nodeType": "ElementaryTypeName", "src": "2184:7:18", @@ -6872,10 +6872,10 @@ }, { "constant": false, - "id": 3142, + "id": 3194, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2197:11:18", "stateVariable": false, "storageLocation": "default", @@ -6884,7 +6884,7 @@ "typeString": "address" }, "typeName": { - "id": 3141, + "id": 3193, "name": "address", "nodeType": "ElementaryTypeName", "src": "2197:7:18", @@ -6899,10 +6899,10 @@ }, { "constant": false, - "id": 3144, + "id": 3196, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3162, + "scope": 3214, "src": "2210:11:18", "stateVariable": false, "storageLocation": "default", @@ -6911,7 +6911,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3143, + "id": 3195, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2210:7:18", @@ -6927,42 +6927,42 @@ "src": "2183:39:18" }, "returnParameters": { - "id": 3146, + "id": 3198, "nodeType": "ParameterList", "parameters": [], "src": "2230:0:18" }, - "scope": 3163, + "scope": 3215, "src": "2168:136:18", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3196, + "scope": 3248, "src": "1048:1259:18" }, { "baseContracts": [], "contractDependencies": [ - 3163 + 3215 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3195, + "id": 3247, "linearizedBaseContracts": [ - 3195 + 3247 ], "name": "DSGuardFactory", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3167, + "id": 3219, "name": "isGuard", "nodeType": "VariableDeclaration", - "scope": 3195, + "scope": 3247, "src": "2339:42:18", "stateVariable": true, "storageLocation": "default", @@ -6971,9 +6971,9 @@ "typeString": "mapping(address => bool)" }, "typeName": { - "id": 3166, + "id": 3218, "keyType": { - "id": 3164, + "id": 3216, "name": "address", "nodeType": "ElementaryTypeName", "src": "2348:7:18", @@ -6989,7 +6989,7 @@ "typeString": "mapping(address => bool)" }, "valueType": { - "id": 3165, + "id": 3217, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2359:4:18", @@ -7004,28 +7004,28 @@ }, { "body": { - "id": 3193, + "id": 3245, "nodeType": "Block", "src": "2439:114:18", "statements": [ { "expression": { "argumentTypes": null, - "id": 3176, + "id": 3228, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3172, + "id": 3224, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2449:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -7036,7 +7036,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3174, + "id": 3226, "isConstant": false, "isLValue": false, "isPure": false, @@ -7044,23 +7044,23 @@ "nodeType": "NewExpression", "src": "2457:11:18", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSGuard_$3215_$", "typeString": "function () returns (contract DSGuard)" }, "typeName": { "contractScope": null, - "id": 3173, + "id": 3225, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2461:7:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } }, - "id": 3175, + "id": 3227, "isConstant": false, "isLValue": false, "isPure": false, @@ -7070,17 +7070,17 @@ "nodeType": "FunctionCall", "src": "2457:13:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, "src": "2449:21:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 3177, + "id": 3229, "nodeType": "ExpressionStatement", "src": "2449:21:18" }, @@ -7092,18 +7092,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3181, + "id": 3233, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "2495:3:18", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3182, + "id": 3234, "isConstant": false, "isLValue": false, "isPure": false, @@ -7127,32 +7127,32 @@ ], "expression": { "argumentTypes": null, - "id": 3178, + "id": 3230, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2480:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 3180, + "id": 3232, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "2480:14:18", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 3183, + "id": 3235, "isConstant": false, "isLValue": false, "isPure": false, @@ -7166,14 +7166,14 @@ "typeString": "tuple()" } }, - "id": 3184, + "id": 3236, "nodeType": "ExpressionStatement", "src": "2480:26:18" }, { "expression": { "argumentTypes": null, - "id": 3191, + "id": 3243, "isConstant": false, "isLValue": false, "isPure": false, @@ -7182,31 +7182,31 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3185, + "id": 3237, "name": "isGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3167, + "referencedDeclaration": 3219, "src": "2516:7:18", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_bool_$", "typeString": "mapping(address => bool)" } }, - "id": 3189, + "id": 3241, "indexExpression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3187, + "id": 3239, "name": "guard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3170, + "referencedDeclaration": 3222, "src": "2532:5:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } } @@ -7214,11 +7214,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } ], - "id": 3186, + "id": 3238, "isConstant": false, "isLValue": false, "isPure": true, @@ -7231,7 +7231,7 @@ }, "typeName": "address" }, - "id": 3188, + "id": 3240, "isConstant": false, "isLValue": false, "isPure": false, @@ -7261,7 +7261,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 3190, + "id": 3242, "isConstant": false, "isLValue": false, "isPure": true, @@ -7282,51 +7282,51 @@ "typeString": "bool" } }, - "id": 3192, + "id": 3244, "nodeType": "ExpressionStatement", "src": "2516:30:18" } ] }, "documentation": null, - "id": 3194, + "id": 3246, "implemented": true, "kind": "function", "modifiers": [], "name": "newGuard", "nodeType": "FunctionDefinition", "parameters": { - "id": 3168, + "id": 3220, "nodeType": "ParameterList", "parameters": [], "src": "2405:2:18" }, "returnParameters": { - "id": 3171, + "id": 3223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3170, + "id": 3222, "name": "guard", "nodeType": "VariableDeclaration", - "scope": 3194, + "scope": 3246, "src": "2424:13:18", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" }, "typeName": { "contractScope": null, - "id": 3169, + "id": 3221, "name": "DSGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "2424:7:18", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, @@ -7336,14 +7336,14 @@ ], "src": "2423:15:18" }, - "scope": 3195, + "scope": 3247, "src": "2388:165:18", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3196, + "scope": 3248, "src": "2309:246:18" } ], @@ -7355,7 +7355,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.501Z", + "updatedAt": "2020-04-08T12:21:13.741Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DSMath.json b/packages/smart-contracts/artifacts/DSMath.json index 2bb0fad..0960708 100644 --- a/packages/smart-contracts/artifacts/DSMath.json +++ b/packages/smart-contracts/artifacts/DSMath.json @@ -12,14 +12,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Math.sol", "exportedSymbols": { "DSMath": [ - 3499 + 3551 ] }, - "id": 3500, + "id": 3552, "nodeType": "SourceUnit", "nodes": [ { - "id": 3197, + "id": 3249, "literals": [ "solidity", ">", @@ -35,16 +35,16 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3499, + "id": 3551, "linearizedBaseContracts": [ - 3499 + 3551 ], "name": "DSMath", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 3218, + "id": 3270, "nodeType": "Block", "src": "804:66:19", "statements": [ @@ -58,7 +58,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3214, + "id": 3266, "isConstant": false, "isLValue": false, "isPure": false, @@ -68,18 +68,18 @@ "components": [ { "argumentTypes": null, - "id": 3211, + "id": 3263, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3207, + "id": 3259, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3204, + "referencedDeclaration": 3256, "src": "823:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -94,18 +94,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3210, + "id": 3262, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3208, + "id": 3260, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3199, + "referencedDeclaration": 3251, "src": "827:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -116,11 +116,11 @@ "operator": "+", "rightExpression": { "argumentTypes": null, - "id": 3209, + "id": 3261, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3201, + "referencedDeclaration": 3253, "src": "831:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -140,7 +140,7 @@ } } ], - "id": 3212, + "id": 3264, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -157,11 +157,11 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 3213, + "id": 3265, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3199, + "referencedDeclaration": 3251, "src": "837:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -177,7 +177,7 @@ { "argumentTypes": null, "hexValue": "64732d6d6174682d6164642d6f766572666c6f77", - "id": 3215, + "id": 3267, "isConstant": false, "isLValue": false, "isPure": true, @@ -204,21 +204,21 @@ "typeString": "literal_string \"ds-math-add-overflow\"" } ], - "id": 3206, + "id": 3258, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "814:7:19", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3216, + "id": 3268, "isConstant": false, "isLValue": false, "isPure": false, @@ -232,29 +232,29 @@ "typeString": "tuple()" } }, - "id": 3217, + "id": 3269, "nodeType": "ExpressionStatement", "src": "814:49:19" } ] }, "documentation": null, - "id": 3219, + "id": 3271, "implemented": true, "kind": "function", "modifiers": [], "name": "add", "nodeType": "FunctionDefinition", "parameters": { - "id": 3202, + "id": 3254, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3199, + "id": 3251, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3219, + "scope": 3271, "src": "757:6:19", "stateVariable": false, "storageLocation": "default", @@ -263,7 +263,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3198, + "id": 3250, "name": "uint", "nodeType": "ElementaryTypeName", "src": "757:4:19", @@ -277,10 +277,10 @@ }, { "constant": false, - "id": 3201, + "id": 3253, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3219, + "scope": 3271, "src": "765:6:19", "stateVariable": false, "storageLocation": "default", @@ -289,7 +289,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3200, + "id": 3252, "name": "uint", "nodeType": "ElementaryTypeName", "src": "765:4:19", @@ -305,15 +305,15 @@ "src": "756:16:19" }, "returnParameters": { - "id": 3205, + "id": 3257, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3204, + "id": 3256, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3219, + "scope": 3271, "src": "796:6:19", "stateVariable": false, "storageLocation": "default", @@ -322,7 +322,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3203, + "id": 3255, "name": "uint", "nodeType": "ElementaryTypeName", "src": "796:4:19", @@ -337,7 +337,7 @@ ], "src": "795:8:19" }, - "scope": 3499, + "scope": 3551, "src": "744:126:19", "stateMutability": "pure", "superFunction": null, @@ -345,7 +345,7 @@ }, { "body": { - "id": 3240, + "id": 3292, "nodeType": "Block", "src": "935:67:19", "statements": [ @@ -359,7 +359,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3236, + "id": 3288, "isConstant": false, "isLValue": false, "isPure": false, @@ -369,18 +369,18 @@ "components": [ { "argumentTypes": null, - "id": 3233, + "id": 3285, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3229, + "id": 3281, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3226, + "referencedDeclaration": 3278, "src": "954:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -395,18 +395,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3232, + "id": 3284, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3230, + "id": 3282, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3221, + "referencedDeclaration": 3273, "src": "958:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -417,11 +417,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 3231, + "id": 3283, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3223, + "referencedDeclaration": 3275, "src": "962:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -441,7 +441,7 @@ } } ], - "id": 3234, + "id": 3286, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -458,11 +458,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 3235, + "id": 3287, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3221, + "referencedDeclaration": 3273, "src": "968:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -478,7 +478,7 @@ { "argumentTypes": null, "hexValue": "64732d6d6174682d7375622d756e646572666c6f77", - "id": 3237, + "id": 3289, "isConstant": false, "isLValue": false, "isPure": true, @@ -505,21 +505,21 @@ "typeString": "literal_string \"ds-math-sub-underflow\"" } ], - "id": 3228, + "id": 3280, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "945:7:19", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3238, + "id": 3290, "isConstant": false, "isLValue": false, "isPure": false, @@ -533,29 +533,29 @@ "typeString": "tuple()" } }, - "id": 3239, + "id": 3291, "nodeType": "ExpressionStatement", "src": "945:50:19" } ] }, "documentation": null, - "id": 3241, + "id": 3293, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 3224, + "id": 3276, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3221, + "id": 3273, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3241, + "scope": 3293, "src": "888:6:19", "stateVariable": false, "storageLocation": "default", @@ -564,7 +564,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3220, + "id": 3272, "name": "uint", "nodeType": "ElementaryTypeName", "src": "888:4:19", @@ -578,10 +578,10 @@ }, { "constant": false, - "id": 3223, + "id": 3275, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3241, + "scope": 3293, "src": "896:6:19", "stateVariable": false, "storageLocation": "default", @@ -590,7 +590,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3222, + "id": 3274, "name": "uint", "nodeType": "ElementaryTypeName", "src": "896:4:19", @@ -606,15 +606,15 @@ "src": "887:16:19" }, "returnParameters": { - "id": 3227, + "id": 3279, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3226, + "id": 3278, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3241, + "scope": 3293, "src": "927:6:19", "stateVariable": false, "storageLocation": "default", @@ -623,7 +623,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3225, + "id": 3277, "name": "uint", "nodeType": "ElementaryTypeName", "src": "927:4:19", @@ -638,7 +638,7 @@ ], "src": "926:8:19" }, - "scope": 3499, + "scope": 3551, "src": "875:127:19", "stateMutability": "pure", "superFunction": null, @@ -646,7 +646,7 @@ }, { "body": { - "id": 3268, + "id": 3320, "nodeType": "Block", "src": "1067:80:19", "statements": [ @@ -660,7 +660,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3264, + "id": 3316, "isConstant": false, "isLValue": false, "isPure": false, @@ -671,18 +671,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3253, + "id": 3305, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3251, + "id": 3303, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3245, + "referencedDeclaration": 3297, "src": "1085:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -694,7 +694,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3252, + "id": 3304, "isConstant": false, "isLValue": false, "isPure": true, @@ -723,7 +723,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3263, + "id": 3315, "isConstant": false, "isLValue": false, "isPure": false, @@ -734,7 +734,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3261, + "id": 3313, "isConstant": false, "isLValue": false, "isPure": false, @@ -744,18 +744,18 @@ "components": [ { "argumentTypes": null, - "id": 3258, + "id": 3310, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3254, + "id": 3306, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3248, + "referencedDeclaration": 3300, "src": "1096:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -770,18 +770,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3257, + "id": 3309, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3255, + "id": 3307, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3243, + "referencedDeclaration": 3295, "src": "1100:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -792,11 +792,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 3256, + "id": 3308, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3245, + "referencedDeclaration": 3297, "src": "1104:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -816,7 +816,7 @@ } } ], - "id": 3259, + "id": 3311, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -833,11 +833,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3260, + "id": 3312, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3245, + "referencedDeclaration": 3297, "src": "1109:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -854,11 +854,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 3262, + "id": 3314, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3243, + "referencedDeclaration": 3295, "src": "1114:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -880,7 +880,7 @@ { "argumentTypes": null, "hexValue": "64732d6d6174682d6d756c2d6f766572666c6f77", - "id": 3265, + "id": 3317, "isConstant": false, "isLValue": false, "isPure": true, @@ -907,21 +907,21 @@ "typeString": "literal_string \"ds-math-mul-overflow\"" } ], - "id": 3250, + "id": 3302, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1077:7:19", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3266, + "id": 3318, "isConstant": false, "isLValue": false, "isPure": false, @@ -935,29 +935,29 @@ "typeString": "tuple()" } }, - "id": 3267, + "id": 3319, "nodeType": "ExpressionStatement", "src": "1077:63:19" } ] }, "documentation": null, - "id": 3269, + "id": 3321, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 3246, + "id": 3298, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3243, + "id": 3295, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3269, + "scope": 3321, "src": "1020:6:19", "stateVariable": false, "storageLocation": "default", @@ -966,7 +966,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3242, + "id": 3294, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1020:4:19", @@ -980,10 +980,10 @@ }, { "constant": false, - "id": 3245, + "id": 3297, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3269, + "scope": 3321, "src": "1028:6:19", "stateVariable": false, "storageLocation": "default", @@ -992,7 +992,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3244, + "id": 3296, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1028:4:19", @@ -1008,15 +1008,15 @@ "src": "1019:16:19" }, "returnParameters": { - "id": 3249, + "id": 3301, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3248, + "id": 3300, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3269, + "scope": 3321, "src": "1059:6:19", "stateVariable": false, "storageLocation": "default", @@ -1025,7 +1025,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3247, + "id": 3299, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1059:4:19", @@ -1040,7 +1040,7 @@ ], "src": "1058:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1007:140:19", "stateMutability": "pure", "superFunction": null, @@ -1048,7 +1048,7 @@ }, { "body": { - "id": 3285, + "id": 3337, "nodeType": "Block", "src": "1213:38:19", "statements": [ @@ -1061,18 +1061,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3280, + "id": 3332, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3278, + "id": 3330, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3271, + "referencedDeclaration": 3323, "src": "1230:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1083,11 +1083,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 3279, + "id": 3331, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3273, + "referencedDeclaration": 3325, "src": "1235:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1102,18 +1102,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 3282, + "id": 3334, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3273, + "referencedDeclaration": 3325, "src": "1243:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3283, + "id": 3335, "isConstant": false, "isLValue": false, "isPure": false, @@ -1122,11 +1122,11 @@ "src": "1230:14:19", "trueExpression": { "argumentTypes": null, - "id": 3281, + "id": 3333, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3271, + "referencedDeclaration": 3323, "src": "1239:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1138,30 +1138,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 3277, - "id": 3284, + "functionReturnParameters": 3329, + "id": 3336, "nodeType": "Return", "src": "1223:21:19" } ] }, "documentation": null, - "id": 3286, + "id": 3338, "implemented": true, "kind": "function", "modifiers": [], "name": "min", "nodeType": "FunctionDefinition", "parameters": { - "id": 3274, + "id": 3326, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3271, + "id": 3323, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3286, + "scope": 3338, "src": "1166:6:19", "stateVariable": false, "storageLocation": "default", @@ -1170,7 +1170,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3270, + "id": 3322, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1166:4:19", @@ -1184,10 +1184,10 @@ }, { "constant": false, - "id": 3273, + "id": 3325, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3286, + "scope": 3338, "src": "1174:6:19", "stateVariable": false, "storageLocation": "default", @@ -1196,7 +1196,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3272, + "id": 3324, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1174:4:19", @@ -1212,15 +1212,15 @@ "src": "1165:16:19" }, "returnParameters": { - "id": 3277, + "id": 3329, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3276, + "id": 3328, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3286, + "scope": 3338, "src": "1205:6:19", "stateVariable": false, "storageLocation": "default", @@ -1229,7 +1229,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3275, + "id": 3327, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1205:4:19", @@ -1244,7 +1244,7 @@ ], "src": "1204:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1153:98:19", "stateMutability": "pure", "superFunction": null, @@ -1252,7 +1252,7 @@ }, { "body": { - "id": 3302, + "id": 3354, "nodeType": "Block", "src": "1316:38:19", "statements": [ @@ -1265,18 +1265,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3297, + "id": 3349, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3295, + "id": 3347, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3288, + "referencedDeclaration": 3340, "src": "1333:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1287,11 +1287,11 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 3296, + "id": 3348, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3290, + "referencedDeclaration": 3342, "src": "1338:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1306,18 +1306,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 3299, + "id": 3351, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3290, + "referencedDeclaration": 3342, "src": "1346:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3300, + "id": 3352, "isConstant": false, "isLValue": false, "isPure": false, @@ -1326,11 +1326,11 @@ "src": "1333:14:19", "trueExpression": { "argumentTypes": null, - "id": 3298, + "id": 3350, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3288, + "referencedDeclaration": 3340, "src": "1342:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1342,30 +1342,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 3294, - "id": 3301, + "functionReturnParameters": 3346, + "id": 3353, "nodeType": "Return", "src": "1326:21:19" } ] }, "documentation": null, - "id": 3303, + "id": 3355, "implemented": true, "kind": "function", "modifiers": [], "name": "max", "nodeType": "FunctionDefinition", "parameters": { - "id": 3291, + "id": 3343, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3288, + "id": 3340, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3303, + "scope": 3355, "src": "1269:6:19", "stateVariable": false, "storageLocation": "default", @@ -1374,7 +1374,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3287, + "id": 3339, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1269:4:19", @@ -1388,10 +1388,10 @@ }, { "constant": false, - "id": 3290, + "id": 3342, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3303, + "scope": 3355, "src": "1277:6:19", "stateVariable": false, "storageLocation": "default", @@ -1400,7 +1400,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3289, + "id": 3341, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1277:4:19", @@ -1416,15 +1416,15 @@ "src": "1268:16:19" }, "returnParameters": { - "id": 3294, + "id": 3346, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3293, + "id": 3345, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3303, + "scope": 3355, "src": "1308:6:19", "stateVariable": false, "storageLocation": "default", @@ -1433,7 +1433,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3292, + "id": 3344, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1308:4:19", @@ -1448,7 +1448,7 @@ ], "src": "1307:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1256:98:19", "stateMutability": "pure", "superFunction": null, @@ -1456,7 +1456,7 @@ }, { "body": { - "id": 3319, + "id": 3371, "nodeType": "Block", "src": "1417:38:19", "statements": [ @@ -1469,18 +1469,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 3314, + "id": 3366, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3312, + "id": 3364, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3305, + "referencedDeclaration": 3357, "src": "1434:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -1491,11 +1491,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 3313, + "id": 3365, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3307, + "referencedDeclaration": 3359, "src": "1439:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -1510,18 +1510,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 3316, + "id": 3368, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3307, + "referencedDeclaration": 3359, "src": "1447:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 3317, + "id": 3369, "isConstant": false, "isLValue": false, "isPure": false, @@ -1530,11 +1530,11 @@ "src": "1434:14:19", "trueExpression": { "argumentTypes": null, - "id": 3315, + "id": 3367, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3305, + "referencedDeclaration": 3357, "src": "1443:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -1546,30 +1546,30 @@ "typeString": "int256" } }, - "functionReturnParameters": 3311, - "id": 3318, + "functionReturnParameters": 3363, + "id": 3370, "nodeType": "Return", "src": "1427:21:19" } ] }, "documentation": null, - "id": 3320, + "id": 3372, "implemented": true, "kind": "function", "modifiers": [], "name": "imin", "nodeType": "FunctionDefinition", "parameters": { - "id": 3308, + "id": 3360, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3305, + "id": 3357, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3320, + "scope": 3372, "src": "1373:5:19", "stateVariable": false, "storageLocation": "default", @@ -1578,7 +1578,7 @@ "typeString": "int256" }, "typeName": { - "id": 3304, + "id": 3356, "name": "int", "nodeType": "ElementaryTypeName", "src": "1373:3:19", @@ -1592,10 +1592,10 @@ }, { "constant": false, - "id": 3307, + "id": 3359, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3320, + "scope": 3372, "src": "1380:5:19", "stateVariable": false, "storageLocation": "default", @@ -1604,7 +1604,7 @@ "typeString": "int256" }, "typeName": { - "id": 3306, + "id": 3358, "name": "int", "nodeType": "ElementaryTypeName", "src": "1380:3:19", @@ -1620,15 +1620,15 @@ "src": "1372:14:19" }, "returnParameters": { - "id": 3311, + "id": 3363, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3310, + "id": 3362, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3320, + "scope": 3372, "src": "1410:5:19", "stateVariable": false, "storageLocation": "default", @@ -1637,7 +1637,7 @@ "typeString": "int256" }, "typeName": { - "id": 3309, + "id": 3361, "name": "int", "nodeType": "ElementaryTypeName", "src": "1410:3:19", @@ -1652,7 +1652,7 @@ ], "src": "1409:7:19" }, - "scope": 3499, + "scope": 3551, "src": "1359:96:19", "stateMutability": "pure", "superFunction": null, @@ -1660,7 +1660,7 @@ }, { "body": { - "id": 3336, + "id": 3388, "nodeType": "Block", "src": "1518:38:19", "statements": [ @@ -1673,18 +1673,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 3331, + "id": 3383, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3329, + "id": 3381, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3322, + "referencedDeclaration": 3374, "src": "1535:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -1695,11 +1695,11 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 3330, + "id": 3382, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3324, + "referencedDeclaration": 3376, "src": "1540:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -1714,18 +1714,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 3333, + "id": 3385, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3324, + "referencedDeclaration": 3376, "src": "1548:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 3334, + "id": 3386, "isConstant": false, "isLValue": false, "isPure": false, @@ -1734,11 +1734,11 @@ "src": "1535:14:19", "trueExpression": { "argumentTypes": null, - "id": 3332, + "id": 3384, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3322, + "referencedDeclaration": 3374, "src": "1544:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -1750,30 +1750,30 @@ "typeString": "int256" } }, - "functionReturnParameters": 3328, - "id": 3335, + "functionReturnParameters": 3380, + "id": 3387, "nodeType": "Return", "src": "1528:21:19" } ] }, "documentation": null, - "id": 3337, + "id": 3389, "implemented": true, "kind": "function", "modifiers": [], "name": "imax", "nodeType": "FunctionDefinition", "parameters": { - "id": 3325, + "id": 3377, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3322, + "id": 3374, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3337, + "scope": 3389, "src": "1474:5:19", "stateVariable": false, "storageLocation": "default", @@ -1782,7 +1782,7 @@ "typeString": "int256" }, "typeName": { - "id": 3321, + "id": 3373, "name": "int", "nodeType": "ElementaryTypeName", "src": "1474:3:19", @@ -1796,10 +1796,10 @@ }, { "constant": false, - "id": 3324, + "id": 3376, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3337, + "scope": 3389, "src": "1481:5:19", "stateVariable": false, "storageLocation": "default", @@ -1808,7 +1808,7 @@ "typeString": "int256" }, "typeName": { - "id": 3323, + "id": 3375, "name": "int", "nodeType": "ElementaryTypeName", "src": "1481:3:19", @@ -1824,15 +1824,15 @@ "src": "1473:14:19" }, "returnParameters": { - "id": 3328, + "id": 3380, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3327, + "id": 3379, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3337, + "scope": 3389, "src": "1511:5:19", "stateVariable": false, "storageLocation": "default", @@ -1841,7 +1841,7 @@ "typeString": "int256" }, "typeName": { - "id": 3326, + "id": 3378, "name": "int", "nodeType": "ElementaryTypeName", "src": "1511:3:19", @@ -1856,7 +1856,7 @@ ], "src": "1510:7:19" }, - "scope": 3499, + "scope": 3551, "src": "1460:96:19", "stateMutability": "pure", "superFunction": null, @@ -1864,10 +1864,10 @@ }, { "constant": true, - "id": 3342, + "id": 3394, "name": "WAD", "nodeType": "VariableDeclaration", - "scope": 3499, + "scope": 3551, "src": "1562:28:19", "stateVariable": true, "storageLocation": "default", @@ -1876,7 +1876,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3338, + "id": 3390, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1562:4:19", @@ -1891,7 +1891,7 @@ "typeIdentifier": "t_rational_1000000000000000000_by_1", "typeString": "int_const 1000000000000000000" }, - "id": 3341, + "id": 3393, "isConstant": false, "isLValue": false, "isPure": true, @@ -1899,7 +1899,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 3339, + "id": 3391, "isConstant": false, "isLValue": false, "isPure": true, @@ -1919,7 +1919,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 3340, + "id": 3392, "isConstant": false, "isLValue": false, "isPure": true, @@ -1944,10 +1944,10 @@ }, { "constant": true, - "id": 3347, + "id": 3399, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 3499, + "scope": 3551, "src": "1596:28:19", "stateVariable": true, "storageLocation": "default", @@ -1956,7 +1956,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3343, + "id": 3395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1596:4:19", @@ -1971,7 +1971,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 3346, + "id": 3398, "isConstant": false, "isLValue": false, "isPure": true, @@ -1979,7 +1979,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 3344, + "id": 3396, "isConstant": false, "isLValue": false, "isPure": true, @@ -1999,7 +1999,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 3345, + "id": 3397, "isConstant": false, "isLValue": false, "isPure": true, @@ -2024,25 +2024,25 @@ }, { "body": { - "id": 3370, + "id": 3422, "nodeType": "Block", "src": "1692:50:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3368, + "id": 3420, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3356, + "id": 3408, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3354, + "referencedDeclaration": 3406, "src": "1702:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2057,7 +2057,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3367, + "id": 3419, "isConstant": false, "isLValue": false, "isPure": false, @@ -2070,11 +2070,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3359, + "id": 3411, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3349, + "referencedDeclaration": 3401, "src": "1714:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2083,11 +2083,11 @@ }, { "argumentTypes": null, - "id": 3360, + "id": 3412, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3351, + "referencedDeclaration": 3403, "src": "1717:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2106,18 +2106,18 @@ "typeString": "uint256" } ], - "id": 3358, + "id": 3410, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3269, + "referencedDeclaration": 3321, "src": "1710:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3361, + "id": 3413, "isConstant": false, "isLValue": false, "isPure": false, @@ -2137,18 +2137,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3364, + "id": 3416, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3362, + "id": 3414, "name": "WAD", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3342, + "referencedDeclaration": 3394, "src": "1721:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2160,7 +2160,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "32", - "id": 3363, + "id": 3415, "isConstant": false, "isLValue": false, "isPure": true, @@ -2193,18 +2193,18 @@ "typeString": "uint256" } ], - "id": 3357, + "id": 3409, "name": "add", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3219, + "referencedDeclaration": 3271, "src": "1706:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3365, + "id": 3417, "isConstant": false, "isLValue": false, "isPure": false, @@ -2222,11 +2222,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3366, + "id": 3418, "name": "WAD", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3342, + "referencedDeclaration": 3394, "src": "1732:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2245,29 +2245,29 @@ "typeString": "uint256" } }, - "id": 3369, + "id": 3421, "nodeType": "ExpressionStatement", "src": "1702:33:19" } ] }, "documentation": null, - "id": 3371, + "id": 3423, "implemented": true, "kind": "function", "modifiers": [], "name": "wmul", "nodeType": "FunctionDefinition", "parameters": { - "id": 3352, + "id": 3404, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3349, + "id": 3401, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3371, + "scope": 3423, "src": "1645:6:19", "stateVariable": false, "storageLocation": "default", @@ -2276,7 +2276,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3348, + "id": 3400, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1645:4:19", @@ -2290,10 +2290,10 @@ }, { "constant": false, - "id": 3351, + "id": 3403, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3371, + "scope": 3423, "src": "1653:6:19", "stateVariable": false, "storageLocation": "default", @@ -2302,7 +2302,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3350, + "id": 3402, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1653:4:19", @@ -2318,15 +2318,15 @@ "src": "1644:16:19" }, "returnParameters": { - "id": 3355, + "id": 3407, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3354, + "id": 3406, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3371, + "scope": 3423, "src": "1684:6:19", "stateVariable": false, "storageLocation": "default", @@ -2335,7 +2335,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3353, + "id": 3405, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1684:4:19", @@ -2350,7 +2350,7 @@ ], "src": "1683:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1631:111:19", "stateMutability": "pure", "superFunction": null, @@ -2358,25 +2358,25 @@ }, { "body": { - "id": 3394, + "id": 3446, "nodeType": "Block", "src": "1808:50:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3392, + "id": 3444, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3380, + "id": 3432, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3378, + "referencedDeclaration": 3430, "src": "1818:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2391,7 +2391,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3391, + "id": 3443, "isConstant": false, "isLValue": false, "isPure": false, @@ -2404,11 +2404,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3383, + "id": 3435, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3373, + "referencedDeclaration": 3425, "src": "1830:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2417,11 +2417,11 @@ }, { "argumentTypes": null, - "id": 3384, + "id": 3436, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3375, + "referencedDeclaration": 3427, "src": "1833:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2440,18 +2440,18 @@ "typeString": "uint256" } ], - "id": 3382, + "id": 3434, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3269, + "referencedDeclaration": 3321, "src": "1826:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3385, + "id": 3437, "isConstant": false, "isLValue": false, "isPure": false, @@ -2471,18 +2471,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3388, + "id": 3440, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3386, + "id": 3438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3347, + "referencedDeclaration": 3399, "src": "1837:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2494,7 +2494,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "32", - "id": 3387, + "id": 3439, "isConstant": false, "isLValue": false, "isPure": true, @@ -2527,18 +2527,18 @@ "typeString": "uint256" } ], - "id": 3381, + "id": 3433, "name": "add", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3219, + "referencedDeclaration": 3271, "src": "1822:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3389, + "id": 3441, "isConstant": false, "isLValue": false, "isPure": false, @@ -2556,11 +2556,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3390, + "id": 3442, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3347, + "referencedDeclaration": 3399, "src": "1848:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2579,29 +2579,29 @@ "typeString": "uint256" } }, - "id": 3393, + "id": 3445, "nodeType": "ExpressionStatement", "src": "1818:33:19" } ] }, "documentation": null, - "id": 3395, + "id": 3447, "implemented": true, "kind": "function", "modifiers": [], "name": "rmul", "nodeType": "FunctionDefinition", "parameters": { - "id": 3376, + "id": 3428, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3373, + "id": 3425, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3395, + "scope": 3447, "src": "1761:6:19", "stateVariable": false, "storageLocation": "default", @@ -2610,7 +2610,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3372, + "id": 3424, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1761:4:19", @@ -2624,10 +2624,10 @@ }, { "constant": false, - "id": 3375, + "id": 3427, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3395, + "scope": 3447, "src": "1769:6:19", "stateVariable": false, "storageLocation": "default", @@ -2636,7 +2636,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3374, + "id": 3426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1769:4:19", @@ -2652,15 +2652,15 @@ "src": "1760:16:19" }, "returnParameters": { - "id": 3379, + "id": 3431, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3378, + "id": 3430, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3395, + "scope": 3447, "src": "1800:6:19", "stateVariable": false, "storageLocation": "default", @@ -2669,7 +2669,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3377, + "id": 3429, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1800:4:19", @@ -2684,7 +2684,7 @@ ], "src": "1799:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1747:111:19", "stateMutability": "pure", "superFunction": null, @@ -2692,25 +2692,25 @@ }, { "body": { - "id": 3418, + "id": 3470, "nodeType": "Block", "src": "1924:48:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3416, + "id": 3468, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3404, + "id": 3456, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3402, + "referencedDeclaration": 3454, "src": "1934:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2725,7 +2725,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3415, + "id": 3467, "isConstant": false, "isLValue": false, "isPure": false, @@ -2738,11 +2738,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3407, + "id": 3459, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3397, + "referencedDeclaration": 3449, "src": "1946:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2751,11 +2751,11 @@ }, { "argumentTypes": null, - "id": 3408, + "id": 3460, "name": "WAD", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3342, + "referencedDeclaration": 3394, "src": "1949:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2774,18 +2774,18 @@ "typeString": "uint256" } ], - "id": 3406, + "id": 3458, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3269, + "referencedDeclaration": 3321, "src": "1942:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3409, + "id": 3461, "isConstant": false, "isLValue": false, "isPure": false, @@ -2805,18 +2805,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3412, + "id": 3464, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3410, + "id": 3462, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3399, + "referencedDeclaration": 3451, "src": "1955:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2828,7 +2828,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "32", - "id": 3411, + "id": 3463, "isConstant": false, "isLValue": false, "isPure": true, @@ -2861,18 +2861,18 @@ "typeString": "uint256" } ], - "id": 3405, + "id": 3457, "name": "add", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3219, + "referencedDeclaration": 3271, "src": "1938:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3413, + "id": 3465, "isConstant": false, "isLValue": false, "isPure": false, @@ -2890,11 +2890,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3414, + "id": 3466, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3399, + "referencedDeclaration": 3451, "src": "1964:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2913,29 +2913,29 @@ "typeString": "uint256" } }, - "id": 3417, + "id": 3469, "nodeType": "ExpressionStatement", "src": "1934:31:19" } ] }, "documentation": null, - "id": 3419, + "id": 3471, "implemented": true, "kind": "function", "modifiers": [], "name": "wdiv", "nodeType": "FunctionDefinition", "parameters": { - "id": 3400, + "id": 3452, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3397, + "id": 3449, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3419, + "scope": 3471, "src": "1877:6:19", "stateVariable": false, "storageLocation": "default", @@ -2944,7 +2944,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3396, + "id": 3448, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1877:4:19", @@ -2958,10 +2958,10 @@ }, { "constant": false, - "id": 3399, + "id": 3451, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3419, + "scope": 3471, "src": "1885:6:19", "stateVariable": false, "storageLocation": "default", @@ -2970,7 +2970,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3398, + "id": 3450, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1885:4:19", @@ -2986,15 +2986,15 @@ "src": "1876:16:19" }, "returnParameters": { - "id": 3403, + "id": 3455, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3402, + "id": 3454, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3419, + "scope": 3471, "src": "1916:6:19", "stateVariable": false, "storageLocation": "default", @@ -3003,7 +3003,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3401, + "id": 3453, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1916:4:19", @@ -3018,7 +3018,7 @@ ], "src": "1915:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1863:109:19", "stateMutability": "pure", "superFunction": null, @@ -3026,25 +3026,25 @@ }, { "body": { - "id": 3442, + "id": 3494, "nodeType": "Block", "src": "2038:48:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3440, + "id": 3492, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3428, + "id": 3480, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, + "referencedDeclaration": 3478, "src": "2048:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3059,7 +3059,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3439, + "id": 3491, "isConstant": false, "isLValue": false, "isPure": false, @@ -3072,11 +3072,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3431, + "id": 3483, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3421, + "referencedDeclaration": 3473, "src": "2060:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3085,11 +3085,11 @@ }, { "argumentTypes": null, - "id": 3432, + "id": 3484, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3347, + "referencedDeclaration": 3399, "src": "2063:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3108,18 +3108,18 @@ "typeString": "uint256" } ], - "id": 3430, + "id": 3482, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3269, + "referencedDeclaration": 3321, "src": "2056:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3433, + "id": 3485, "isConstant": false, "isLValue": false, "isPure": false, @@ -3139,18 +3139,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3436, + "id": 3488, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3434, + "id": 3486, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3423, + "referencedDeclaration": 3475, "src": "2069:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3162,7 +3162,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "32", - "id": 3435, + "id": 3487, "isConstant": false, "isLValue": false, "isPure": true, @@ -3195,18 +3195,18 @@ "typeString": "uint256" } ], - "id": 3429, + "id": 3481, "name": "add", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3219, + "referencedDeclaration": 3271, "src": "2052:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3437, + "id": 3489, "isConstant": false, "isLValue": false, "isPure": false, @@ -3224,11 +3224,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3438, + "id": 3490, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3423, + "referencedDeclaration": 3475, "src": "2078:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3247,29 +3247,29 @@ "typeString": "uint256" } }, - "id": 3441, + "id": 3493, "nodeType": "ExpressionStatement", "src": "2048:31:19" } ] }, "documentation": null, - "id": 3443, + "id": 3495, "implemented": true, "kind": "function", "modifiers": [], "name": "rdiv", "nodeType": "FunctionDefinition", "parameters": { - "id": 3424, + "id": 3476, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3421, + "id": 3473, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3443, + "scope": 3495, "src": "1991:6:19", "stateVariable": false, "storageLocation": "default", @@ -3278,7 +3278,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3420, + "id": 3472, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1991:4:19", @@ -3292,10 +3292,10 @@ }, { "constant": false, - "id": 3423, + "id": 3475, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3443, + "scope": 3495, "src": "1999:6:19", "stateVariable": false, "storageLocation": "default", @@ -3304,7 +3304,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3422, + "id": 3474, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1999:4:19", @@ -3320,15 +3320,15 @@ "src": "1990:16:19" }, "returnParameters": { - "id": 3427, + "id": 3479, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3426, + "id": 3478, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3443, + "scope": 3495, "src": "2030:6:19", "stateVariable": false, "storageLocation": "default", @@ -3337,7 +3337,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3425, + "id": 3477, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2030:4:19", @@ -3352,7 +3352,7 @@ ], "src": "2029:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1977:109:19", "stateMutability": "pure", "superFunction": null, @@ -3360,25 +3360,25 @@ }, { "body": { - "id": 3497, + "id": 3549, "nodeType": "Block", "src": "2710:196:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3461, + "id": 3513, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3452, + "id": 3504, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3450, + "referencedDeclaration": 3502, "src": "2720:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3395,7 +3395,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3457, + "id": 3509, "isConstant": false, "isLValue": false, "isPure": false, @@ -3406,18 +3406,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3455, + "id": 3507, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3453, + "id": 3505, "name": "n", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3447, + "referencedDeclaration": 3499, "src": "2724:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3429,7 +3429,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "32", - "id": 3454, + "id": 3506, "isConstant": false, "isLValue": false, "isPure": true, @@ -3455,7 +3455,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3456, + "id": 3508, "isConstant": false, "isLValue": false, "isPure": true, @@ -3478,18 +3478,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 3459, + "id": 3511, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3347, + "referencedDeclaration": 3399, "src": "2741:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3460, + "id": 3512, "isConstant": false, "isLValue": false, "isPure": false, @@ -3498,11 +3498,11 @@ "src": "2724:20:19", "trueExpression": { "argumentTypes": null, - "id": 3458, + "id": 3510, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3445, + "referencedDeclaration": 3497, "src": "2737:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3520,31 +3520,31 @@ "typeString": "uint256" } }, - "id": 3462, + "id": 3514, "nodeType": "ExpressionStatement", "src": "2720:24:19" }, { "body": { - "id": 3495, + "id": 3547, "nodeType": "Block", "src": "2784:116:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3479, + "id": 3531, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3474, + "id": 3526, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3445, + "referencedDeclaration": 3497, "src": "2798:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3558,11 +3558,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3476, + "id": 3528, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3445, + "referencedDeclaration": 3497, "src": "2807:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3571,11 +3571,11 @@ }, { "argumentTypes": null, - "id": 3477, + "id": 3529, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3445, + "referencedDeclaration": 3497, "src": "2810:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3594,18 +3594,18 @@ "typeString": "uint256" } ], - "id": 3475, + "id": 3527, "name": "rmul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3395, + "referencedDeclaration": 3447, "src": "2802:4:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3478, + "id": 3530, "isConstant": false, "isLValue": false, "isPure": false, @@ -3625,7 +3625,7 @@ "typeString": "uint256" } }, - "id": 3480, + "id": 3532, "nodeType": "ExpressionStatement", "src": "2798:14:19" }, @@ -3636,7 +3636,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3485, + "id": 3537, "isConstant": false, "isLValue": false, "isPure": false, @@ -3647,18 +3647,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3483, + "id": 3535, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3481, + "id": 3533, "name": "n", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3447, + "referencedDeclaration": 3499, "src": "2831:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3670,7 +3670,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "32", - "id": 3482, + "id": 3534, "isConstant": false, "isLValue": false, "isPure": true, @@ -3696,7 +3696,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3484, + "id": 3536, "isConstant": false, "isLValue": false, "isPure": true, @@ -3718,29 +3718,29 @@ } }, "falseBody": null, - "id": 3494, + "id": 3546, "nodeType": "IfStatement", "src": "2827:63:19", "trueBody": { - "id": 3493, + "id": 3545, "nodeType": "Block", "src": "2843:47:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3491, + "id": 3543, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3486, + "id": 3538, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3450, + "referencedDeclaration": 3502, "src": "2861:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3754,11 +3754,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3488, + "id": 3540, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3450, + "referencedDeclaration": 3502, "src": "2870:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3767,11 +3767,11 @@ }, { "argumentTypes": null, - "id": 3489, + "id": 3541, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3445, + "referencedDeclaration": 3497, "src": "2873:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3790,18 +3790,18 @@ "typeString": "uint256" } ], - "id": 3487, + "id": 3539, "name": "rmul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3395, + "referencedDeclaration": 3447, "src": "2865:4:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3490, + "id": 3542, "isConstant": false, "isLValue": false, "isPure": false, @@ -3821,7 +3821,7 @@ "typeString": "uint256" } }, - "id": 3492, + "id": 3544, "nodeType": "ExpressionStatement", "src": "2861:14:19" } @@ -3836,18 +3836,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3469, + "id": 3521, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3467, + "id": 3519, "name": "n", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3447, + "referencedDeclaration": 3499, "src": "2768:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3859,7 +3859,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3468, + "id": 3520, "isConstant": false, "isLValue": false, "isPure": true, @@ -3880,22 +3880,22 @@ "typeString": "bool" } }, - "id": 3496, + "id": 3548, "initializationExpression": { "expression": { "argumentTypes": null, - "id": 3465, + "id": 3517, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3463, + "id": 3515, "name": "n", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3447, + "referencedDeclaration": 3499, "src": "2760:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3907,7 +3907,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "32", - "id": 3464, + "id": 3516, "isConstant": false, "isLValue": false, "isPure": true, @@ -3928,25 +3928,25 @@ "typeString": "uint256" } }, - "id": 3466, + "id": 3518, "nodeType": "ExpressionStatement", "src": "2760:6:19" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 3472, + "id": 3524, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3470, + "id": 3522, "name": "n", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3447, + "referencedDeclaration": 3499, "src": "2776:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3958,7 +3958,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "32", - "id": 3471, + "id": 3523, "isConstant": false, "isLValue": false, "isPure": true, @@ -3979,7 +3979,7 @@ "typeString": "uint256" } }, - "id": 3473, + "id": 3525, "nodeType": "ExpressionStatement", "src": "2776:6:19" }, @@ -3989,22 +3989,22 @@ ] }, "documentation": null, - "id": 3498, + "id": 3550, "implemented": true, "kind": "function", "modifiers": [], "name": "rpow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3448, + "id": 3500, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3445, + "id": 3497, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3498, + "scope": 3550, "src": "2663:6:19", "stateVariable": false, "storageLocation": "default", @@ -4013,7 +4013,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3444, + "id": 3496, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2663:4:19", @@ -4027,10 +4027,10 @@ }, { "constant": false, - "id": 3447, + "id": 3499, "name": "n", "nodeType": "VariableDeclaration", - "scope": 3498, + "scope": 3550, "src": "2671:6:19", "stateVariable": false, "storageLocation": "default", @@ -4039,7 +4039,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3446, + "id": 3498, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2671:4:19", @@ -4055,15 +4055,15 @@ "src": "2662:16:19" }, "returnParameters": { - "id": 3451, + "id": 3503, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3450, + "id": 3502, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3498, + "scope": 3550, "src": "2702:6:19", "stateVariable": false, "storageLocation": "default", @@ -4072,7 +4072,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3449, + "id": 3501, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2702:4:19", @@ -4087,14 +4087,14 @@ ], "src": "2701:8:19" }, - "scope": 3499, + "scope": 3551, "src": "2649:257:19", "stateMutability": "pure", "superFunction": null, "visibility": "internal" } ], - "scope": 3500, + "scope": 3552, "src": "722:2186:19" } ], @@ -4104,14 +4104,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Math.sol", "exportedSymbols": { "DSMath": [ - 3499 + 3551 ] }, - "id": 3500, + "id": 3552, "nodeType": "SourceUnit", "nodes": [ { - "id": 3197, + "id": 3249, "literals": [ "solidity", ">", @@ -4127,16 +4127,16 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3499, + "id": 3551, "linearizedBaseContracts": [ - 3499 + 3551 ], "name": "DSMath", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 3218, + "id": 3270, "nodeType": "Block", "src": "804:66:19", "statements": [ @@ -4150,7 +4150,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3214, + "id": 3266, "isConstant": false, "isLValue": false, "isPure": false, @@ -4160,18 +4160,18 @@ "components": [ { "argumentTypes": null, - "id": 3211, + "id": 3263, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3207, + "id": 3259, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3204, + "referencedDeclaration": 3256, "src": "823:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4186,18 +4186,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3210, + "id": 3262, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3208, + "id": 3260, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3199, + "referencedDeclaration": 3251, "src": "827:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4208,11 +4208,11 @@ "operator": "+", "rightExpression": { "argumentTypes": null, - "id": 3209, + "id": 3261, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3201, + "referencedDeclaration": 3253, "src": "831:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4232,7 +4232,7 @@ } } ], - "id": 3212, + "id": 3264, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4249,11 +4249,11 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 3213, + "id": 3265, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3199, + "referencedDeclaration": 3251, "src": "837:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4269,7 +4269,7 @@ { "argumentTypes": null, "hexValue": "64732d6d6174682d6164642d6f766572666c6f77", - "id": 3215, + "id": 3267, "isConstant": false, "isLValue": false, "isPure": true, @@ -4296,21 +4296,21 @@ "typeString": "literal_string \"ds-math-add-overflow\"" } ], - "id": 3206, + "id": 3258, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "814:7:19", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3216, + "id": 3268, "isConstant": false, "isLValue": false, "isPure": false, @@ -4324,29 +4324,29 @@ "typeString": "tuple()" } }, - "id": 3217, + "id": 3269, "nodeType": "ExpressionStatement", "src": "814:49:19" } ] }, "documentation": null, - "id": 3219, + "id": 3271, "implemented": true, "kind": "function", "modifiers": [], "name": "add", "nodeType": "FunctionDefinition", "parameters": { - "id": 3202, + "id": 3254, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3199, + "id": 3251, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3219, + "scope": 3271, "src": "757:6:19", "stateVariable": false, "storageLocation": "default", @@ -4355,7 +4355,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3198, + "id": 3250, "name": "uint", "nodeType": "ElementaryTypeName", "src": "757:4:19", @@ -4369,10 +4369,10 @@ }, { "constant": false, - "id": 3201, + "id": 3253, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3219, + "scope": 3271, "src": "765:6:19", "stateVariable": false, "storageLocation": "default", @@ -4381,7 +4381,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3200, + "id": 3252, "name": "uint", "nodeType": "ElementaryTypeName", "src": "765:4:19", @@ -4397,15 +4397,15 @@ "src": "756:16:19" }, "returnParameters": { - "id": 3205, + "id": 3257, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3204, + "id": 3256, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3219, + "scope": 3271, "src": "796:6:19", "stateVariable": false, "storageLocation": "default", @@ -4414,7 +4414,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3203, + "id": 3255, "name": "uint", "nodeType": "ElementaryTypeName", "src": "796:4:19", @@ -4429,7 +4429,7 @@ ], "src": "795:8:19" }, - "scope": 3499, + "scope": 3551, "src": "744:126:19", "stateMutability": "pure", "superFunction": null, @@ -4437,7 +4437,7 @@ }, { "body": { - "id": 3240, + "id": 3292, "nodeType": "Block", "src": "935:67:19", "statements": [ @@ -4451,7 +4451,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3236, + "id": 3288, "isConstant": false, "isLValue": false, "isPure": false, @@ -4461,18 +4461,18 @@ "components": [ { "argumentTypes": null, - "id": 3233, + "id": 3285, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3229, + "id": 3281, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3226, + "referencedDeclaration": 3278, "src": "954:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4487,18 +4487,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3232, + "id": 3284, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3230, + "id": 3282, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3221, + "referencedDeclaration": 3273, "src": "958:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4509,11 +4509,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 3231, + "id": 3283, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3223, + "referencedDeclaration": 3275, "src": "962:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4533,7 +4533,7 @@ } } ], - "id": 3234, + "id": 3286, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4550,11 +4550,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 3235, + "id": 3287, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3221, + "referencedDeclaration": 3273, "src": "968:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4570,7 +4570,7 @@ { "argumentTypes": null, "hexValue": "64732d6d6174682d7375622d756e646572666c6f77", - "id": 3237, + "id": 3289, "isConstant": false, "isLValue": false, "isPure": true, @@ -4597,21 +4597,21 @@ "typeString": "literal_string \"ds-math-sub-underflow\"" } ], - "id": 3228, + "id": 3280, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "945:7:19", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3238, + "id": 3290, "isConstant": false, "isLValue": false, "isPure": false, @@ -4625,29 +4625,29 @@ "typeString": "tuple()" } }, - "id": 3239, + "id": 3291, "nodeType": "ExpressionStatement", "src": "945:50:19" } ] }, "documentation": null, - "id": 3241, + "id": 3293, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 3224, + "id": 3276, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3221, + "id": 3273, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3241, + "scope": 3293, "src": "888:6:19", "stateVariable": false, "storageLocation": "default", @@ -4656,7 +4656,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3220, + "id": 3272, "name": "uint", "nodeType": "ElementaryTypeName", "src": "888:4:19", @@ -4670,10 +4670,10 @@ }, { "constant": false, - "id": 3223, + "id": 3275, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3241, + "scope": 3293, "src": "896:6:19", "stateVariable": false, "storageLocation": "default", @@ -4682,7 +4682,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3222, + "id": 3274, "name": "uint", "nodeType": "ElementaryTypeName", "src": "896:4:19", @@ -4698,15 +4698,15 @@ "src": "887:16:19" }, "returnParameters": { - "id": 3227, + "id": 3279, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3226, + "id": 3278, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3241, + "scope": 3293, "src": "927:6:19", "stateVariable": false, "storageLocation": "default", @@ -4715,7 +4715,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3225, + "id": 3277, "name": "uint", "nodeType": "ElementaryTypeName", "src": "927:4:19", @@ -4730,7 +4730,7 @@ ], "src": "926:8:19" }, - "scope": 3499, + "scope": 3551, "src": "875:127:19", "stateMutability": "pure", "superFunction": null, @@ -4738,7 +4738,7 @@ }, { "body": { - "id": 3268, + "id": 3320, "nodeType": "Block", "src": "1067:80:19", "statements": [ @@ -4752,7 +4752,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 3264, + "id": 3316, "isConstant": false, "isLValue": false, "isPure": false, @@ -4763,18 +4763,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3253, + "id": 3305, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3251, + "id": 3303, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3245, + "referencedDeclaration": 3297, "src": "1085:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4786,7 +4786,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3252, + "id": 3304, "isConstant": false, "isLValue": false, "isPure": true, @@ -4815,7 +4815,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3263, + "id": 3315, "isConstant": false, "isLValue": false, "isPure": false, @@ -4826,7 +4826,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3261, + "id": 3313, "isConstant": false, "isLValue": false, "isPure": false, @@ -4836,18 +4836,18 @@ "components": [ { "argumentTypes": null, - "id": 3258, + "id": 3310, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3254, + "id": 3306, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3248, + "referencedDeclaration": 3300, "src": "1096:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4862,18 +4862,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3257, + "id": 3309, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3255, + "id": 3307, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3243, + "referencedDeclaration": 3295, "src": "1100:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4884,11 +4884,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 3256, + "id": 3308, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3245, + "referencedDeclaration": 3297, "src": "1104:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4908,7 +4908,7 @@ } } ], - "id": 3259, + "id": 3311, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4925,11 +4925,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3260, + "id": 3312, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3245, + "referencedDeclaration": 3297, "src": "1109:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4946,11 +4946,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 3262, + "id": 3314, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3243, + "referencedDeclaration": 3295, "src": "1114:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4972,7 +4972,7 @@ { "argumentTypes": null, "hexValue": "64732d6d6174682d6d756c2d6f766572666c6f77", - "id": 3265, + "id": 3317, "isConstant": false, "isLValue": false, "isPure": true, @@ -4999,21 +4999,21 @@ "typeString": "literal_string \"ds-math-mul-overflow\"" } ], - "id": 3250, + "id": 3302, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1077:7:19", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3266, + "id": 3318, "isConstant": false, "isLValue": false, "isPure": false, @@ -5027,29 +5027,29 @@ "typeString": "tuple()" } }, - "id": 3267, + "id": 3319, "nodeType": "ExpressionStatement", "src": "1077:63:19" } ] }, "documentation": null, - "id": 3269, + "id": 3321, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 3246, + "id": 3298, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3243, + "id": 3295, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3269, + "scope": 3321, "src": "1020:6:19", "stateVariable": false, "storageLocation": "default", @@ -5058,7 +5058,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3242, + "id": 3294, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1020:4:19", @@ -5072,10 +5072,10 @@ }, { "constant": false, - "id": 3245, + "id": 3297, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3269, + "scope": 3321, "src": "1028:6:19", "stateVariable": false, "storageLocation": "default", @@ -5084,7 +5084,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3244, + "id": 3296, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1028:4:19", @@ -5100,15 +5100,15 @@ "src": "1019:16:19" }, "returnParameters": { - "id": 3249, + "id": 3301, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3248, + "id": 3300, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3269, + "scope": 3321, "src": "1059:6:19", "stateVariable": false, "storageLocation": "default", @@ -5117,7 +5117,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3247, + "id": 3299, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1059:4:19", @@ -5132,7 +5132,7 @@ ], "src": "1058:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1007:140:19", "stateMutability": "pure", "superFunction": null, @@ -5140,7 +5140,7 @@ }, { "body": { - "id": 3285, + "id": 3337, "nodeType": "Block", "src": "1213:38:19", "statements": [ @@ -5153,18 +5153,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3280, + "id": 3332, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3278, + "id": 3330, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3271, + "referencedDeclaration": 3323, "src": "1230:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5175,11 +5175,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 3279, + "id": 3331, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3273, + "referencedDeclaration": 3325, "src": "1235:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5194,18 +5194,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 3282, + "id": 3334, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3273, + "referencedDeclaration": 3325, "src": "1243:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3283, + "id": 3335, "isConstant": false, "isLValue": false, "isPure": false, @@ -5214,11 +5214,11 @@ "src": "1230:14:19", "trueExpression": { "argumentTypes": null, - "id": 3281, + "id": 3333, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3271, + "referencedDeclaration": 3323, "src": "1239:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5230,30 +5230,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 3277, - "id": 3284, + "functionReturnParameters": 3329, + "id": 3336, "nodeType": "Return", "src": "1223:21:19" } ] }, "documentation": null, - "id": 3286, + "id": 3338, "implemented": true, "kind": "function", "modifiers": [], "name": "min", "nodeType": "FunctionDefinition", "parameters": { - "id": 3274, + "id": 3326, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3271, + "id": 3323, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3286, + "scope": 3338, "src": "1166:6:19", "stateVariable": false, "storageLocation": "default", @@ -5262,7 +5262,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3270, + "id": 3322, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1166:4:19", @@ -5276,10 +5276,10 @@ }, { "constant": false, - "id": 3273, + "id": 3325, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3286, + "scope": 3338, "src": "1174:6:19", "stateVariable": false, "storageLocation": "default", @@ -5288,7 +5288,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3272, + "id": 3324, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1174:4:19", @@ -5304,15 +5304,15 @@ "src": "1165:16:19" }, "returnParameters": { - "id": 3277, + "id": 3329, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3276, + "id": 3328, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3286, + "scope": 3338, "src": "1205:6:19", "stateVariable": false, "storageLocation": "default", @@ -5321,7 +5321,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3275, + "id": 3327, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1205:4:19", @@ -5336,7 +5336,7 @@ ], "src": "1204:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1153:98:19", "stateMutability": "pure", "superFunction": null, @@ -5344,7 +5344,7 @@ }, { "body": { - "id": 3302, + "id": 3354, "nodeType": "Block", "src": "1316:38:19", "statements": [ @@ -5357,18 +5357,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3297, + "id": 3349, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3295, + "id": 3347, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3288, + "referencedDeclaration": 3340, "src": "1333:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5379,11 +5379,11 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 3296, + "id": 3348, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3290, + "referencedDeclaration": 3342, "src": "1338:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5398,18 +5398,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 3299, + "id": 3351, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3290, + "referencedDeclaration": 3342, "src": "1346:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3300, + "id": 3352, "isConstant": false, "isLValue": false, "isPure": false, @@ -5418,11 +5418,11 @@ "src": "1333:14:19", "trueExpression": { "argumentTypes": null, - "id": 3298, + "id": 3350, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3288, + "referencedDeclaration": 3340, "src": "1342:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5434,30 +5434,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 3294, - "id": 3301, + "functionReturnParameters": 3346, + "id": 3353, "nodeType": "Return", "src": "1326:21:19" } ] }, "documentation": null, - "id": 3303, + "id": 3355, "implemented": true, "kind": "function", "modifiers": [], "name": "max", "nodeType": "FunctionDefinition", "parameters": { - "id": 3291, + "id": 3343, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3288, + "id": 3340, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3303, + "scope": 3355, "src": "1269:6:19", "stateVariable": false, "storageLocation": "default", @@ -5466,7 +5466,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3287, + "id": 3339, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1269:4:19", @@ -5480,10 +5480,10 @@ }, { "constant": false, - "id": 3290, + "id": 3342, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3303, + "scope": 3355, "src": "1277:6:19", "stateVariable": false, "storageLocation": "default", @@ -5492,7 +5492,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3289, + "id": 3341, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1277:4:19", @@ -5508,15 +5508,15 @@ "src": "1268:16:19" }, "returnParameters": { - "id": 3294, + "id": 3346, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3293, + "id": 3345, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3303, + "scope": 3355, "src": "1308:6:19", "stateVariable": false, "storageLocation": "default", @@ -5525,7 +5525,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3292, + "id": 3344, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1308:4:19", @@ -5540,7 +5540,7 @@ ], "src": "1307:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1256:98:19", "stateMutability": "pure", "superFunction": null, @@ -5548,7 +5548,7 @@ }, { "body": { - "id": 3319, + "id": 3371, "nodeType": "Block", "src": "1417:38:19", "statements": [ @@ -5561,18 +5561,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 3314, + "id": 3366, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3312, + "id": 3364, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3305, + "referencedDeclaration": 3357, "src": "1434:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -5583,11 +5583,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 3313, + "id": 3365, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3307, + "referencedDeclaration": 3359, "src": "1439:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -5602,18 +5602,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 3316, + "id": 3368, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3307, + "referencedDeclaration": 3359, "src": "1447:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 3317, + "id": 3369, "isConstant": false, "isLValue": false, "isPure": false, @@ -5622,11 +5622,11 @@ "src": "1434:14:19", "trueExpression": { "argumentTypes": null, - "id": 3315, + "id": 3367, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3305, + "referencedDeclaration": 3357, "src": "1443:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -5638,30 +5638,30 @@ "typeString": "int256" } }, - "functionReturnParameters": 3311, - "id": 3318, + "functionReturnParameters": 3363, + "id": 3370, "nodeType": "Return", "src": "1427:21:19" } ] }, "documentation": null, - "id": 3320, + "id": 3372, "implemented": true, "kind": "function", "modifiers": [], "name": "imin", "nodeType": "FunctionDefinition", "parameters": { - "id": 3308, + "id": 3360, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3305, + "id": 3357, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3320, + "scope": 3372, "src": "1373:5:19", "stateVariable": false, "storageLocation": "default", @@ -5670,7 +5670,7 @@ "typeString": "int256" }, "typeName": { - "id": 3304, + "id": 3356, "name": "int", "nodeType": "ElementaryTypeName", "src": "1373:3:19", @@ -5684,10 +5684,10 @@ }, { "constant": false, - "id": 3307, + "id": 3359, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3320, + "scope": 3372, "src": "1380:5:19", "stateVariable": false, "storageLocation": "default", @@ -5696,7 +5696,7 @@ "typeString": "int256" }, "typeName": { - "id": 3306, + "id": 3358, "name": "int", "nodeType": "ElementaryTypeName", "src": "1380:3:19", @@ -5712,15 +5712,15 @@ "src": "1372:14:19" }, "returnParameters": { - "id": 3311, + "id": 3363, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3310, + "id": 3362, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3320, + "scope": 3372, "src": "1410:5:19", "stateVariable": false, "storageLocation": "default", @@ -5729,7 +5729,7 @@ "typeString": "int256" }, "typeName": { - "id": 3309, + "id": 3361, "name": "int", "nodeType": "ElementaryTypeName", "src": "1410:3:19", @@ -5744,7 +5744,7 @@ ], "src": "1409:7:19" }, - "scope": 3499, + "scope": 3551, "src": "1359:96:19", "stateMutability": "pure", "superFunction": null, @@ -5752,7 +5752,7 @@ }, { "body": { - "id": 3336, + "id": 3388, "nodeType": "Block", "src": "1518:38:19", "statements": [ @@ -5765,18 +5765,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 3331, + "id": 3383, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3329, + "id": 3381, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3322, + "referencedDeclaration": 3374, "src": "1535:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -5787,11 +5787,11 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 3330, + "id": 3382, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3324, + "referencedDeclaration": 3376, "src": "1540:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -5806,18 +5806,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 3333, + "id": 3385, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3324, + "referencedDeclaration": 3376, "src": "1548:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 3334, + "id": 3386, "isConstant": false, "isLValue": false, "isPure": false, @@ -5826,11 +5826,11 @@ "src": "1535:14:19", "trueExpression": { "argumentTypes": null, - "id": 3332, + "id": 3384, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3322, + "referencedDeclaration": 3374, "src": "1544:1:19", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -5842,30 +5842,30 @@ "typeString": "int256" } }, - "functionReturnParameters": 3328, - "id": 3335, + "functionReturnParameters": 3380, + "id": 3387, "nodeType": "Return", "src": "1528:21:19" } ] }, "documentation": null, - "id": 3337, + "id": 3389, "implemented": true, "kind": "function", "modifiers": [], "name": "imax", "nodeType": "FunctionDefinition", "parameters": { - "id": 3325, + "id": 3377, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3322, + "id": 3374, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3337, + "scope": 3389, "src": "1474:5:19", "stateVariable": false, "storageLocation": "default", @@ -5874,7 +5874,7 @@ "typeString": "int256" }, "typeName": { - "id": 3321, + "id": 3373, "name": "int", "nodeType": "ElementaryTypeName", "src": "1474:3:19", @@ -5888,10 +5888,10 @@ }, { "constant": false, - "id": 3324, + "id": 3376, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3337, + "scope": 3389, "src": "1481:5:19", "stateVariable": false, "storageLocation": "default", @@ -5900,7 +5900,7 @@ "typeString": "int256" }, "typeName": { - "id": 3323, + "id": 3375, "name": "int", "nodeType": "ElementaryTypeName", "src": "1481:3:19", @@ -5916,15 +5916,15 @@ "src": "1473:14:19" }, "returnParameters": { - "id": 3328, + "id": 3380, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3327, + "id": 3379, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3337, + "scope": 3389, "src": "1511:5:19", "stateVariable": false, "storageLocation": "default", @@ -5933,7 +5933,7 @@ "typeString": "int256" }, "typeName": { - "id": 3326, + "id": 3378, "name": "int", "nodeType": "ElementaryTypeName", "src": "1511:3:19", @@ -5948,7 +5948,7 @@ ], "src": "1510:7:19" }, - "scope": 3499, + "scope": 3551, "src": "1460:96:19", "stateMutability": "pure", "superFunction": null, @@ -5956,10 +5956,10 @@ }, { "constant": true, - "id": 3342, + "id": 3394, "name": "WAD", "nodeType": "VariableDeclaration", - "scope": 3499, + "scope": 3551, "src": "1562:28:19", "stateVariable": true, "storageLocation": "default", @@ -5968,7 +5968,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3338, + "id": 3390, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1562:4:19", @@ -5983,7 +5983,7 @@ "typeIdentifier": "t_rational_1000000000000000000_by_1", "typeString": "int_const 1000000000000000000" }, - "id": 3341, + "id": 3393, "isConstant": false, "isLValue": false, "isPure": true, @@ -5991,7 +5991,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 3339, + "id": 3391, "isConstant": false, "isLValue": false, "isPure": true, @@ -6011,7 +6011,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 3340, + "id": 3392, "isConstant": false, "isLValue": false, "isPure": true, @@ -6036,10 +6036,10 @@ }, { "constant": true, - "id": 3347, + "id": 3399, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 3499, + "scope": 3551, "src": "1596:28:19", "stateVariable": true, "storageLocation": "default", @@ -6048,7 +6048,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3343, + "id": 3395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1596:4:19", @@ -6063,7 +6063,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 3346, + "id": 3398, "isConstant": false, "isLValue": false, "isPure": true, @@ -6071,7 +6071,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 3344, + "id": 3396, "isConstant": false, "isLValue": false, "isPure": true, @@ -6091,7 +6091,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 3345, + "id": 3397, "isConstant": false, "isLValue": false, "isPure": true, @@ -6116,25 +6116,25 @@ }, { "body": { - "id": 3370, + "id": 3422, "nodeType": "Block", "src": "1692:50:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3368, + "id": 3420, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3356, + "id": 3408, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3354, + "referencedDeclaration": 3406, "src": "1702:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6149,7 +6149,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3367, + "id": 3419, "isConstant": false, "isLValue": false, "isPure": false, @@ -6162,11 +6162,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3359, + "id": 3411, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3349, + "referencedDeclaration": 3401, "src": "1714:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6175,11 +6175,11 @@ }, { "argumentTypes": null, - "id": 3360, + "id": 3412, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3351, + "referencedDeclaration": 3403, "src": "1717:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6198,18 +6198,18 @@ "typeString": "uint256" } ], - "id": 3358, + "id": 3410, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3269, + "referencedDeclaration": 3321, "src": "1710:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3361, + "id": 3413, "isConstant": false, "isLValue": false, "isPure": false, @@ -6229,18 +6229,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3364, + "id": 3416, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3362, + "id": 3414, "name": "WAD", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3342, + "referencedDeclaration": 3394, "src": "1721:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6252,7 +6252,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "32", - "id": 3363, + "id": 3415, "isConstant": false, "isLValue": false, "isPure": true, @@ -6285,18 +6285,18 @@ "typeString": "uint256" } ], - "id": 3357, + "id": 3409, "name": "add", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3219, + "referencedDeclaration": 3271, "src": "1706:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3365, + "id": 3417, "isConstant": false, "isLValue": false, "isPure": false, @@ -6314,11 +6314,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3366, + "id": 3418, "name": "WAD", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3342, + "referencedDeclaration": 3394, "src": "1732:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6337,29 +6337,29 @@ "typeString": "uint256" } }, - "id": 3369, + "id": 3421, "nodeType": "ExpressionStatement", "src": "1702:33:19" } ] }, "documentation": null, - "id": 3371, + "id": 3423, "implemented": true, "kind": "function", "modifiers": [], "name": "wmul", "nodeType": "FunctionDefinition", "parameters": { - "id": 3352, + "id": 3404, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3349, + "id": 3401, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3371, + "scope": 3423, "src": "1645:6:19", "stateVariable": false, "storageLocation": "default", @@ -6368,7 +6368,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3348, + "id": 3400, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1645:4:19", @@ -6382,10 +6382,10 @@ }, { "constant": false, - "id": 3351, + "id": 3403, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3371, + "scope": 3423, "src": "1653:6:19", "stateVariable": false, "storageLocation": "default", @@ -6394,7 +6394,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3350, + "id": 3402, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1653:4:19", @@ -6410,15 +6410,15 @@ "src": "1644:16:19" }, "returnParameters": { - "id": 3355, + "id": 3407, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3354, + "id": 3406, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3371, + "scope": 3423, "src": "1684:6:19", "stateVariable": false, "storageLocation": "default", @@ -6427,7 +6427,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3353, + "id": 3405, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1684:4:19", @@ -6442,7 +6442,7 @@ ], "src": "1683:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1631:111:19", "stateMutability": "pure", "superFunction": null, @@ -6450,25 +6450,25 @@ }, { "body": { - "id": 3394, + "id": 3446, "nodeType": "Block", "src": "1808:50:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3392, + "id": 3444, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3380, + "id": 3432, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3378, + "referencedDeclaration": 3430, "src": "1818:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6483,7 +6483,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3391, + "id": 3443, "isConstant": false, "isLValue": false, "isPure": false, @@ -6496,11 +6496,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3383, + "id": 3435, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3373, + "referencedDeclaration": 3425, "src": "1830:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6509,11 +6509,11 @@ }, { "argumentTypes": null, - "id": 3384, + "id": 3436, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3375, + "referencedDeclaration": 3427, "src": "1833:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6532,18 +6532,18 @@ "typeString": "uint256" } ], - "id": 3382, + "id": 3434, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3269, + "referencedDeclaration": 3321, "src": "1826:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3385, + "id": 3437, "isConstant": false, "isLValue": false, "isPure": false, @@ -6563,18 +6563,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3388, + "id": 3440, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3386, + "id": 3438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3347, + "referencedDeclaration": 3399, "src": "1837:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6586,7 +6586,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "32", - "id": 3387, + "id": 3439, "isConstant": false, "isLValue": false, "isPure": true, @@ -6619,18 +6619,18 @@ "typeString": "uint256" } ], - "id": 3381, + "id": 3433, "name": "add", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3219, + "referencedDeclaration": 3271, "src": "1822:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3389, + "id": 3441, "isConstant": false, "isLValue": false, "isPure": false, @@ -6648,11 +6648,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3390, + "id": 3442, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3347, + "referencedDeclaration": 3399, "src": "1848:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6671,29 +6671,29 @@ "typeString": "uint256" } }, - "id": 3393, + "id": 3445, "nodeType": "ExpressionStatement", "src": "1818:33:19" } ] }, "documentation": null, - "id": 3395, + "id": 3447, "implemented": true, "kind": "function", "modifiers": [], "name": "rmul", "nodeType": "FunctionDefinition", "parameters": { - "id": 3376, + "id": 3428, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3373, + "id": 3425, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3395, + "scope": 3447, "src": "1761:6:19", "stateVariable": false, "storageLocation": "default", @@ -6702,7 +6702,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3372, + "id": 3424, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1761:4:19", @@ -6716,10 +6716,10 @@ }, { "constant": false, - "id": 3375, + "id": 3427, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3395, + "scope": 3447, "src": "1769:6:19", "stateVariable": false, "storageLocation": "default", @@ -6728,7 +6728,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3374, + "id": 3426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1769:4:19", @@ -6744,15 +6744,15 @@ "src": "1760:16:19" }, "returnParameters": { - "id": 3379, + "id": 3431, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3378, + "id": 3430, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3395, + "scope": 3447, "src": "1800:6:19", "stateVariable": false, "storageLocation": "default", @@ -6761,7 +6761,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3377, + "id": 3429, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1800:4:19", @@ -6776,7 +6776,7 @@ ], "src": "1799:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1747:111:19", "stateMutability": "pure", "superFunction": null, @@ -6784,25 +6784,25 @@ }, { "body": { - "id": 3418, + "id": 3470, "nodeType": "Block", "src": "1924:48:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3416, + "id": 3468, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3404, + "id": 3456, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3402, + "referencedDeclaration": 3454, "src": "1934:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6817,7 +6817,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3415, + "id": 3467, "isConstant": false, "isLValue": false, "isPure": false, @@ -6830,11 +6830,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3407, + "id": 3459, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3397, + "referencedDeclaration": 3449, "src": "1946:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6843,11 +6843,11 @@ }, { "argumentTypes": null, - "id": 3408, + "id": 3460, "name": "WAD", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3342, + "referencedDeclaration": 3394, "src": "1949:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6866,18 +6866,18 @@ "typeString": "uint256" } ], - "id": 3406, + "id": 3458, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3269, + "referencedDeclaration": 3321, "src": "1942:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3409, + "id": 3461, "isConstant": false, "isLValue": false, "isPure": false, @@ -6897,18 +6897,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3412, + "id": 3464, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3410, + "id": 3462, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3399, + "referencedDeclaration": 3451, "src": "1955:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6920,7 +6920,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "32", - "id": 3411, + "id": 3463, "isConstant": false, "isLValue": false, "isPure": true, @@ -6953,18 +6953,18 @@ "typeString": "uint256" } ], - "id": 3405, + "id": 3457, "name": "add", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3219, + "referencedDeclaration": 3271, "src": "1938:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3413, + "id": 3465, "isConstant": false, "isLValue": false, "isPure": false, @@ -6982,11 +6982,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3414, + "id": 3466, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3399, + "referencedDeclaration": 3451, "src": "1964:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7005,29 +7005,29 @@ "typeString": "uint256" } }, - "id": 3417, + "id": 3469, "nodeType": "ExpressionStatement", "src": "1934:31:19" } ] }, "documentation": null, - "id": 3419, + "id": 3471, "implemented": true, "kind": "function", "modifiers": [], "name": "wdiv", "nodeType": "FunctionDefinition", "parameters": { - "id": 3400, + "id": 3452, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3397, + "id": 3449, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3419, + "scope": 3471, "src": "1877:6:19", "stateVariable": false, "storageLocation": "default", @@ -7036,7 +7036,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3396, + "id": 3448, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1877:4:19", @@ -7050,10 +7050,10 @@ }, { "constant": false, - "id": 3399, + "id": 3451, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3419, + "scope": 3471, "src": "1885:6:19", "stateVariable": false, "storageLocation": "default", @@ -7062,7 +7062,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3398, + "id": 3450, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1885:4:19", @@ -7078,15 +7078,15 @@ "src": "1876:16:19" }, "returnParameters": { - "id": 3403, + "id": 3455, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3402, + "id": 3454, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3419, + "scope": 3471, "src": "1916:6:19", "stateVariable": false, "storageLocation": "default", @@ -7095,7 +7095,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3401, + "id": 3453, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1916:4:19", @@ -7110,7 +7110,7 @@ ], "src": "1915:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1863:109:19", "stateMutability": "pure", "superFunction": null, @@ -7118,25 +7118,25 @@ }, { "body": { - "id": 3442, + "id": 3494, "nodeType": "Block", "src": "2038:48:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3440, + "id": 3492, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3428, + "id": 3480, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3426, + "referencedDeclaration": 3478, "src": "2048:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7151,7 +7151,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3439, + "id": 3491, "isConstant": false, "isLValue": false, "isPure": false, @@ -7164,11 +7164,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3431, + "id": 3483, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3421, + "referencedDeclaration": 3473, "src": "2060:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7177,11 +7177,11 @@ }, { "argumentTypes": null, - "id": 3432, + "id": 3484, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3347, + "referencedDeclaration": 3399, "src": "2063:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7200,18 +7200,18 @@ "typeString": "uint256" } ], - "id": 3430, + "id": 3482, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3269, + "referencedDeclaration": 3321, "src": "2056:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3433, + "id": 3485, "isConstant": false, "isLValue": false, "isPure": false, @@ -7231,18 +7231,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3436, + "id": 3488, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3434, + "id": 3486, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3423, + "referencedDeclaration": 3475, "src": "2069:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7254,7 +7254,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "32", - "id": 3435, + "id": 3487, "isConstant": false, "isLValue": false, "isPure": true, @@ -7287,18 +7287,18 @@ "typeString": "uint256" } ], - "id": 3429, + "id": 3481, "name": "add", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3219, + "referencedDeclaration": 3271, "src": "2052:3:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3437, + "id": 3489, "isConstant": false, "isLValue": false, "isPure": false, @@ -7316,11 +7316,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 3438, + "id": 3490, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3423, + "referencedDeclaration": 3475, "src": "2078:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7339,29 +7339,29 @@ "typeString": "uint256" } }, - "id": 3441, + "id": 3493, "nodeType": "ExpressionStatement", "src": "2048:31:19" } ] }, "documentation": null, - "id": 3443, + "id": 3495, "implemented": true, "kind": "function", "modifiers": [], "name": "rdiv", "nodeType": "FunctionDefinition", "parameters": { - "id": 3424, + "id": 3476, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3421, + "id": 3473, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3443, + "scope": 3495, "src": "1991:6:19", "stateVariable": false, "storageLocation": "default", @@ -7370,7 +7370,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3420, + "id": 3472, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1991:4:19", @@ -7384,10 +7384,10 @@ }, { "constant": false, - "id": 3423, + "id": 3475, "name": "y", "nodeType": "VariableDeclaration", - "scope": 3443, + "scope": 3495, "src": "1999:6:19", "stateVariable": false, "storageLocation": "default", @@ -7396,7 +7396,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3422, + "id": 3474, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1999:4:19", @@ -7412,15 +7412,15 @@ "src": "1990:16:19" }, "returnParameters": { - "id": 3427, + "id": 3479, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3426, + "id": 3478, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3443, + "scope": 3495, "src": "2030:6:19", "stateVariable": false, "storageLocation": "default", @@ -7429,7 +7429,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3425, + "id": 3477, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2030:4:19", @@ -7444,7 +7444,7 @@ ], "src": "2029:8:19" }, - "scope": 3499, + "scope": 3551, "src": "1977:109:19", "stateMutability": "pure", "superFunction": null, @@ -7452,25 +7452,25 @@ }, { "body": { - "id": 3497, + "id": 3549, "nodeType": "Block", "src": "2710:196:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3461, + "id": 3513, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3452, + "id": 3504, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3450, + "referencedDeclaration": 3502, "src": "2720:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7487,7 +7487,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3457, + "id": 3509, "isConstant": false, "isLValue": false, "isPure": false, @@ -7498,18 +7498,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3455, + "id": 3507, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3453, + "id": 3505, "name": "n", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3447, + "referencedDeclaration": 3499, "src": "2724:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7521,7 +7521,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "32", - "id": 3454, + "id": 3506, "isConstant": false, "isLValue": false, "isPure": true, @@ -7547,7 +7547,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3456, + "id": 3508, "isConstant": false, "isLValue": false, "isPure": true, @@ -7570,18 +7570,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 3459, + "id": 3511, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3347, + "referencedDeclaration": 3399, "src": "2741:3:19", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 3460, + "id": 3512, "isConstant": false, "isLValue": false, "isPure": false, @@ -7590,11 +7590,11 @@ "src": "2724:20:19", "trueExpression": { "argumentTypes": null, - "id": 3458, + "id": 3510, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3445, + "referencedDeclaration": 3497, "src": "2737:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7612,31 +7612,31 @@ "typeString": "uint256" } }, - "id": 3462, + "id": 3514, "nodeType": "ExpressionStatement", "src": "2720:24:19" }, { "body": { - "id": 3495, + "id": 3547, "nodeType": "Block", "src": "2784:116:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3479, + "id": 3531, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3474, + "id": 3526, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3445, + "referencedDeclaration": 3497, "src": "2798:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7650,11 +7650,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3476, + "id": 3528, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3445, + "referencedDeclaration": 3497, "src": "2807:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7663,11 +7663,11 @@ }, { "argumentTypes": null, - "id": 3477, + "id": 3529, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3445, + "referencedDeclaration": 3497, "src": "2810:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7686,18 +7686,18 @@ "typeString": "uint256" } ], - "id": 3475, + "id": 3527, "name": "rmul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3395, + "referencedDeclaration": 3447, "src": "2802:4:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3478, + "id": 3530, "isConstant": false, "isLValue": false, "isPure": false, @@ -7717,7 +7717,7 @@ "typeString": "uint256" } }, - "id": 3480, + "id": 3532, "nodeType": "ExpressionStatement", "src": "2798:14:19" }, @@ -7728,7 +7728,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3485, + "id": 3537, "isConstant": false, "isLValue": false, "isPure": false, @@ -7739,18 +7739,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3483, + "id": 3535, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3481, + "id": 3533, "name": "n", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3447, + "referencedDeclaration": 3499, "src": "2831:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7762,7 +7762,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "32", - "id": 3482, + "id": 3534, "isConstant": false, "isLValue": false, "isPure": true, @@ -7788,7 +7788,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3484, + "id": 3536, "isConstant": false, "isLValue": false, "isPure": true, @@ -7810,29 +7810,29 @@ } }, "falseBody": null, - "id": 3494, + "id": 3546, "nodeType": "IfStatement", "src": "2827:63:19", "trueBody": { - "id": 3493, + "id": 3545, "nodeType": "Block", "src": "2843:47:19", "statements": [ { "expression": { "argumentTypes": null, - "id": 3491, + "id": 3543, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3486, + "id": 3538, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3450, + "referencedDeclaration": 3502, "src": "2861:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7846,11 +7846,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3488, + "id": 3540, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3450, + "referencedDeclaration": 3502, "src": "2870:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7859,11 +7859,11 @@ }, { "argumentTypes": null, - "id": 3489, + "id": 3541, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3445, + "referencedDeclaration": 3497, "src": "2873:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7882,18 +7882,18 @@ "typeString": "uint256" } ], - "id": 3487, + "id": 3539, "name": "rmul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3395, + "referencedDeclaration": 3447, "src": "2865:4:19", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 3490, + "id": 3542, "isConstant": false, "isLValue": false, "isPure": false, @@ -7913,7 +7913,7 @@ "typeString": "uint256" } }, - "id": 3492, + "id": 3544, "nodeType": "ExpressionStatement", "src": "2861:14:19" } @@ -7928,18 +7928,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 3469, + "id": 3521, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3467, + "id": 3519, "name": "n", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3447, + "referencedDeclaration": 3499, "src": "2768:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7951,7 +7951,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 3468, + "id": 3520, "isConstant": false, "isLValue": false, "isPure": true, @@ -7972,22 +7972,22 @@ "typeString": "bool" } }, - "id": 3496, + "id": 3548, "initializationExpression": { "expression": { "argumentTypes": null, - "id": 3465, + "id": 3517, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3463, + "id": 3515, "name": "n", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3447, + "referencedDeclaration": 3499, "src": "2760:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7999,7 +7999,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "32", - "id": 3464, + "id": 3516, "isConstant": false, "isLValue": false, "isPure": true, @@ -8020,25 +8020,25 @@ "typeString": "uint256" } }, - "id": 3466, + "id": 3518, "nodeType": "ExpressionStatement", "src": "2760:6:19" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 3472, + "id": 3524, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3470, + "id": 3522, "name": "n", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3447, + "referencedDeclaration": 3499, "src": "2776:1:19", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8050,7 +8050,7 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "32", - "id": 3471, + "id": 3523, "isConstant": false, "isLValue": false, "isPure": true, @@ -8071,7 +8071,7 @@ "typeString": "uint256" } }, - "id": 3473, + "id": 3525, "nodeType": "ExpressionStatement", "src": "2776:6:19" }, @@ -8081,22 +8081,22 @@ ] }, "documentation": null, - "id": 3498, + "id": 3550, "implemented": true, "kind": "function", "modifiers": [], "name": "rpow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3448, + "id": 3500, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3445, + "id": 3497, "name": "x", "nodeType": "VariableDeclaration", - "scope": 3498, + "scope": 3550, "src": "2663:6:19", "stateVariable": false, "storageLocation": "default", @@ -8105,7 +8105,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3444, + "id": 3496, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2663:4:19", @@ -8119,10 +8119,10 @@ }, { "constant": false, - "id": 3447, + "id": 3499, "name": "n", "nodeType": "VariableDeclaration", - "scope": 3498, + "scope": 3550, "src": "2671:6:19", "stateVariable": false, "storageLocation": "default", @@ -8131,7 +8131,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3446, + "id": 3498, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2671:4:19", @@ -8147,15 +8147,15 @@ "src": "2662:16:19" }, "returnParameters": { - "id": 3451, + "id": 3503, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3450, + "id": 3502, "name": "z", "nodeType": "VariableDeclaration", - "scope": 3498, + "scope": 3550, "src": "2702:6:19", "stateVariable": false, "storageLocation": "default", @@ -8164,7 +8164,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3449, + "id": 3501, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2702:4:19", @@ -8179,14 +8179,14 @@ ], "src": "2701:8:19" }, - "scope": 3499, + "scope": 3551, "src": "2649:257:19", "stateMutability": "pure", "superFunction": null, "visibility": "internal" } ], - "scope": 3500, + "scope": 3552, "src": "722:2186:19" } ], @@ -8198,7 +8198,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.510Z", + "updatedAt": "2020-04-08T12:21:13.746Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DSNote.json b/packages/smart-contracts/artifacts/DSNote.json index ebad282..c86e148 100644 --- a/packages/smart-contracts/artifacts/DSNote.json +++ b/packages/smart-contracts/artifacts/DSNote.json @@ -56,14 +56,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol", "exportedSymbols": { "DSNote": [ - 3542 + 3594 ] }, - "id": 3543, + "id": 3595, "nodeType": "SourceUnit", "nodes": [ { - "id": 3501, + "id": 3553, "literals": [ "solidity", "0.5", @@ -78,9 +78,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3542, + "id": 3594, "linearizedBaseContracts": [ - 3542 + 3594 ], "name": "DSNote", "nodeType": "ContractDefinition", @@ -88,20 +88,20 @@ { "anonymous": true, "documentation": null, - "id": 3515, + "id": 3567, "name": "LogNote", "nodeType": "EventDefinition", "parameters": { - "id": 3514, + "id": 3566, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3503, + "id": 3555, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3515, + "scope": 3567, "src": "779:21:20", "stateVariable": false, "storageLocation": "default", @@ -110,7 +110,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 3502, + "id": 3554, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "779:6:20", @@ -124,11 +124,11 @@ }, { "constant": false, - "id": 3505, + "id": 3557, "indexed": true, "name": "guy", "nodeType": "VariableDeclaration", - "scope": 3515, + "scope": 3567, "src": "810:21:20", "stateVariable": false, "storageLocation": "default", @@ -137,7 +137,7 @@ "typeString": "address" }, "typeName": { - "id": 3504, + "id": 3556, "name": "address", "nodeType": "ElementaryTypeName", "src": "810:7:20", @@ -152,11 +152,11 @@ }, { "constant": false, - "id": 3507, + "id": 3559, "indexed": true, "name": "foo", "nodeType": "VariableDeclaration", - "scope": 3515, + "scope": 3567, "src": "841:21:20", "stateVariable": false, "storageLocation": "default", @@ -165,7 +165,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3506, + "id": 3558, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "841:7:20", @@ -179,11 +179,11 @@ }, { "constant": false, - "id": 3509, + "id": 3561, "indexed": true, "name": "bar", "nodeType": "VariableDeclaration", - "scope": 3515, + "scope": 3567, "src": "872:21:20", "stateVariable": false, "storageLocation": "default", @@ -192,7 +192,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3508, + "id": 3560, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "872:7:20", @@ -206,11 +206,11 @@ }, { "constant": false, - "id": 3511, + "id": 3563, "indexed": false, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 3515, + "scope": 3567, "src": "903:21:20", "stateVariable": false, "storageLocation": "default", @@ -219,7 +219,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3510, + "id": 3562, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "903:7:20", @@ -233,11 +233,11 @@ }, { "constant": false, - "id": 3513, + "id": 3565, "indexed": false, "name": "fax", "nodeType": "VariableDeclaration", - "scope": 3515, + "scope": 3567, "src": "934:21:20", "stateVariable": false, "storageLocation": "default", @@ -246,7 +246,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3512, + "id": 3564, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "934:5:20", @@ -265,21 +265,21 @@ }, { "body": { - "id": 3540, + "id": 3592, "nodeType": "Block", "src": "992:281:20", "statements": [ { "assignments": [ - 3518 + 3570 ], "declarations": [ { "constant": false, - "id": 3518, + "id": 3570, "name": "foo", "nodeType": "VariableDeclaration", - "scope": 3540, + "scope": 3592, "src": "1002:11:20", "stateVariable": false, "storageLocation": "default", @@ -288,7 +288,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3517, + "id": 3569, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1002:7:20", @@ -301,22 +301,22 @@ "visibility": "internal" } ], - "id": 3519, + "id": 3571, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "1002:11:20" }, { "assignments": [ - 3521 + 3573 ], "declarations": [ { "constant": false, - "id": 3521, + "id": 3573, "name": "bar", "nodeType": "VariableDeclaration", - "scope": 3540, + "scope": 3592, "src": "1023:11:20", "stateVariable": false, "storageLocation": "default", @@ -325,7 +325,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3520, + "id": 3572, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1023:7:20", @@ -338,22 +338,22 @@ "visibility": "internal" } ], - "id": 3522, + "id": 3574, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "1023:11:20" }, { "assignments": [ - 3524 + 3576 ], "declarations": [ { "constant": false, - "id": 3524, + "id": 3576, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 3540, + "scope": 3592, "src": "1044:11:20", "stateVariable": false, "storageLocation": "default", @@ -362,7 +362,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3523, + "id": 3575, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1044:7:20", @@ -375,7 +375,7 @@ "visibility": "internal" } ], - "id": 3525, + "id": 3577, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "1044:11:20" @@ -384,7 +384,7 @@ "externalReferences": [ { "foo": { - "declaration": 3518, + "declaration": 3570, "isOffset": false, "isSlot": false, "src": "1089:3:20", @@ -393,7 +393,7 @@ }, { "wad": { - "declaration": 3524, + "declaration": 3576, "isOffset": false, "isSlot": false, "src": "1160:3:20", @@ -402,7 +402,7 @@ }, { "bar": { - "declaration": 3521, + "declaration": 3573, "isOffset": false, "isSlot": false, "src": "1124:3:20", @@ -410,7 +410,7 @@ } } ], - "id": 3526, + "id": 3578, "nodeType": "InlineAssembly", "operations": "{\n foo := calldataload(4)\n bar := calldataload(36)\n wad := callvalue()\n}", "src": "1066:120:20" @@ -423,18 +423,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3528, + "id": 3580, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1209:3:20", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3529, + "id": 3581, "isConstant": false, "isLValue": false, "isPure": false, @@ -452,18 +452,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3530, + "id": 3582, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1218:3:20", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3531, + "id": 3583, "isConstant": false, "isLValue": false, "isPure": false, @@ -479,11 +479,11 @@ }, { "argumentTypes": null, - "id": 3532, + "id": 3584, "name": "foo", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3518, + "referencedDeclaration": 3570, "src": "1230:3:20", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -492,11 +492,11 @@ }, { "argumentTypes": null, - "id": 3533, + "id": 3585, "name": "bar", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3521, + "referencedDeclaration": 3573, "src": "1235:3:20", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -505,11 +505,11 @@ }, { "argumentTypes": null, - "id": 3534, + "id": 3586, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3524, + "referencedDeclaration": 3576, "src": "1240:3:20", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -520,18 +520,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3535, + "id": 3587, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1245:3:20", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3536, + "id": 3588, "isConstant": false, "isLValue": false, "isPure": false, @@ -573,18 +573,18 @@ "typeString": "bytes calldata" } ], - "id": 3527, + "id": 3579, "name": "LogNote", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3515, + "referencedDeclaration": 3567, "src": "1201:7:20", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes4_$_t_address_$_t_bytes32_$_t_bytes32_$_t_uint256_$_t_bytes_memory_ptr_$returns$__$", "typeString": "function (bytes4,address,bytes32,bytes32,uint256,bytes memory)" } }, - "id": 3537, + "id": 3589, "isConstant": false, "isLValue": false, "isPure": false, @@ -598,23 +598,23 @@ "typeString": "tuple()" } }, - "id": 3538, + "id": 3590, "nodeType": "EmitStatement", "src": "1196:58:20" }, { - "id": 3539, + "id": 3591, "nodeType": "PlaceholderStatement", "src": "1265:1:20" } ] }, "documentation": null, - "id": 3541, + "id": 3593, "name": "note", "nodeType": "ModifierDefinition", "parameters": { - "id": 3516, + "id": 3568, "nodeType": "ParameterList", "parameters": [], "src": "992:0:20" @@ -623,7 +623,7 @@ "visibility": "internal" } ], - "scope": 3543, + "scope": 3595, "src": "734:541:20" } ], @@ -633,14 +633,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol", "exportedSymbols": { "DSNote": [ - 3542 + 3594 ] }, - "id": 3543, + "id": 3595, "nodeType": "SourceUnit", "nodes": [ { - "id": 3501, + "id": 3553, "literals": [ "solidity", "0.5", @@ -655,9 +655,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3542, + "id": 3594, "linearizedBaseContracts": [ - 3542 + 3594 ], "name": "DSNote", "nodeType": "ContractDefinition", @@ -665,20 +665,20 @@ { "anonymous": true, "documentation": null, - "id": 3515, + "id": 3567, "name": "LogNote", "nodeType": "EventDefinition", "parameters": { - "id": 3514, + "id": 3566, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3503, + "id": 3555, "indexed": true, "name": "sig", "nodeType": "VariableDeclaration", - "scope": 3515, + "scope": 3567, "src": "779:21:20", "stateVariable": false, "storageLocation": "default", @@ -687,7 +687,7 @@ "typeString": "bytes4" }, "typeName": { - "id": 3502, + "id": 3554, "name": "bytes4", "nodeType": "ElementaryTypeName", "src": "779:6:20", @@ -701,11 +701,11 @@ }, { "constant": false, - "id": 3505, + "id": 3557, "indexed": true, "name": "guy", "nodeType": "VariableDeclaration", - "scope": 3515, + "scope": 3567, "src": "810:21:20", "stateVariable": false, "storageLocation": "default", @@ -714,7 +714,7 @@ "typeString": "address" }, "typeName": { - "id": 3504, + "id": 3556, "name": "address", "nodeType": "ElementaryTypeName", "src": "810:7:20", @@ -729,11 +729,11 @@ }, { "constant": false, - "id": 3507, + "id": 3559, "indexed": true, "name": "foo", "nodeType": "VariableDeclaration", - "scope": 3515, + "scope": 3567, "src": "841:21:20", "stateVariable": false, "storageLocation": "default", @@ -742,7 +742,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3506, + "id": 3558, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "841:7:20", @@ -756,11 +756,11 @@ }, { "constant": false, - "id": 3509, + "id": 3561, "indexed": true, "name": "bar", "nodeType": "VariableDeclaration", - "scope": 3515, + "scope": 3567, "src": "872:21:20", "stateVariable": false, "storageLocation": "default", @@ -769,7 +769,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3508, + "id": 3560, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "872:7:20", @@ -783,11 +783,11 @@ }, { "constant": false, - "id": 3511, + "id": 3563, "indexed": false, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 3515, + "scope": 3567, "src": "903:21:20", "stateVariable": false, "storageLocation": "default", @@ -796,7 +796,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3510, + "id": 3562, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "903:7:20", @@ -810,11 +810,11 @@ }, { "constant": false, - "id": 3513, + "id": 3565, "indexed": false, "name": "fax", "nodeType": "VariableDeclaration", - "scope": 3515, + "scope": 3567, "src": "934:21:20", "stateVariable": false, "storageLocation": "default", @@ -823,7 +823,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3512, + "id": 3564, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "934:5:20", @@ -842,21 +842,21 @@ }, { "body": { - "id": 3540, + "id": 3592, "nodeType": "Block", "src": "992:281:20", "statements": [ { "assignments": [ - 3518 + 3570 ], "declarations": [ { "constant": false, - "id": 3518, + "id": 3570, "name": "foo", "nodeType": "VariableDeclaration", - "scope": 3540, + "scope": 3592, "src": "1002:11:20", "stateVariable": false, "storageLocation": "default", @@ -865,7 +865,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3517, + "id": 3569, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1002:7:20", @@ -878,22 +878,22 @@ "visibility": "internal" } ], - "id": 3519, + "id": 3571, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "1002:11:20" }, { "assignments": [ - 3521 + 3573 ], "declarations": [ { "constant": false, - "id": 3521, + "id": 3573, "name": "bar", "nodeType": "VariableDeclaration", - "scope": 3540, + "scope": 3592, "src": "1023:11:20", "stateVariable": false, "storageLocation": "default", @@ -902,7 +902,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3520, + "id": 3572, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1023:7:20", @@ -915,22 +915,22 @@ "visibility": "internal" } ], - "id": 3522, + "id": 3574, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "1023:11:20" }, { "assignments": [ - 3524 + 3576 ], "declarations": [ { "constant": false, - "id": 3524, + "id": 3576, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 3540, + "scope": 3592, "src": "1044:11:20", "stateVariable": false, "storageLocation": "default", @@ -939,7 +939,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3523, + "id": 3575, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1044:7:20", @@ -952,7 +952,7 @@ "visibility": "internal" } ], - "id": 3525, + "id": 3577, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "1044:11:20" @@ -961,7 +961,7 @@ "externalReferences": [ { "foo": { - "declaration": 3518, + "declaration": 3570, "isOffset": false, "isSlot": false, "src": "1089:3:20", @@ -970,7 +970,7 @@ }, { "wad": { - "declaration": 3524, + "declaration": 3576, "isOffset": false, "isSlot": false, "src": "1160:3:20", @@ -979,7 +979,7 @@ }, { "bar": { - "declaration": 3521, + "declaration": 3573, "isOffset": false, "isSlot": false, "src": "1124:3:20", @@ -987,7 +987,7 @@ } } ], - "id": 3526, + "id": 3578, "nodeType": "InlineAssembly", "operations": "{\n foo := calldataload(4)\n bar := calldataload(36)\n wad := callvalue()\n}", "src": "1066:120:20" @@ -1000,18 +1000,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3528, + "id": 3580, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1209:3:20", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3529, + "id": 3581, "isConstant": false, "isLValue": false, "isPure": false, @@ -1029,18 +1029,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3530, + "id": 3582, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1218:3:20", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3531, + "id": 3583, "isConstant": false, "isLValue": false, "isPure": false, @@ -1056,11 +1056,11 @@ }, { "argumentTypes": null, - "id": 3532, + "id": 3584, "name": "foo", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3518, + "referencedDeclaration": 3570, "src": "1230:3:20", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1069,11 +1069,11 @@ }, { "argumentTypes": null, - "id": 3533, + "id": 3585, "name": "bar", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3521, + "referencedDeclaration": 3573, "src": "1235:3:20", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -1082,11 +1082,11 @@ }, { "argumentTypes": null, - "id": 3534, + "id": 3586, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3524, + "referencedDeclaration": 3576, "src": "1240:3:20", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1097,18 +1097,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3535, + "id": 3587, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "1245:3:20", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3536, + "id": 3588, "isConstant": false, "isLValue": false, "isPure": false, @@ -1150,18 +1150,18 @@ "typeString": "bytes calldata" } ], - "id": 3527, + "id": 3579, "name": "LogNote", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3515, + "referencedDeclaration": 3567, "src": "1201:7:20", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes4_$_t_address_$_t_bytes32_$_t_bytes32_$_t_uint256_$_t_bytes_memory_ptr_$returns$__$", "typeString": "function (bytes4,address,bytes32,bytes32,uint256,bytes memory)" } }, - "id": 3537, + "id": 3589, "isConstant": false, "isLValue": false, "isPure": false, @@ -1175,23 +1175,23 @@ "typeString": "tuple()" } }, - "id": 3538, + "id": 3590, "nodeType": "EmitStatement", "src": "1196:58:20" }, { - "id": 3539, + "id": 3591, "nodeType": "PlaceholderStatement", "src": "1265:1:20" } ] }, "documentation": null, - "id": 3541, + "id": 3593, "name": "note", "nodeType": "ModifierDefinition", "parameters": { - "id": 3516, + "id": 3568, "nodeType": "ParameterList", "parameters": [], "src": "992:0:20" @@ -1200,7 +1200,7 @@ "visibility": "internal" } ], - "scope": 3543, + "scope": 3595, "src": "734:541:20" } ], @@ -1212,7 +1212,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.515Z", + "updatedAt": "2020-04-08T12:21:13.750Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DSProxy.json b/packages/smart-contracts/artifacts/DSProxy.json index 5e7a423..991fe55 100644 --- a/packages/smart-contracts/artifacts/DSProxy.json +++ b/packages/smart-contracts/artifacts/DSProxy.json @@ -252,20 +252,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol", "exportedSymbols": { "DSProxy": [ - 3660 + 3712 ], "DSProxyCache": [ - 3788 + 3840 ], "DSProxyFactory": [ - 3744 + 3796 ] }, - "id": 3789, + "id": 3841, "nodeType": "SourceUnit", "nodes": [ { - "id": 3544, + "id": 3596, "literals": [ "solidity", ">=", @@ -281,10 +281,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "file": "./Auth.sol", - "id": 3545, + "id": 3597, "nodeType": "ImportDirective", - "scope": 3789, - "sourceUnit": 2925, + "scope": 3841, + "sourceUnit": 2977, "src": "785:20:21", "symbolAliases": [], "unitAlias": "" @@ -292,10 +292,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol", "file": "./Note.sol", - "id": 3546, + "id": 3598, "nodeType": "ImportDirective", - "scope": 3789, - "sourceUnit": 3543, + "scope": 3841, + "sourceUnit": 3595, "src": "806:20:21", "symbolAliases": [], "unitAlias": "" @@ -306,17 +306,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3547, + "id": 3599, "name": "DSAuth", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2924, + "referencedDeclaration": 2976, "src": "1088:6:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } }, - "id": 3548, + "id": 3600, "nodeType": "InheritanceSpecifier", "src": "1088:6:21" }, @@ -324,61 +324,61 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3549, + "id": 3601, "name": "DSNote", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3542, + "referencedDeclaration": 3594, "src": "1096:6:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSNote_$3542", + "typeIdentifier": "t_contract$_DSNote_$3594", "typeString": "contract DSNote" } }, - "id": 3550, + "id": 3602, "nodeType": "InheritanceSpecifier", "src": "1096:6:21" } ], "contractDependencies": [ - 2808, - 2924, - 3542 + 2860, + 2976, + 3594 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3660, + "id": 3712, "linearizedBaseContracts": [ - 3660, - 3542, - 2924, - 2808 + 3712, + 3594, + 2976, + 2860 ], "name": "DSProxy", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3552, + "id": 3604, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3660, + "scope": 3712, "src": "1109:25:21", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 3551, + "id": 3603, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "1109:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -387,7 +387,7 @@ }, { "body": { - "id": 3561, + "id": 3613, "nodeType": "Block", "src": "1211:37:21", "statements": [ @@ -397,11 +397,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3558, + "id": 3610, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3554, + "referencedDeclaration": 3606, "src": "1230:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -416,18 +416,18 @@ "typeString": "address" } ], - "id": 3557, + "id": 3609, "name": "setCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3659, + "referencedDeclaration": 3711, "src": "1221:8:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_bool_$", "typeString": "function (address) returns (bool)" } }, - "id": 3559, + "id": 3611, "isConstant": false, "isLValue": false, "isPure": false, @@ -441,29 +441,29 @@ "typeString": "bool" } }, - "id": 3560, + "id": 3612, "nodeType": "ExpressionStatement", "src": "1221:20:21" } ] }, "documentation": null, - "id": 3562, + "id": 3614, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3555, + "id": 3607, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3554, + "id": 3606, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 3562, + "scope": 3614, "src": "1184:18:21", "stateVariable": false, "storageLocation": "default", @@ -472,7 +472,7 @@ "typeString": "address" }, "typeName": { - "id": 3553, + "id": 3605, "name": "address", "nodeType": "ElementaryTypeName", "src": "1184:7:21", @@ -489,12 +489,12 @@ "src": "1183:20:21" }, "returnParameters": { - "id": 3556, + "id": 3608, "nodeType": "ParameterList", "parameters": [], "src": "1211:0:21" }, - "scope": 3660, + "scope": 3712, "src": "1172:76:21", "stateMutability": "nonpayable", "superFunction": null, @@ -502,31 +502,31 @@ }, { "body": { - "id": 3565, + "id": 3617, "nodeType": "Block", "src": "1282:7:21", "statements": [] }, "documentation": null, - "id": 3566, + "id": 3618, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3563, + "id": 3615, "nodeType": "ParameterList", "parameters": [], "src": "1262:2:21" }, "returnParameters": { - "id": 3564, + "id": 3616, "nodeType": "ParameterList", "parameters": [], "src": "1282:0:21" }, - "scope": 3660, + "scope": 3712, "src": "1254:35:21", "stateMutability": "payable", "superFunction": null, @@ -534,25 +534,25 @@ }, { "body": { - "id": 3605, + "id": 3657, "nodeType": "Block", "src": "1508:234:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3582, + "id": 3634, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3577, + "id": 3629, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1518:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -566,11 +566,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3580, + "id": 3632, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3568, + "referencedDeclaration": 3620, "src": "1538:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -587,32 +587,32 @@ ], "expression": { "argumentTypes": null, - "id": 3578, + "id": 3630, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "1527:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3579, + "id": 3631, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "read", "nodeType": "MemberAccess", - "referencedDeclaration": 3766, + "referencedDeclaration": 3818, "src": "1527:10:21", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes_memory_ptr_$returns$_t_address_$", "typeString": "function (bytes memory) view external returns (address)" } }, - "id": 3581, + "id": 3633, "isConstant": false, "isLValue": false, "isPure": false, @@ -632,7 +632,7 @@ "typeString": "address" } }, - "id": 3583, + "id": 3635, "nodeType": "ExpressionStatement", "src": "1518:26:21" }, @@ -643,18 +643,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3588, + "id": 3640, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3584, + "id": 3636, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1558:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -669,7 +669,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3586, + "id": 3638, "isConstant": false, "isLValue": false, "isPure": true, @@ -692,7 +692,7 @@ "typeString": "int_const 0" } ], - "id": 3585, + "id": 3637, "isConstant": false, "isLValue": false, "isPure": true, @@ -705,7 +705,7 @@ }, "typeName": "address" }, - "id": 3587, + "id": 3639, "isConstant": false, "isLValue": false, "isPure": true, @@ -726,29 +726,29 @@ } }, "falseBody": null, - "id": 3597, + "id": 3649, "nodeType": "IfStatement", "src": "1554:138:21", "trueBody": { - "id": 3596, + "id": 3648, "nodeType": "Block", "src": "1580:112:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3594, + "id": 3646, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3589, + "id": 3641, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1654:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -762,11 +762,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3592, + "id": 3644, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3568, + "referencedDeclaration": 3620, "src": "1675:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -783,32 +783,32 @@ ], "expression": { "argumentTypes": null, - "id": 3590, + "id": 3642, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "1663:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3591, + "id": 3643, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "write", "nodeType": "MemberAccess", - "referencedDeclaration": 3787, + "referencedDeclaration": 3839, "src": "1663:11:21", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes_memory_ptr_$returns$_t_address_$", "typeString": "function (bytes memory) external returns (address)" } }, - "id": 3593, + "id": 3645, "isConstant": false, "isLValue": false, "isPure": false, @@ -828,7 +828,7 @@ "typeString": "address" } }, - "id": 3595, + "id": 3647, "nodeType": "ExpressionStatement", "src": "1654:27:21" } @@ -838,18 +838,18 @@ { "expression": { "argumentTypes": null, - "id": 3603, + "id": 3655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3598, + "id": 3650, "name": "response", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3575, + "referencedDeclaration": 3627, "src": "1702:8:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -863,11 +863,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3600, + "id": 3652, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1721:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -876,11 +876,11 @@ }, { "argumentTypes": null, - "id": 3601, + "id": 3653, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3570, + "referencedDeclaration": 3622, "src": "1729:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -899,21 +899,21 @@ "typeString": "bytes memory" } ], - "id": 3599, + "id": 3651, "name": "execute", "nodeType": "Identifier", "overloadedDeclarations": [ - 3606, - 3630 + 3658, + 3682 ], - "referencedDeclaration": 3630, + "referencedDeclaration": 3682, "src": "1713:7:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$", "typeString": "function (address,bytes memory) returns (bytes memory)" } }, - "id": 3602, + "id": 3654, "isConstant": false, "isLValue": false, "isPure": false, @@ -933,29 +933,29 @@ "typeString": "bytes memory" } }, - "id": 3604, + "id": 3656, "nodeType": "ExpressionStatement", "src": "1702:33:21" } ] }, "documentation": null, - "id": 3606, + "id": 3658, "implemented": true, "kind": "function", "modifiers": [], "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 3571, + "id": 3623, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3568, + "id": 3620, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1377:18:21", "stateVariable": false, "storageLocation": "memory", @@ -964,7 +964,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3567, + "id": 3619, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1377:5:21", @@ -978,10 +978,10 @@ }, { "constant": false, - "id": 3570, + "id": 3622, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1397:18:21", "stateVariable": false, "storageLocation": "memory", @@ -990,7 +990,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3569, + "id": 3621, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1397:5:21", @@ -1006,15 +1006,15 @@ "src": "1376:40:21" }, "returnParameters": { - "id": 3576, + "id": 3628, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3573, + "id": 3625, "name": "target", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1465:14:21", "stateVariable": false, "storageLocation": "default", @@ -1023,7 +1023,7 @@ "typeString": "address" }, "typeName": { - "id": 3572, + "id": 3624, "name": "address", "nodeType": "ElementaryTypeName", "src": "1465:7:21", @@ -1038,10 +1038,10 @@ }, { "constant": false, - "id": 3575, + "id": 3627, "name": "response", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1481:21:21", "stateVariable": false, "storageLocation": "memory", @@ -1050,7 +1050,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3574, + "id": 3626, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1481:5:21", @@ -1065,7 +1065,7 @@ ], "src": "1464:39:21" }, - "scope": 3660, + "scope": 3712, "src": "1360:382:21", "stateMutability": "payable", "superFunction": null, @@ -1073,7 +1073,7 @@ }, { "body": { - "id": 3629, + "id": 3681, "nodeType": "Block", "src": "1903:685:21", "statements": [ @@ -1087,18 +1087,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3624, + "id": 3676, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3620, + "id": 3672, "name": "_target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3608, + "referencedDeclaration": 3660, "src": "1921:7:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1113,7 +1113,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3622, + "id": 3674, "isConstant": false, "isLValue": false, "isPure": true, @@ -1136,7 +1136,7 @@ "typeString": "int_const 0" } ], - "id": 3621, + "id": 3673, "isConstant": false, "isLValue": false, "isPure": true, @@ -1149,7 +1149,7 @@ }, "typeName": "address" }, - "id": 3623, + "id": 3675, "isConstant": false, "isLValue": false, "isPure": true, @@ -1172,7 +1172,7 @@ { "argumentTypes": null, "hexValue": "64732d70726f78792d7461726765742d616464726573732d7265717569726564", - "id": 3625, + "id": 3677, "isConstant": false, "isLValue": false, "isPure": true, @@ -1199,21 +1199,21 @@ "typeString": "literal_string \"ds-proxy-target-address-required\"" } ], - "id": 3619, + "id": 3671, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1913:7:21", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3626, + "id": 3678, "isConstant": false, "isLValue": false, "isPure": false, @@ -1227,7 +1227,7 @@ "typeString": "tuple()" } }, - "id": 3627, + "id": 3679, "nodeType": "ExpressionStatement", "src": "1913:66:21" }, @@ -1235,7 +1235,7 @@ "externalReferences": [ { "_data": { - "declaration": 3610, + "declaration": 3662, "isOffset": false, "isSlot": false, "src": "2136:5:21", @@ -1244,7 +1244,7 @@ }, { "_data": { - "declaration": 3610, + "declaration": 3662, "isOffset": false, "isSlot": false, "src": "2116:5:21", @@ -1253,7 +1253,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2202:8:21", @@ -1262,7 +1262,7 @@ }, { "_target": { - "declaration": 3608, + "declaration": 3660, "isOffset": false, "isSlot": false, "src": "2103:7:21", @@ -1271,7 +1271,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2376:8:21", @@ -1280,7 +1280,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2329:8:21", @@ -1289,7 +1289,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2255:8:21", @@ -1298,7 +1298,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2536:8:21", @@ -1306,7 +1306,7 @@ } } ], - "id": 3628, + "id": 3680, "nodeType": "InlineAssembly", "operations": "{\n let succeeded := delegatecall(sub(gas(), 5000), _target, add(_data, 0x20), mload(_data), 0, 0)\n let size := returndatasize()\n response := mload(0x40)\n mstore(0x40, add(response, and(add(add(size, 0x20), 0x1f), not(0x1f))))\n mstore(response, size)\n returndatacopy(add(response, 0x20), 0, size)\n switch iszero(succeeded)\n case 1 {\n revert(add(response, 0x20), size)\n }\n}", "src": "2034:548:21" @@ -1314,20 +1314,20 @@ ] }, "documentation": null, - "id": 3630, + "id": 3682, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3613, + "id": 3665, "modifierName": { "argumentTypes": null, - "id": 3612, + "id": 3664, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1825:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -1339,14 +1339,14 @@ }, { "arguments": null, - "id": 3615, + "id": 3667, "modifierName": { "argumentTypes": null, - "id": 3614, + "id": 3666, "name": "note", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, + "referencedDeclaration": 3593, "src": "1838:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -1360,15 +1360,15 @@ "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 3611, + "id": 3663, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3608, + "id": 3660, "name": "_target", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1765:15:21", "stateVariable": false, "storageLocation": "default", @@ -1377,7 +1377,7 @@ "typeString": "address" }, "typeName": { - "id": 3607, + "id": 3659, "name": "address", "nodeType": "ElementaryTypeName", "src": "1765:7:21", @@ -1392,10 +1392,10 @@ }, { "constant": false, - "id": 3610, + "id": 3662, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1782:18:21", "stateVariable": false, "storageLocation": "memory", @@ -1404,7 +1404,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3609, + "id": 3661, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1782:5:21", @@ -1420,15 +1420,15 @@ "src": "1764:37:21" }, "returnParameters": { - "id": 3618, + "id": 3670, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3617, + "id": 3669, "name": "response", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1876:21:21", "stateVariable": false, "storageLocation": "memory", @@ -1437,7 +1437,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3616, + "id": 3668, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1876:5:21", @@ -1452,7 +1452,7 @@ ], "src": "1875:23:21" }, - "scope": 3660, + "scope": 3712, "src": "1748:840:21", "stateMutability": "payable", "superFunction": null, @@ -1460,7 +1460,7 @@ }, { "body": { - "id": 3658, + "id": 3710, "nodeType": "Block", "src": "2720:168:21", "statements": [ @@ -1474,18 +1474,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3646, + "id": 3698, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3642, + "id": 3694, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, + "referencedDeclaration": 3684, "src": "2738:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1500,7 +1500,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3644, + "id": 3696, "isConstant": false, "isLValue": false, "isPure": true, @@ -1523,7 +1523,7 @@ "typeString": "int_const 0" } ], - "id": 3643, + "id": 3695, "isConstant": false, "isLValue": false, "isPure": true, @@ -1536,7 +1536,7 @@ }, "typeName": "address" }, - "id": 3645, + "id": 3697, "isConstant": false, "isLValue": false, "isPure": true, @@ -1559,7 +1559,7 @@ { "argumentTypes": null, "hexValue": "64732d70726f78792d63616368652d616464726573732d7265717569726564", - "id": 3647, + "id": 3699, "isConstant": false, "isLValue": false, "isPure": true, @@ -1586,21 +1586,21 @@ "typeString": "literal_string \"ds-proxy-cache-address-required\"" } ], - "id": 3641, + "id": 3693, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2730:7:21", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3648, + "id": 3700, "isConstant": false, "isLValue": false, "isPure": false, @@ -1614,28 +1614,28 @@ "typeString": "tuple()" } }, - "id": 3649, + "id": 3701, "nodeType": "ExpressionStatement", "src": "2730:68:21" }, { "expression": { "argumentTypes": null, - "id": 3654, + "id": 3706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3650, + "id": 3702, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "2808:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -1646,11 +1646,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3652, + "id": 3704, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, + "referencedDeclaration": 3684, "src": "2829:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1665,18 +1665,18 @@ "typeString": "address" } ], - "id": 3651, + "id": 3703, "name": "DSProxyCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "2816:12:21", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_type$_t_contract$_DSProxyCache_$3840_$", "typeString": "type(contract DSProxyCache)" } }, - "id": 3653, + "id": 3705, "isConstant": false, "isLValue": false, "isPure": false, @@ -1686,17 +1686,17 @@ "nodeType": "FunctionCall", "src": "2816:24:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "2808:32:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3655, + "id": 3707, "nodeType": "ExpressionStatement", "src": "2808:32:21" }, @@ -1704,7 +1704,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3656, + "id": 3708, "isConstant": false, "isLValue": false, "isPure": true, @@ -1719,28 +1719,28 @@ }, "value": "true" }, - "functionReturnParameters": 3640, - "id": 3657, + "functionReturnParameters": 3692, + "id": 3709, "nodeType": "Return", "src": "2870:11:21" } ] }, "documentation": null, - "id": 3659, + "id": 3711, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3635, + "id": 3687, "modifierName": { "argumentTypes": null, - "id": 3634, + "id": 3686, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "2675:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -1752,14 +1752,14 @@ }, { "arguments": null, - "id": 3637, + "id": 3689, "modifierName": { "argumentTypes": null, - "id": 3636, + "id": 3688, "name": "note", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, + "referencedDeclaration": 3593, "src": "2688:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -1773,15 +1773,15 @@ "name": "setCache", "nodeType": "FunctionDefinition", "parameters": { - "id": 3633, + "id": 3685, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3632, + "id": 3684, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 3659, + "scope": 3711, "src": "2632:18:21", "stateVariable": false, "storageLocation": "default", @@ -1790,7 +1790,7 @@ "typeString": "address" }, "typeName": { - "id": 3631, + "id": 3683, "name": "address", "nodeType": "ElementaryTypeName", "src": "2632:7:21", @@ -1807,15 +1807,15 @@ "src": "2631:20:21" }, "returnParameters": { - "id": 3640, + "id": 3692, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3639, + "id": 3691, "name": "", "nodeType": "VariableDeclaration", - "scope": 3659, + "scope": 3711, "src": "2710:4:21", "stateVariable": false, "storageLocation": "default", @@ -1824,7 +1824,7 @@ "typeString": "bool" }, "typeName": { - "id": 3638, + "id": 3690, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2710:4:21", @@ -1839,28 +1839,28 @@ ], "src": "2709:6:21" }, - "scope": 3660, + "scope": 3712, "src": "2614:274:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "1068:1822:21" }, { "baseContracts": [], "contractDependencies": [ - 3660, - 3788 + 3712, + 3840 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3744, + "id": 3796, "linearizedBaseContracts": [ - 3744 + 3796 ], "name": "DSProxyFactory", "nodeType": "ContractDefinition", @@ -1868,20 +1868,20 @@ { "anonymous": false, "documentation": null, - "id": 3670, + "id": 3722, "name": "Created", "nodeType": "EventDefinition", "parameters": { - "id": 3669, + "id": 3721, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3662, + "id": 3714, "indexed": true, "name": "sender", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3053:22:21", "stateVariable": false, "storageLocation": "default", @@ -1890,7 +1890,7 @@ "typeString": "address" }, "typeName": { - "id": 3661, + "id": 3713, "name": "address", "nodeType": "ElementaryTypeName", "src": "3053:7:21", @@ -1905,11 +1905,11 @@ }, { "constant": false, - "id": 3664, + "id": 3716, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3077:21:21", "stateVariable": false, "storageLocation": "default", @@ -1918,7 +1918,7 @@ "typeString": "address" }, "typeName": { - "id": 3663, + "id": 3715, "name": "address", "nodeType": "ElementaryTypeName", "src": "3077:7:21", @@ -1933,11 +1933,11 @@ }, { "constant": false, - "id": 3666, + "id": 3718, "indexed": false, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3100:13:21", "stateVariable": false, "storageLocation": "default", @@ -1946,7 +1946,7 @@ "typeString": "address" }, "typeName": { - "id": 3665, + "id": 3717, "name": "address", "nodeType": "ElementaryTypeName", "src": "3100:7:21", @@ -1961,11 +1961,11 @@ }, { "constant": false, - "id": 3668, + "id": 3720, "indexed": false, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3115:13:21", "stateVariable": false, "storageLocation": "default", @@ -1974,7 +1974,7 @@ "typeString": "address" }, "typeName": { - "id": 3667, + "id": 3719, "name": "address", "nodeType": "ElementaryTypeName", "src": "3115:7:21", @@ -1994,10 +1994,10 @@ }, { "constant": false, - "id": 3674, + "id": 3726, "name": "proxies", "nodeType": "VariableDeclaration", - "scope": 3744, + "scope": 3796, "src": "3135:40:21", "stateVariable": true, "storageLocation": "default", @@ -2006,9 +2006,9 @@ "typeString": "mapping(address => address)" }, "typeName": { - "id": 3673, + "id": 3725, "keyType": { - "id": 3671, + "id": 3723, "name": "address", "nodeType": "ElementaryTypeName", "src": "3143:7:21", @@ -2024,7 +2024,7 @@ "typeString": "mapping(address => address)" }, "valueType": { - "id": 3672, + "id": 3724, "name": "address", "nodeType": "ElementaryTypeName", "src": "3152:7:21", @@ -2040,26 +2040,26 @@ }, { "constant": false, - "id": 3676, + "id": 3728, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3744, + "scope": 3796, "src": "3181:25:21", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 3675, + "id": 3727, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "3181:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -2068,28 +2068,28 @@ }, { "body": { - "id": 3685, + "id": 3737, "nodeType": "Block", "src": "3234:43:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3683, + "id": 3735, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3679, + "id": 3731, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3244:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -2100,7 +2100,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3681, + "id": 3733, "isConstant": false, "isLValue": false, "isPure": false, @@ -2108,23 +2108,23 @@ "nodeType": "NewExpression", "src": "3252:16:21", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3840_$", "typeString": "function () returns (contract DSProxyCache)" }, "typeName": { "contractScope": null, - "id": 3680, + "id": 3732, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "3256:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } }, - "id": 3682, + "id": 3734, "isConstant": false, "isLValue": false, "isPure": false, @@ -2134,42 +2134,42 @@ "nodeType": "FunctionCall", "src": "3252:18:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "3244:26:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3684, + "id": 3736, "nodeType": "ExpressionStatement", "src": "3244:26:21" } ] }, "documentation": null, - "id": 3686, + "id": 3738, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3677, + "id": 3729, "nodeType": "ParameterList", "parameters": [], "src": "3224:2:21" }, "returnParameters": { - "id": 3678, + "id": 3730, "nodeType": "ParameterList", "parameters": [], "src": "3234:0:21" }, - "scope": 3744, + "scope": 3796, "src": "3213:64:21", "stateMutability": "nonpayable", "superFunction": null, @@ -2177,25 +2177,25 @@ }, { "body": { - "id": 3698, + "id": 3750, "nodeType": "Block", "src": "3412:42:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3696, + "id": 3748, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3691, + "id": 3743, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, + "referencedDeclaration": 3741, "src": "3422:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2211,18 +2211,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3693, + "id": 3745, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "3436:3:21", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3694, + "id": 3746, "isConstant": false, "isLValue": false, "isPure": false, @@ -2244,21 +2244,21 @@ "typeString": "address payable" } ], - "id": 3692, + "id": 3744, "name": "build", "nodeType": "Identifier", "overloadedDeclarations": [ - 3699, - 3743 + 3751, + 3795 ], - "referencedDeclaration": 3743, + "referencedDeclaration": 3795, "src": "3430:5:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_address_payable_$", "typeString": "function (address) returns (address payable)" } }, - "id": 3695, + "id": 3747, "isConstant": false, "isLValue": false, "isPure": false, @@ -2278,35 +2278,35 @@ "typeString": "address payable" } }, - "id": 3697, + "id": 3749, "nodeType": "ExpressionStatement", "src": "3422:25:21" } ] }, "documentation": null, - "id": 3699, + "id": 3751, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 3687, + "id": 3739, "nodeType": "ParameterList", "parameters": [], "src": "3370:2:21" }, "returnParameters": { - "id": 3690, + "id": 3742, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3689, + "id": 3741, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3699, + "scope": 3751, "src": "3389:21:21", "stateVariable": false, "storageLocation": "default", @@ -2315,7 +2315,7 @@ "typeString": "address payable" }, "typeName": { - "id": 3688, + "id": 3740, "name": "address", "nodeType": "ElementaryTypeName", "src": "3389:15:21", @@ -2331,7 +2331,7 @@ ], "src": "3388:23:21" }, - "scope": 3744, + "scope": 3796, "src": "3356:98:21", "stateMutability": "nonpayable", "superFunction": null, @@ -2339,25 +2339,25 @@ }, { "body": { - "id": 3742, + "id": 3794, "nodeType": "Block", "src": "3599:206:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3715, + "id": 3767, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3706, + "id": 3758, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3609:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2377,14 +2377,14 @@ "arguments": [ { "argumentTypes": null, - "id": 3711, + "id": 3763, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3645:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -2392,11 +2392,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 3710, + "id": 3762, "isConstant": false, "isLValue": false, "isPure": true, @@ -2409,7 +2409,7 @@ }, "typeName": "address" }, - "id": 3712, + "id": 3764, "isConstant": false, "isLValue": false, "isPure": false, @@ -2431,7 +2431,7 @@ "typeString": "address" } ], - "id": 3709, + "id": 3761, "isConstant": false, "isLValue": false, "isPure": false, @@ -2439,23 +2439,23 @@ "nodeType": "NewExpression", "src": "3625:11:21", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DSProxy_$3660_$", + "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DSProxy_$3712_$", "typeString": "function (address) returns (contract DSProxy)" }, "typeName": { "contractScope": null, - "id": 3708, + "id": 3760, "name": "DSProxy", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "3629:7:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } } }, - "id": 3713, + "id": 3765, "isConstant": false, "isLValue": false, "isPure": false, @@ -2465,7 +2465,7 @@ "nodeType": "FunctionCall", "src": "3625:27:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } } @@ -2473,11 +2473,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } ], - "id": 3707, + "id": 3759, "isConstant": false, "isLValue": false, "isPure": true, @@ -2490,7 +2490,7 @@ }, "typeName": "address" }, - "id": 3714, + "id": 3766, "isConstant": false, "isLValue": false, "isPure": false, @@ -2510,7 +2510,7 @@ "typeString": "address payable" } }, - "id": 3716, + "id": 3768, "nodeType": "ExpressionStatement", "src": "3609:44:21" }, @@ -2522,18 +2522,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3718, + "id": 3770, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "3676:3:21", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3719, + "id": 3771, "isConstant": false, "isLValue": false, "isPure": false, @@ -2549,11 +2549,11 @@ }, { "argumentTypes": null, - "id": 3720, + "id": 3772, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3688:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2565,11 +2565,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3722, + "id": 3774, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3703:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2584,7 +2584,7 @@ "typeString": "address payable" } ], - "id": 3721, + "id": 3773, "isConstant": false, "isLValue": false, "isPure": true, @@ -2597,7 +2597,7 @@ }, "typeName": "address" }, - "id": 3723, + "id": 3775, "isConstant": false, "isLValue": false, "isPure": false, @@ -2616,14 +2616,14 @@ "arguments": [ { "argumentTypes": null, - "id": 3725, + "id": 3777, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3719:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -2631,11 +2631,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 3724, + "id": 3776, "isConstant": false, "isLValue": false, "isPure": true, @@ -2648,7 +2648,7 @@ }, "typeName": "address" }, - "id": 3726, + "id": 3778, "isConstant": false, "isLValue": false, "isPure": false, @@ -2682,18 +2682,18 @@ "typeString": "address" } ], - "id": 3717, + "id": 3769, "name": "Created", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3670, + "referencedDeclaration": 3722, "src": "3668:7:21", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_address_$returns$__$", "typeString": "function (address,address,address,address)" } }, - "id": 3727, + "id": 3779, "isConstant": false, "isLValue": false, "isPure": false, @@ -2707,7 +2707,7 @@ "typeString": "tuple()" } }, - "id": 3728, + "id": 3780, "nodeType": "EmitStatement", "src": "3663:63:21" }, @@ -2717,11 +2717,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3733, + "id": 3785, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3760:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2741,11 +2741,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3730, + "id": 3782, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3744:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2760,18 +2760,18 @@ "typeString": "address payable" } ], - "id": 3729, + "id": 3781, "name": "DSProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "3736:7:21", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSProxy_$3660_$", + "typeIdentifier": "t_type$_t_contract$_DSProxy_$3712_$", "typeString": "type(contract DSProxy)" } }, - "id": 3731, + "id": 3783, "isConstant": false, "isLValue": false, "isPure": false, @@ -2781,25 +2781,25 @@ "nodeType": "FunctionCall", "src": "3736:14:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } }, - "id": 3732, + "id": 3784, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "3736:23:21", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 3734, + "id": 3786, "isConstant": false, "isLValue": false, "isPure": false, @@ -2813,14 +2813,14 @@ "typeString": "tuple()" } }, - "id": 3735, + "id": 3787, "nodeType": "ExpressionStatement", "src": "3736:30:21" }, { "expression": { "argumentTypes": null, - "id": 3740, + "id": 3792, "isConstant": false, "isLValue": false, "isPure": false, @@ -2829,25 +2829,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3736, + "id": 3788, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3674, + "referencedDeclaration": 3726, "src": "3776:7:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 3738, + "id": 3790, "indexExpression": { "argumentTypes": null, - "id": 3737, + "id": 3789, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3784:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2869,11 +2869,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3739, + "id": 3791, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3793:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2886,29 +2886,29 @@ "typeString": "address" } }, - "id": 3741, + "id": 3793, "nodeType": "ExpressionStatement", "src": "3776:22:21" } ] }, "documentation": null, - "id": 3743, + "id": 3795, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 3702, + "id": 3754, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3701, + "id": 3753, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3743, + "scope": 3795, "src": "3545:13:21", "stateVariable": false, "storageLocation": "default", @@ -2917,7 +2917,7 @@ "typeString": "address" }, "typeName": { - "id": 3700, + "id": 3752, "name": "address", "nodeType": "ElementaryTypeName", "src": "3545:7:21", @@ -2934,15 +2934,15 @@ "src": "3544:15:21" }, "returnParameters": { - "id": 3705, + "id": 3757, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3704, + "id": 3756, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3743, + "scope": 3795, "src": "3576:21:21", "stateVariable": false, "storageLocation": "default", @@ -2951,7 +2951,7 @@ "typeString": "address payable" }, "typeName": { - "id": 3703, + "id": 3755, "name": "address", "nodeType": "ElementaryTypeName", "src": "3576:15:21", @@ -2967,14 +2967,14 @@ ], "src": "3575:23:21" }, - "scope": 3744, + "scope": 3796, "src": "3530:275:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "3009:798:21" }, { @@ -2983,19 +2983,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3788, + "id": 3840, "linearizedBaseContracts": [ - 3788 + 3840 ], "name": "DSProxyCache", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3748, + "id": 3800, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3788, + "scope": 3840, "src": "4263:33:21", "stateVariable": true, "storageLocation": "default", @@ -3004,9 +3004,9 @@ "typeString": "mapping(bytes32 => address)" }, "typeName": { - "id": 3747, + "id": 3799, "keyType": { - "id": 3745, + "id": 3797, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4271:7:21", @@ -3022,7 +3022,7 @@ "typeString": "mapping(bytes32 => address)" }, "valueType": { - "id": 3746, + "id": 3798, "name": "address", "nodeType": "ElementaryTypeName", "src": "4282:7:21", @@ -3038,21 +3038,21 @@ }, { "body": { - "id": 3765, + "id": 3817, "nodeType": "Block", "src": "4367:76:21", "statements": [ { "assignments": [ - 3756 + 3808 ], "declarations": [ { "constant": false, - "id": 3756, + "id": 3808, "name": "hash", "nodeType": "VariableDeclaration", - "scope": 3765, + "scope": 3817, "src": "4377:12:21", "stateVariable": false, "storageLocation": "default", @@ -3061,7 +3061,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3755, + "id": 3807, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4377:7:21", @@ -3074,17 +3074,17 @@ "visibility": "internal" } ], - "id": 3760, + "id": 3812, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3758, + "id": 3810, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3750, + "referencedDeclaration": 3802, "src": "4402:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3099,18 +3099,18 @@ "typeString": "bytes memory" } ], - "id": 3757, + "id": 3809, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7821, + "referencedDeclaration": 7812, "src": "4392:9:21", "typeDescriptions": { "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$", "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 3759, + "id": 3811, "isConstant": false, "isLValue": false, "isPure": false, @@ -3132,25 +3132,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3761, + "id": 3813, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3748, + "referencedDeclaration": 3800, "src": "4425:5:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_address_$", "typeString": "mapping(bytes32 => address)" } }, - "id": 3763, + "id": 3815, "indexExpression": { "argumentTypes": null, - "id": 3762, + "id": 3814, "name": "hash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3756, + "referencedDeclaration": 3808, "src": "4431:4:21", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -3168,30 +3168,30 @@ "typeString": "address" } }, - "functionReturnParameters": 3754, - "id": 3764, + "functionReturnParameters": 3806, + "id": 3816, "nodeType": "Return", "src": "4418:18:21" } ] }, "documentation": null, - "id": 3766, + "id": 3818, "implemented": true, "kind": "function", "modifiers": [], "name": "read", "nodeType": "FunctionDefinition", "parameters": { - "id": 3751, + "id": 3803, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3750, + "id": 3802, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3766, + "scope": 3818, "src": "4317:18:21", "stateVariable": false, "storageLocation": "memory", @@ -3200,7 +3200,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3749, + "id": 3801, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4317:5:21", @@ -3216,15 +3216,15 @@ "src": "4316:20:21" }, "returnParameters": { - "id": 3754, + "id": 3806, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3753, + "id": 3805, "name": "", "nodeType": "VariableDeclaration", - "scope": 3766, + "scope": 3818, "src": "4358:7:21", "stateVariable": false, "storageLocation": "default", @@ -3233,7 +3233,7 @@ "typeString": "address" }, "typeName": { - "id": 3752, + "id": 3804, "name": "address", "nodeType": "ElementaryTypeName", "src": "4358:7:21", @@ -3249,7 +3249,7 @@ ], "src": "4357:9:21" }, - "scope": 3788, + "scope": 3840, "src": "4303:140:21", "stateMutability": "view", "superFunction": null, @@ -3257,7 +3257,7 @@ }, { "body": { - "id": 3786, + "id": 3838, "nodeType": "Block", "src": "4516:336:21", "statements": [ @@ -3265,7 +3265,7 @@ "externalReferences": [ { "target": { - "declaration": 3771, + "declaration": 3823, "isOffset": false, "isSlot": false, "src": "4549:6:21", @@ -3274,7 +3274,7 @@ }, { "_code": { - "declaration": 3768, + "declaration": 3820, "isOffset": false, "isSlot": false, "src": "4593:5:21", @@ -3283,7 +3283,7 @@ }, { "_code": { - "declaration": 3768, + "declaration": 3820, "isOffset": false, "isSlot": false, "src": "4573:5:21", @@ -3292,7 +3292,7 @@ }, { "target": { - "declaration": 3771, + "declaration": 3823, "isOffset": false, "isSlot": false, "src": "4639:6:21", @@ -3300,22 +3300,22 @@ } } ], - "id": 3773, + "id": 3825, "nodeType": "InlineAssembly", "operations": "{\n target := create(0, add(_code, 0x20), mload(_code))\n switch iszero(extcodesize(target))\n case 1 { revert(0, 0) }\n}", "src": "4526:249:21" }, { "assignments": [ - 3775 + 3827 ], "declarations": [ { "constant": false, - "id": 3775, + "id": 3827, "name": "hash", "nodeType": "VariableDeclaration", - "scope": 3786, + "scope": 3838, "src": "4784:12:21", "stateVariable": false, "storageLocation": "default", @@ -3324,7 +3324,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3774, + "id": 3826, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4784:7:21", @@ -3337,17 +3337,17 @@ "visibility": "internal" } ], - "id": 3779, + "id": 3831, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3777, + "id": 3829, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3768, + "referencedDeclaration": 3820, "src": "4809:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3362,18 +3362,18 @@ "typeString": "bytes memory" } ], - "id": 3776, + "id": 3828, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7821, + "referencedDeclaration": 7812, "src": "4799:9:21", "typeDescriptions": { "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$", "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 3778, + "id": 3830, "isConstant": false, "isLValue": false, "isPure": false, @@ -3393,7 +3393,7 @@ { "expression": { "argumentTypes": null, - "id": 3784, + "id": 3836, "isConstant": false, "isLValue": false, "isPure": false, @@ -3402,25 +3402,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3780, + "id": 3832, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3748, + "referencedDeclaration": 3800, "src": "4825:5:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_address_$", "typeString": "mapping(bytes32 => address)" } }, - "id": 3782, + "id": 3834, "indexExpression": { "argumentTypes": null, - "id": 3781, + "id": 3833, "name": "hash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3775, + "referencedDeclaration": 3827, "src": "4831:4:21", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -3442,11 +3442,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3783, + "id": 3835, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3771, + "referencedDeclaration": 3823, "src": "4839:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3459,29 +3459,29 @@ "typeString": "address" } }, - "id": 3785, + "id": 3837, "nodeType": "ExpressionStatement", "src": "4825:20:21" } ] }, "documentation": null, - "id": 3787, + "id": 3839, "implemented": true, "kind": "function", "modifiers": [], "name": "write", "nodeType": "FunctionDefinition", "parameters": { - "id": 3769, + "id": 3821, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3768, + "id": 3820, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3787, + "scope": 3839, "src": "4464:18:21", "stateVariable": false, "storageLocation": "memory", @@ -3490,7 +3490,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3767, + "id": 3819, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4464:5:21", @@ -3506,15 +3506,15 @@ "src": "4463:20:21" }, "returnParameters": { - "id": 3772, + "id": 3824, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3771, + "id": 3823, "name": "target", "nodeType": "VariableDeclaration", - "scope": 3787, + "scope": 3839, "src": "4500:14:21", "stateVariable": false, "storageLocation": "default", @@ -3523,7 +3523,7 @@ "typeString": "address" }, "typeName": { - "id": 3770, + "id": 3822, "name": "address", "nodeType": "ElementaryTypeName", "src": "4500:7:21", @@ -3539,14 +3539,14 @@ ], "src": "4499:16:21" }, - "scope": 3788, + "scope": 3840, "src": "4449:403:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "4235:619:21" } ], @@ -3556,20 +3556,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol", "exportedSymbols": { "DSProxy": [ - 3660 + 3712 ], "DSProxyCache": [ - 3788 + 3840 ], "DSProxyFactory": [ - 3744 + 3796 ] }, - "id": 3789, + "id": 3841, "nodeType": "SourceUnit", "nodes": [ { - "id": 3544, + "id": 3596, "literals": [ "solidity", ">=", @@ -3585,10 +3585,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "file": "./Auth.sol", - "id": 3545, + "id": 3597, "nodeType": "ImportDirective", - "scope": 3789, - "sourceUnit": 2925, + "scope": 3841, + "sourceUnit": 2977, "src": "785:20:21", "symbolAliases": [], "unitAlias": "" @@ -3596,10 +3596,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol", "file": "./Note.sol", - "id": 3546, + "id": 3598, "nodeType": "ImportDirective", - "scope": 3789, - "sourceUnit": 3543, + "scope": 3841, + "sourceUnit": 3595, "src": "806:20:21", "symbolAliases": [], "unitAlias": "" @@ -3610,17 +3610,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3547, + "id": 3599, "name": "DSAuth", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2924, + "referencedDeclaration": 2976, "src": "1088:6:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } }, - "id": 3548, + "id": 3600, "nodeType": "InheritanceSpecifier", "src": "1088:6:21" }, @@ -3628,61 +3628,61 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3549, + "id": 3601, "name": "DSNote", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3542, + "referencedDeclaration": 3594, "src": "1096:6:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSNote_$3542", + "typeIdentifier": "t_contract$_DSNote_$3594", "typeString": "contract DSNote" } }, - "id": 3550, + "id": 3602, "nodeType": "InheritanceSpecifier", "src": "1096:6:21" } ], "contractDependencies": [ - 2808, - 2924, - 3542 + 2860, + 2976, + 3594 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3660, + "id": 3712, "linearizedBaseContracts": [ - 3660, - 3542, - 2924, - 2808 + 3712, + 3594, + 2976, + 2860 ], "name": "DSProxy", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3552, + "id": 3604, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3660, + "scope": 3712, "src": "1109:25:21", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 3551, + "id": 3603, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "1109:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -3691,7 +3691,7 @@ }, { "body": { - "id": 3561, + "id": 3613, "nodeType": "Block", "src": "1211:37:21", "statements": [ @@ -3701,11 +3701,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3558, + "id": 3610, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3554, + "referencedDeclaration": 3606, "src": "1230:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3720,18 +3720,18 @@ "typeString": "address" } ], - "id": 3557, + "id": 3609, "name": "setCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3659, + "referencedDeclaration": 3711, "src": "1221:8:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_bool_$", "typeString": "function (address) returns (bool)" } }, - "id": 3559, + "id": 3611, "isConstant": false, "isLValue": false, "isPure": false, @@ -3745,29 +3745,29 @@ "typeString": "bool" } }, - "id": 3560, + "id": 3612, "nodeType": "ExpressionStatement", "src": "1221:20:21" } ] }, "documentation": null, - "id": 3562, + "id": 3614, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3555, + "id": 3607, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3554, + "id": 3606, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 3562, + "scope": 3614, "src": "1184:18:21", "stateVariable": false, "storageLocation": "default", @@ -3776,7 +3776,7 @@ "typeString": "address" }, "typeName": { - "id": 3553, + "id": 3605, "name": "address", "nodeType": "ElementaryTypeName", "src": "1184:7:21", @@ -3793,12 +3793,12 @@ "src": "1183:20:21" }, "returnParameters": { - "id": 3556, + "id": 3608, "nodeType": "ParameterList", "parameters": [], "src": "1211:0:21" }, - "scope": 3660, + "scope": 3712, "src": "1172:76:21", "stateMutability": "nonpayable", "superFunction": null, @@ -3806,31 +3806,31 @@ }, { "body": { - "id": 3565, + "id": 3617, "nodeType": "Block", "src": "1282:7:21", "statements": [] }, "documentation": null, - "id": 3566, + "id": 3618, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3563, + "id": 3615, "nodeType": "ParameterList", "parameters": [], "src": "1262:2:21" }, "returnParameters": { - "id": 3564, + "id": 3616, "nodeType": "ParameterList", "parameters": [], "src": "1282:0:21" }, - "scope": 3660, + "scope": 3712, "src": "1254:35:21", "stateMutability": "payable", "superFunction": null, @@ -3838,25 +3838,25 @@ }, { "body": { - "id": 3605, + "id": 3657, "nodeType": "Block", "src": "1508:234:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3582, + "id": 3634, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3577, + "id": 3629, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1518:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3870,11 +3870,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3580, + "id": 3632, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3568, + "referencedDeclaration": 3620, "src": "1538:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3891,32 +3891,32 @@ ], "expression": { "argumentTypes": null, - "id": 3578, + "id": 3630, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "1527:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3579, + "id": 3631, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "read", "nodeType": "MemberAccess", - "referencedDeclaration": 3766, + "referencedDeclaration": 3818, "src": "1527:10:21", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes_memory_ptr_$returns$_t_address_$", "typeString": "function (bytes memory) view external returns (address)" } }, - "id": 3581, + "id": 3633, "isConstant": false, "isLValue": false, "isPure": false, @@ -3936,7 +3936,7 @@ "typeString": "address" } }, - "id": 3583, + "id": 3635, "nodeType": "ExpressionStatement", "src": "1518:26:21" }, @@ -3947,18 +3947,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3588, + "id": 3640, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3584, + "id": 3636, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1558:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3973,7 +3973,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3586, + "id": 3638, "isConstant": false, "isLValue": false, "isPure": true, @@ -3996,7 +3996,7 @@ "typeString": "int_const 0" } ], - "id": 3585, + "id": 3637, "isConstant": false, "isLValue": false, "isPure": true, @@ -4009,7 +4009,7 @@ }, "typeName": "address" }, - "id": 3587, + "id": 3639, "isConstant": false, "isLValue": false, "isPure": true, @@ -4030,29 +4030,29 @@ } }, "falseBody": null, - "id": 3597, + "id": 3649, "nodeType": "IfStatement", "src": "1554:138:21", "trueBody": { - "id": 3596, + "id": 3648, "nodeType": "Block", "src": "1580:112:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3594, + "id": 3646, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3589, + "id": 3641, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1654:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4066,11 +4066,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3592, + "id": 3644, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3568, + "referencedDeclaration": 3620, "src": "1675:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -4087,32 +4087,32 @@ ], "expression": { "argumentTypes": null, - "id": 3590, + "id": 3642, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "1663:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3591, + "id": 3643, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "write", "nodeType": "MemberAccess", - "referencedDeclaration": 3787, + "referencedDeclaration": 3839, "src": "1663:11:21", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes_memory_ptr_$returns$_t_address_$", "typeString": "function (bytes memory) external returns (address)" } }, - "id": 3593, + "id": 3645, "isConstant": false, "isLValue": false, "isPure": false, @@ -4132,7 +4132,7 @@ "typeString": "address" } }, - "id": 3595, + "id": 3647, "nodeType": "ExpressionStatement", "src": "1654:27:21" } @@ -4142,18 +4142,18 @@ { "expression": { "argumentTypes": null, - "id": 3603, + "id": 3655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3598, + "id": 3650, "name": "response", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3575, + "referencedDeclaration": 3627, "src": "1702:8:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -4167,11 +4167,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3600, + "id": 3652, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1721:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4180,11 +4180,11 @@ }, { "argumentTypes": null, - "id": 3601, + "id": 3653, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3570, + "referencedDeclaration": 3622, "src": "1729:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -4203,21 +4203,21 @@ "typeString": "bytes memory" } ], - "id": 3599, + "id": 3651, "name": "execute", "nodeType": "Identifier", "overloadedDeclarations": [ - 3606, - 3630 + 3658, + 3682 ], - "referencedDeclaration": 3630, + "referencedDeclaration": 3682, "src": "1713:7:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$", "typeString": "function (address,bytes memory) returns (bytes memory)" } }, - "id": 3602, + "id": 3654, "isConstant": false, "isLValue": false, "isPure": false, @@ -4237,29 +4237,29 @@ "typeString": "bytes memory" } }, - "id": 3604, + "id": 3656, "nodeType": "ExpressionStatement", "src": "1702:33:21" } ] }, "documentation": null, - "id": 3606, + "id": 3658, "implemented": true, "kind": "function", "modifiers": [], "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 3571, + "id": 3623, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3568, + "id": 3620, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1377:18:21", "stateVariable": false, "storageLocation": "memory", @@ -4268,7 +4268,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3567, + "id": 3619, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1377:5:21", @@ -4282,10 +4282,10 @@ }, { "constant": false, - "id": 3570, + "id": 3622, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1397:18:21", "stateVariable": false, "storageLocation": "memory", @@ -4294,7 +4294,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3569, + "id": 3621, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1397:5:21", @@ -4310,15 +4310,15 @@ "src": "1376:40:21" }, "returnParameters": { - "id": 3576, + "id": 3628, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3573, + "id": 3625, "name": "target", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1465:14:21", "stateVariable": false, "storageLocation": "default", @@ -4327,7 +4327,7 @@ "typeString": "address" }, "typeName": { - "id": 3572, + "id": 3624, "name": "address", "nodeType": "ElementaryTypeName", "src": "1465:7:21", @@ -4342,10 +4342,10 @@ }, { "constant": false, - "id": 3575, + "id": 3627, "name": "response", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1481:21:21", "stateVariable": false, "storageLocation": "memory", @@ -4354,7 +4354,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3574, + "id": 3626, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1481:5:21", @@ -4369,7 +4369,7 @@ ], "src": "1464:39:21" }, - "scope": 3660, + "scope": 3712, "src": "1360:382:21", "stateMutability": "payable", "superFunction": null, @@ -4377,7 +4377,7 @@ }, { "body": { - "id": 3629, + "id": 3681, "nodeType": "Block", "src": "1903:685:21", "statements": [ @@ -4391,18 +4391,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3624, + "id": 3676, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3620, + "id": 3672, "name": "_target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3608, + "referencedDeclaration": 3660, "src": "1921:7:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4417,7 +4417,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3622, + "id": 3674, "isConstant": false, "isLValue": false, "isPure": true, @@ -4440,7 +4440,7 @@ "typeString": "int_const 0" } ], - "id": 3621, + "id": 3673, "isConstant": false, "isLValue": false, "isPure": true, @@ -4453,7 +4453,7 @@ }, "typeName": "address" }, - "id": 3623, + "id": 3675, "isConstant": false, "isLValue": false, "isPure": true, @@ -4476,7 +4476,7 @@ { "argumentTypes": null, "hexValue": "64732d70726f78792d7461726765742d616464726573732d7265717569726564", - "id": 3625, + "id": 3677, "isConstant": false, "isLValue": false, "isPure": true, @@ -4503,21 +4503,21 @@ "typeString": "literal_string \"ds-proxy-target-address-required\"" } ], - "id": 3619, + "id": 3671, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1913:7:21", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3626, + "id": 3678, "isConstant": false, "isLValue": false, "isPure": false, @@ -4531,7 +4531,7 @@ "typeString": "tuple()" } }, - "id": 3627, + "id": 3679, "nodeType": "ExpressionStatement", "src": "1913:66:21" }, @@ -4539,7 +4539,7 @@ "externalReferences": [ { "_data": { - "declaration": 3610, + "declaration": 3662, "isOffset": false, "isSlot": false, "src": "2136:5:21", @@ -4548,7 +4548,7 @@ }, { "_data": { - "declaration": 3610, + "declaration": 3662, "isOffset": false, "isSlot": false, "src": "2116:5:21", @@ -4557,7 +4557,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2202:8:21", @@ -4566,7 +4566,7 @@ }, { "_target": { - "declaration": 3608, + "declaration": 3660, "isOffset": false, "isSlot": false, "src": "2103:7:21", @@ -4575,7 +4575,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2376:8:21", @@ -4584,7 +4584,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2329:8:21", @@ -4593,7 +4593,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2255:8:21", @@ -4602,7 +4602,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2536:8:21", @@ -4610,7 +4610,7 @@ } } ], - "id": 3628, + "id": 3680, "nodeType": "InlineAssembly", "operations": "{\n let succeeded := delegatecall(sub(gas(), 5000), _target, add(_data, 0x20), mload(_data), 0, 0)\n let size := returndatasize()\n response := mload(0x40)\n mstore(0x40, add(response, and(add(add(size, 0x20), 0x1f), not(0x1f))))\n mstore(response, size)\n returndatacopy(add(response, 0x20), 0, size)\n switch iszero(succeeded)\n case 1 {\n revert(add(response, 0x20), size)\n }\n}", "src": "2034:548:21" @@ -4618,20 +4618,20 @@ ] }, "documentation": null, - "id": 3630, + "id": 3682, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3613, + "id": 3665, "modifierName": { "argumentTypes": null, - "id": 3612, + "id": 3664, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1825:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -4643,14 +4643,14 @@ }, { "arguments": null, - "id": 3615, + "id": 3667, "modifierName": { "argumentTypes": null, - "id": 3614, + "id": 3666, "name": "note", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, + "referencedDeclaration": 3593, "src": "1838:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -4664,15 +4664,15 @@ "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 3611, + "id": 3663, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3608, + "id": 3660, "name": "_target", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1765:15:21", "stateVariable": false, "storageLocation": "default", @@ -4681,7 +4681,7 @@ "typeString": "address" }, "typeName": { - "id": 3607, + "id": 3659, "name": "address", "nodeType": "ElementaryTypeName", "src": "1765:7:21", @@ -4696,10 +4696,10 @@ }, { "constant": false, - "id": 3610, + "id": 3662, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1782:18:21", "stateVariable": false, "storageLocation": "memory", @@ -4708,7 +4708,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3609, + "id": 3661, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1782:5:21", @@ -4724,15 +4724,15 @@ "src": "1764:37:21" }, "returnParameters": { - "id": 3618, + "id": 3670, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3617, + "id": 3669, "name": "response", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1876:21:21", "stateVariable": false, "storageLocation": "memory", @@ -4741,7 +4741,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3616, + "id": 3668, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1876:5:21", @@ -4756,7 +4756,7 @@ ], "src": "1875:23:21" }, - "scope": 3660, + "scope": 3712, "src": "1748:840:21", "stateMutability": "payable", "superFunction": null, @@ -4764,7 +4764,7 @@ }, { "body": { - "id": 3658, + "id": 3710, "nodeType": "Block", "src": "2720:168:21", "statements": [ @@ -4778,18 +4778,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3646, + "id": 3698, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3642, + "id": 3694, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, + "referencedDeclaration": 3684, "src": "2738:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4804,7 +4804,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3644, + "id": 3696, "isConstant": false, "isLValue": false, "isPure": true, @@ -4827,7 +4827,7 @@ "typeString": "int_const 0" } ], - "id": 3643, + "id": 3695, "isConstant": false, "isLValue": false, "isPure": true, @@ -4840,7 +4840,7 @@ }, "typeName": "address" }, - "id": 3645, + "id": 3697, "isConstant": false, "isLValue": false, "isPure": true, @@ -4863,7 +4863,7 @@ { "argumentTypes": null, "hexValue": "64732d70726f78792d63616368652d616464726573732d7265717569726564", - "id": 3647, + "id": 3699, "isConstant": false, "isLValue": false, "isPure": true, @@ -4890,21 +4890,21 @@ "typeString": "literal_string \"ds-proxy-cache-address-required\"" } ], - "id": 3641, + "id": 3693, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2730:7:21", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3648, + "id": 3700, "isConstant": false, "isLValue": false, "isPure": false, @@ -4918,28 +4918,28 @@ "typeString": "tuple()" } }, - "id": 3649, + "id": 3701, "nodeType": "ExpressionStatement", "src": "2730:68:21" }, { "expression": { "argumentTypes": null, - "id": 3654, + "id": 3706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3650, + "id": 3702, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "2808:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -4950,11 +4950,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3652, + "id": 3704, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, + "referencedDeclaration": 3684, "src": "2829:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4969,18 +4969,18 @@ "typeString": "address" } ], - "id": 3651, + "id": 3703, "name": "DSProxyCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "2816:12:21", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_type$_t_contract$_DSProxyCache_$3840_$", "typeString": "type(contract DSProxyCache)" } }, - "id": 3653, + "id": 3705, "isConstant": false, "isLValue": false, "isPure": false, @@ -4990,17 +4990,17 @@ "nodeType": "FunctionCall", "src": "2816:24:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "2808:32:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3655, + "id": 3707, "nodeType": "ExpressionStatement", "src": "2808:32:21" }, @@ -5008,7 +5008,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3656, + "id": 3708, "isConstant": false, "isLValue": false, "isPure": true, @@ -5023,28 +5023,28 @@ }, "value": "true" }, - "functionReturnParameters": 3640, - "id": 3657, + "functionReturnParameters": 3692, + "id": 3709, "nodeType": "Return", "src": "2870:11:21" } ] }, "documentation": null, - "id": 3659, + "id": 3711, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3635, + "id": 3687, "modifierName": { "argumentTypes": null, - "id": 3634, + "id": 3686, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "2675:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -5056,14 +5056,14 @@ }, { "arguments": null, - "id": 3637, + "id": 3689, "modifierName": { "argumentTypes": null, - "id": 3636, + "id": 3688, "name": "note", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, + "referencedDeclaration": 3593, "src": "2688:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -5077,15 +5077,15 @@ "name": "setCache", "nodeType": "FunctionDefinition", "parameters": { - "id": 3633, + "id": 3685, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3632, + "id": 3684, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 3659, + "scope": 3711, "src": "2632:18:21", "stateVariable": false, "storageLocation": "default", @@ -5094,7 +5094,7 @@ "typeString": "address" }, "typeName": { - "id": 3631, + "id": 3683, "name": "address", "nodeType": "ElementaryTypeName", "src": "2632:7:21", @@ -5111,15 +5111,15 @@ "src": "2631:20:21" }, "returnParameters": { - "id": 3640, + "id": 3692, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3639, + "id": 3691, "name": "", "nodeType": "VariableDeclaration", - "scope": 3659, + "scope": 3711, "src": "2710:4:21", "stateVariable": false, "storageLocation": "default", @@ -5128,7 +5128,7 @@ "typeString": "bool" }, "typeName": { - "id": 3638, + "id": 3690, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2710:4:21", @@ -5143,28 +5143,28 @@ ], "src": "2709:6:21" }, - "scope": 3660, + "scope": 3712, "src": "2614:274:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "1068:1822:21" }, { "baseContracts": [], "contractDependencies": [ - 3660, - 3788 + 3712, + 3840 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3744, + "id": 3796, "linearizedBaseContracts": [ - 3744 + 3796 ], "name": "DSProxyFactory", "nodeType": "ContractDefinition", @@ -5172,20 +5172,20 @@ { "anonymous": false, "documentation": null, - "id": 3670, + "id": 3722, "name": "Created", "nodeType": "EventDefinition", "parameters": { - "id": 3669, + "id": 3721, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3662, + "id": 3714, "indexed": true, "name": "sender", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3053:22:21", "stateVariable": false, "storageLocation": "default", @@ -5194,7 +5194,7 @@ "typeString": "address" }, "typeName": { - "id": 3661, + "id": 3713, "name": "address", "nodeType": "ElementaryTypeName", "src": "3053:7:21", @@ -5209,11 +5209,11 @@ }, { "constant": false, - "id": 3664, + "id": 3716, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3077:21:21", "stateVariable": false, "storageLocation": "default", @@ -5222,7 +5222,7 @@ "typeString": "address" }, "typeName": { - "id": 3663, + "id": 3715, "name": "address", "nodeType": "ElementaryTypeName", "src": "3077:7:21", @@ -5237,11 +5237,11 @@ }, { "constant": false, - "id": 3666, + "id": 3718, "indexed": false, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3100:13:21", "stateVariable": false, "storageLocation": "default", @@ -5250,7 +5250,7 @@ "typeString": "address" }, "typeName": { - "id": 3665, + "id": 3717, "name": "address", "nodeType": "ElementaryTypeName", "src": "3100:7:21", @@ -5265,11 +5265,11 @@ }, { "constant": false, - "id": 3668, + "id": 3720, "indexed": false, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3115:13:21", "stateVariable": false, "storageLocation": "default", @@ -5278,7 +5278,7 @@ "typeString": "address" }, "typeName": { - "id": 3667, + "id": 3719, "name": "address", "nodeType": "ElementaryTypeName", "src": "3115:7:21", @@ -5298,10 +5298,10 @@ }, { "constant": false, - "id": 3674, + "id": 3726, "name": "proxies", "nodeType": "VariableDeclaration", - "scope": 3744, + "scope": 3796, "src": "3135:40:21", "stateVariable": true, "storageLocation": "default", @@ -5310,9 +5310,9 @@ "typeString": "mapping(address => address)" }, "typeName": { - "id": 3673, + "id": 3725, "keyType": { - "id": 3671, + "id": 3723, "name": "address", "nodeType": "ElementaryTypeName", "src": "3143:7:21", @@ -5328,7 +5328,7 @@ "typeString": "mapping(address => address)" }, "valueType": { - "id": 3672, + "id": 3724, "name": "address", "nodeType": "ElementaryTypeName", "src": "3152:7:21", @@ -5344,26 +5344,26 @@ }, { "constant": false, - "id": 3676, + "id": 3728, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3744, + "scope": 3796, "src": "3181:25:21", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 3675, + "id": 3727, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "3181:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -5372,28 +5372,28 @@ }, { "body": { - "id": 3685, + "id": 3737, "nodeType": "Block", "src": "3234:43:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3683, + "id": 3735, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3679, + "id": 3731, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3244:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -5404,7 +5404,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3681, + "id": 3733, "isConstant": false, "isLValue": false, "isPure": false, @@ -5412,23 +5412,23 @@ "nodeType": "NewExpression", "src": "3252:16:21", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3840_$", "typeString": "function () returns (contract DSProxyCache)" }, "typeName": { "contractScope": null, - "id": 3680, + "id": 3732, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "3256:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } }, - "id": 3682, + "id": 3734, "isConstant": false, "isLValue": false, "isPure": false, @@ -5438,42 +5438,42 @@ "nodeType": "FunctionCall", "src": "3252:18:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "3244:26:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3684, + "id": 3736, "nodeType": "ExpressionStatement", "src": "3244:26:21" } ] }, "documentation": null, - "id": 3686, + "id": 3738, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3677, + "id": 3729, "nodeType": "ParameterList", "parameters": [], "src": "3224:2:21" }, "returnParameters": { - "id": 3678, + "id": 3730, "nodeType": "ParameterList", "parameters": [], "src": "3234:0:21" }, - "scope": 3744, + "scope": 3796, "src": "3213:64:21", "stateMutability": "nonpayable", "superFunction": null, @@ -5481,25 +5481,25 @@ }, { "body": { - "id": 3698, + "id": 3750, "nodeType": "Block", "src": "3412:42:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3696, + "id": 3748, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3691, + "id": 3743, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, + "referencedDeclaration": 3741, "src": "3422:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5515,18 +5515,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3693, + "id": 3745, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "3436:3:21", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3694, + "id": 3746, "isConstant": false, "isLValue": false, "isPure": false, @@ -5548,21 +5548,21 @@ "typeString": "address payable" } ], - "id": 3692, + "id": 3744, "name": "build", "nodeType": "Identifier", "overloadedDeclarations": [ - 3699, - 3743 + 3751, + 3795 ], - "referencedDeclaration": 3743, + "referencedDeclaration": 3795, "src": "3430:5:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_address_payable_$", "typeString": "function (address) returns (address payable)" } }, - "id": 3695, + "id": 3747, "isConstant": false, "isLValue": false, "isPure": false, @@ -5582,35 +5582,35 @@ "typeString": "address payable" } }, - "id": 3697, + "id": 3749, "nodeType": "ExpressionStatement", "src": "3422:25:21" } ] }, "documentation": null, - "id": 3699, + "id": 3751, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 3687, + "id": 3739, "nodeType": "ParameterList", "parameters": [], "src": "3370:2:21" }, "returnParameters": { - "id": 3690, + "id": 3742, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3689, + "id": 3741, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3699, + "scope": 3751, "src": "3389:21:21", "stateVariable": false, "storageLocation": "default", @@ -5619,7 +5619,7 @@ "typeString": "address payable" }, "typeName": { - "id": 3688, + "id": 3740, "name": "address", "nodeType": "ElementaryTypeName", "src": "3389:15:21", @@ -5635,7 +5635,7 @@ ], "src": "3388:23:21" }, - "scope": 3744, + "scope": 3796, "src": "3356:98:21", "stateMutability": "nonpayable", "superFunction": null, @@ -5643,25 +5643,25 @@ }, { "body": { - "id": 3742, + "id": 3794, "nodeType": "Block", "src": "3599:206:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3715, + "id": 3767, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3706, + "id": 3758, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3609:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5681,14 +5681,14 @@ "arguments": [ { "argumentTypes": null, - "id": 3711, + "id": 3763, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3645:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -5696,11 +5696,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 3710, + "id": 3762, "isConstant": false, "isLValue": false, "isPure": true, @@ -5713,7 +5713,7 @@ }, "typeName": "address" }, - "id": 3712, + "id": 3764, "isConstant": false, "isLValue": false, "isPure": false, @@ -5735,7 +5735,7 @@ "typeString": "address" } ], - "id": 3709, + "id": 3761, "isConstant": false, "isLValue": false, "isPure": false, @@ -5743,23 +5743,23 @@ "nodeType": "NewExpression", "src": "3625:11:21", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DSProxy_$3660_$", + "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DSProxy_$3712_$", "typeString": "function (address) returns (contract DSProxy)" }, "typeName": { "contractScope": null, - "id": 3708, + "id": 3760, "name": "DSProxy", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "3629:7:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } } }, - "id": 3713, + "id": 3765, "isConstant": false, "isLValue": false, "isPure": false, @@ -5769,7 +5769,7 @@ "nodeType": "FunctionCall", "src": "3625:27:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } } @@ -5777,11 +5777,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } ], - "id": 3707, + "id": 3759, "isConstant": false, "isLValue": false, "isPure": true, @@ -5794,7 +5794,7 @@ }, "typeName": "address" }, - "id": 3714, + "id": 3766, "isConstant": false, "isLValue": false, "isPure": false, @@ -5814,7 +5814,7 @@ "typeString": "address payable" } }, - "id": 3716, + "id": 3768, "nodeType": "ExpressionStatement", "src": "3609:44:21" }, @@ -5826,18 +5826,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3718, + "id": 3770, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "3676:3:21", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3719, + "id": 3771, "isConstant": false, "isLValue": false, "isPure": false, @@ -5853,11 +5853,11 @@ }, { "argumentTypes": null, - "id": 3720, + "id": 3772, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3688:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5869,11 +5869,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3722, + "id": 3774, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3703:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5888,7 +5888,7 @@ "typeString": "address payable" } ], - "id": 3721, + "id": 3773, "isConstant": false, "isLValue": false, "isPure": true, @@ -5901,7 +5901,7 @@ }, "typeName": "address" }, - "id": 3723, + "id": 3775, "isConstant": false, "isLValue": false, "isPure": false, @@ -5920,14 +5920,14 @@ "arguments": [ { "argumentTypes": null, - "id": 3725, + "id": 3777, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3719:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -5935,11 +5935,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 3724, + "id": 3776, "isConstant": false, "isLValue": false, "isPure": true, @@ -5952,7 +5952,7 @@ }, "typeName": "address" }, - "id": 3726, + "id": 3778, "isConstant": false, "isLValue": false, "isPure": false, @@ -5986,18 +5986,18 @@ "typeString": "address" } ], - "id": 3717, + "id": 3769, "name": "Created", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3670, + "referencedDeclaration": 3722, "src": "3668:7:21", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_address_$returns$__$", "typeString": "function (address,address,address,address)" } }, - "id": 3727, + "id": 3779, "isConstant": false, "isLValue": false, "isPure": false, @@ -6011,7 +6011,7 @@ "typeString": "tuple()" } }, - "id": 3728, + "id": 3780, "nodeType": "EmitStatement", "src": "3663:63:21" }, @@ -6021,11 +6021,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3733, + "id": 3785, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3760:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6045,11 +6045,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3730, + "id": 3782, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3744:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -6064,18 +6064,18 @@ "typeString": "address payable" } ], - "id": 3729, + "id": 3781, "name": "DSProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "3736:7:21", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSProxy_$3660_$", + "typeIdentifier": "t_type$_t_contract$_DSProxy_$3712_$", "typeString": "type(contract DSProxy)" } }, - "id": 3731, + "id": 3783, "isConstant": false, "isLValue": false, "isPure": false, @@ -6085,25 +6085,25 @@ "nodeType": "FunctionCall", "src": "3736:14:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } }, - "id": 3732, + "id": 3784, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "3736:23:21", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 3734, + "id": 3786, "isConstant": false, "isLValue": false, "isPure": false, @@ -6117,14 +6117,14 @@ "typeString": "tuple()" } }, - "id": 3735, + "id": 3787, "nodeType": "ExpressionStatement", "src": "3736:30:21" }, { "expression": { "argumentTypes": null, - "id": 3740, + "id": 3792, "isConstant": false, "isLValue": false, "isPure": false, @@ -6133,25 +6133,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3736, + "id": 3788, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3674, + "referencedDeclaration": 3726, "src": "3776:7:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 3738, + "id": 3790, "indexExpression": { "argumentTypes": null, - "id": 3737, + "id": 3789, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3784:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6173,11 +6173,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3739, + "id": 3791, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3793:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -6190,29 +6190,29 @@ "typeString": "address" } }, - "id": 3741, + "id": 3793, "nodeType": "ExpressionStatement", "src": "3776:22:21" } ] }, "documentation": null, - "id": 3743, + "id": 3795, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 3702, + "id": 3754, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3701, + "id": 3753, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3743, + "scope": 3795, "src": "3545:13:21", "stateVariable": false, "storageLocation": "default", @@ -6221,7 +6221,7 @@ "typeString": "address" }, "typeName": { - "id": 3700, + "id": 3752, "name": "address", "nodeType": "ElementaryTypeName", "src": "3545:7:21", @@ -6238,15 +6238,15 @@ "src": "3544:15:21" }, "returnParameters": { - "id": 3705, + "id": 3757, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3704, + "id": 3756, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3743, + "scope": 3795, "src": "3576:21:21", "stateVariable": false, "storageLocation": "default", @@ -6255,7 +6255,7 @@ "typeString": "address payable" }, "typeName": { - "id": 3703, + "id": 3755, "name": "address", "nodeType": "ElementaryTypeName", "src": "3576:15:21", @@ -6271,14 +6271,14 @@ ], "src": "3575:23:21" }, - "scope": 3744, + "scope": 3796, "src": "3530:275:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "3009:798:21" }, { @@ -6287,19 +6287,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3788, + "id": 3840, "linearizedBaseContracts": [ - 3788 + 3840 ], "name": "DSProxyCache", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3748, + "id": 3800, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3788, + "scope": 3840, "src": "4263:33:21", "stateVariable": true, "storageLocation": "default", @@ -6308,9 +6308,9 @@ "typeString": "mapping(bytes32 => address)" }, "typeName": { - "id": 3747, + "id": 3799, "keyType": { - "id": 3745, + "id": 3797, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4271:7:21", @@ -6326,7 +6326,7 @@ "typeString": "mapping(bytes32 => address)" }, "valueType": { - "id": 3746, + "id": 3798, "name": "address", "nodeType": "ElementaryTypeName", "src": "4282:7:21", @@ -6342,21 +6342,21 @@ }, { "body": { - "id": 3765, + "id": 3817, "nodeType": "Block", "src": "4367:76:21", "statements": [ { "assignments": [ - 3756 + 3808 ], "declarations": [ { "constant": false, - "id": 3756, + "id": 3808, "name": "hash", "nodeType": "VariableDeclaration", - "scope": 3765, + "scope": 3817, "src": "4377:12:21", "stateVariable": false, "storageLocation": "default", @@ -6365,7 +6365,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3755, + "id": 3807, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4377:7:21", @@ -6378,17 +6378,17 @@ "visibility": "internal" } ], - "id": 3760, + "id": 3812, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3758, + "id": 3810, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3750, + "referencedDeclaration": 3802, "src": "4402:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -6403,18 +6403,18 @@ "typeString": "bytes memory" } ], - "id": 3757, + "id": 3809, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7821, + "referencedDeclaration": 7812, "src": "4392:9:21", "typeDescriptions": { "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$", "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 3759, + "id": 3811, "isConstant": false, "isLValue": false, "isPure": false, @@ -6436,25 +6436,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3761, + "id": 3813, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3748, + "referencedDeclaration": 3800, "src": "4425:5:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_address_$", "typeString": "mapping(bytes32 => address)" } }, - "id": 3763, + "id": 3815, "indexExpression": { "argumentTypes": null, - "id": 3762, + "id": 3814, "name": "hash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3756, + "referencedDeclaration": 3808, "src": "4431:4:21", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6472,30 +6472,30 @@ "typeString": "address" } }, - "functionReturnParameters": 3754, - "id": 3764, + "functionReturnParameters": 3806, + "id": 3816, "nodeType": "Return", "src": "4418:18:21" } ] }, "documentation": null, - "id": 3766, + "id": 3818, "implemented": true, "kind": "function", "modifiers": [], "name": "read", "nodeType": "FunctionDefinition", "parameters": { - "id": 3751, + "id": 3803, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3750, + "id": 3802, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3766, + "scope": 3818, "src": "4317:18:21", "stateVariable": false, "storageLocation": "memory", @@ -6504,7 +6504,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3749, + "id": 3801, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4317:5:21", @@ -6520,15 +6520,15 @@ "src": "4316:20:21" }, "returnParameters": { - "id": 3754, + "id": 3806, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3753, + "id": 3805, "name": "", "nodeType": "VariableDeclaration", - "scope": 3766, + "scope": 3818, "src": "4358:7:21", "stateVariable": false, "storageLocation": "default", @@ -6537,7 +6537,7 @@ "typeString": "address" }, "typeName": { - "id": 3752, + "id": 3804, "name": "address", "nodeType": "ElementaryTypeName", "src": "4358:7:21", @@ -6553,7 +6553,7 @@ ], "src": "4357:9:21" }, - "scope": 3788, + "scope": 3840, "src": "4303:140:21", "stateMutability": "view", "superFunction": null, @@ -6561,7 +6561,7 @@ }, { "body": { - "id": 3786, + "id": 3838, "nodeType": "Block", "src": "4516:336:21", "statements": [ @@ -6569,7 +6569,7 @@ "externalReferences": [ { "target": { - "declaration": 3771, + "declaration": 3823, "isOffset": false, "isSlot": false, "src": "4549:6:21", @@ -6578,7 +6578,7 @@ }, { "_code": { - "declaration": 3768, + "declaration": 3820, "isOffset": false, "isSlot": false, "src": "4593:5:21", @@ -6587,7 +6587,7 @@ }, { "_code": { - "declaration": 3768, + "declaration": 3820, "isOffset": false, "isSlot": false, "src": "4573:5:21", @@ -6596,7 +6596,7 @@ }, { "target": { - "declaration": 3771, + "declaration": 3823, "isOffset": false, "isSlot": false, "src": "4639:6:21", @@ -6604,22 +6604,22 @@ } } ], - "id": 3773, + "id": 3825, "nodeType": "InlineAssembly", "operations": "{\n target := create(0, add(_code, 0x20), mload(_code))\n switch iszero(extcodesize(target))\n case 1 { revert(0, 0) }\n}", "src": "4526:249:21" }, { "assignments": [ - 3775 + 3827 ], "declarations": [ { "constant": false, - "id": 3775, + "id": 3827, "name": "hash", "nodeType": "VariableDeclaration", - "scope": 3786, + "scope": 3838, "src": "4784:12:21", "stateVariable": false, "storageLocation": "default", @@ -6628,7 +6628,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3774, + "id": 3826, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4784:7:21", @@ -6641,17 +6641,17 @@ "visibility": "internal" } ], - "id": 3779, + "id": 3831, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3777, + "id": 3829, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3768, + "referencedDeclaration": 3820, "src": "4809:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -6666,18 +6666,18 @@ "typeString": "bytes memory" } ], - "id": 3776, + "id": 3828, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7821, + "referencedDeclaration": 7812, "src": "4799:9:21", "typeDescriptions": { "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$", "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 3778, + "id": 3830, "isConstant": false, "isLValue": false, "isPure": false, @@ -6697,7 +6697,7 @@ { "expression": { "argumentTypes": null, - "id": 3784, + "id": 3836, "isConstant": false, "isLValue": false, "isPure": false, @@ -6706,25 +6706,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3780, + "id": 3832, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3748, + "referencedDeclaration": 3800, "src": "4825:5:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_address_$", "typeString": "mapping(bytes32 => address)" } }, - "id": 3782, + "id": 3834, "indexExpression": { "argumentTypes": null, - "id": 3781, + "id": 3833, "name": "hash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3775, + "referencedDeclaration": 3827, "src": "4831:4:21", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6746,11 +6746,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3783, + "id": 3835, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3771, + "referencedDeclaration": 3823, "src": "4839:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6763,29 +6763,29 @@ "typeString": "address" } }, - "id": 3785, + "id": 3837, "nodeType": "ExpressionStatement", "src": "4825:20:21" } ] }, "documentation": null, - "id": 3787, + "id": 3839, "implemented": true, "kind": "function", "modifiers": [], "name": "write", "nodeType": "FunctionDefinition", "parameters": { - "id": 3769, + "id": 3821, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3768, + "id": 3820, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3787, + "scope": 3839, "src": "4464:18:21", "stateVariable": false, "storageLocation": "memory", @@ -6794,7 +6794,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3767, + "id": 3819, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4464:5:21", @@ -6810,15 +6810,15 @@ "src": "4463:20:21" }, "returnParameters": { - "id": 3772, + "id": 3824, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3771, + "id": 3823, "name": "target", "nodeType": "VariableDeclaration", - "scope": 3787, + "scope": 3839, "src": "4500:14:21", "stateVariable": false, "storageLocation": "default", @@ -6827,7 +6827,7 @@ "typeString": "address" }, "typeName": { - "id": 3770, + "id": 3822, "name": "address", "nodeType": "ElementaryTypeName", "src": "4500:7:21", @@ -6843,14 +6843,14 @@ ], "src": "4499:16:21" }, - "scope": 3788, + "scope": 3840, "src": "4449:403:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "4235:619:21" } ], @@ -6862,7 +6862,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.516Z", + "updatedAt": "2020-04-08T12:21:13.752Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DSProxyCache.json b/packages/smart-contracts/artifacts/DSProxyCache.json index 0b49b80..681eab5 100644 --- a/packages/smart-contracts/artifacts/DSProxyCache.json +++ b/packages/smart-contracts/artifacts/DSProxyCache.json @@ -55,20 +55,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol", "exportedSymbols": { "DSProxy": [ - 3660 + 3712 ], "DSProxyCache": [ - 3788 + 3840 ], "DSProxyFactory": [ - 3744 + 3796 ] }, - "id": 3789, + "id": 3841, "nodeType": "SourceUnit", "nodes": [ { - "id": 3544, + "id": 3596, "literals": [ "solidity", ">=", @@ -84,10 +84,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "file": "./Auth.sol", - "id": 3545, + "id": 3597, "nodeType": "ImportDirective", - "scope": 3789, - "sourceUnit": 2925, + "scope": 3841, + "sourceUnit": 2977, "src": "785:20:21", "symbolAliases": [], "unitAlias": "" @@ -95,10 +95,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol", "file": "./Note.sol", - "id": 3546, + "id": 3598, "nodeType": "ImportDirective", - "scope": 3789, - "sourceUnit": 3543, + "scope": 3841, + "sourceUnit": 3595, "src": "806:20:21", "symbolAliases": [], "unitAlias": "" @@ -109,17 +109,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3547, + "id": 3599, "name": "DSAuth", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2924, + "referencedDeclaration": 2976, "src": "1088:6:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } }, - "id": 3548, + "id": 3600, "nodeType": "InheritanceSpecifier", "src": "1088:6:21" }, @@ -127,61 +127,61 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3549, + "id": 3601, "name": "DSNote", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3542, + "referencedDeclaration": 3594, "src": "1096:6:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSNote_$3542", + "typeIdentifier": "t_contract$_DSNote_$3594", "typeString": "contract DSNote" } }, - "id": 3550, + "id": 3602, "nodeType": "InheritanceSpecifier", "src": "1096:6:21" } ], "contractDependencies": [ - 2808, - 2924, - 3542 + 2860, + 2976, + 3594 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3660, + "id": 3712, "linearizedBaseContracts": [ - 3660, - 3542, - 2924, - 2808 + 3712, + 3594, + 2976, + 2860 ], "name": "DSProxy", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3552, + "id": 3604, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3660, + "scope": 3712, "src": "1109:25:21", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 3551, + "id": 3603, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "1109:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -190,7 +190,7 @@ }, { "body": { - "id": 3561, + "id": 3613, "nodeType": "Block", "src": "1211:37:21", "statements": [ @@ -200,11 +200,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3558, + "id": 3610, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3554, + "referencedDeclaration": 3606, "src": "1230:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -219,18 +219,18 @@ "typeString": "address" } ], - "id": 3557, + "id": 3609, "name": "setCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3659, + "referencedDeclaration": 3711, "src": "1221:8:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_bool_$", "typeString": "function (address) returns (bool)" } }, - "id": 3559, + "id": 3611, "isConstant": false, "isLValue": false, "isPure": false, @@ -244,29 +244,29 @@ "typeString": "bool" } }, - "id": 3560, + "id": 3612, "nodeType": "ExpressionStatement", "src": "1221:20:21" } ] }, "documentation": null, - "id": 3562, + "id": 3614, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3555, + "id": 3607, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3554, + "id": 3606, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 3562, + "scope": 3614, "src": "1184:18:21", "stateVariable": false, "storageLocation": "default", @@ -275,7 +275,7 @@ "typeString": "address" }, "typeName": { - "id": 3553, + "id": 3605, "name": "address", "nodeType": "ElementaryTypeName", "src": "1184:7:21", @@ -292,12 +292,12 @@ "src": "1183:20:21" }, "returnParameters": { - "id": 3556, + "id": 3608, "nodeType": "ParameterList", "parameters": [], "src": "1211:0:21" }, - "scope": 3660, + "scope": 3712, "src": "1172:76:21", "stateMutability": "nonpayable", "superFunction": null, @@ -305,31 +305,31 @@ }, { "body": { - "id": 3565, + "id": 3617, "nodeType": "Block", "src": "1282:7:21", "statements": [] }, "documentation": null, - "id": 3566, + "id": 3618, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3563, + "id": 3615, "nodeType": "ParameterList", "parameters": [], "src": "1262:2:21" }, "returnParameters": { - "id": 3564, + "id": 3616, "nodeType": "ParameterList", "parameters": [], "src": "1282:0:21" }, - "scope": 3660, + "scope": 3712, "src": "1254:35:21", "stateMutability": "payable", "superFunction": null, @@ -337,25 +337,25 @@ }, { "body": { - "id": 3605, + "id": 3657, "nodeType": "Block", "src": "1508:234:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3582, + "id": 3634, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3577, + "id": 3629, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1518:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -369,11 +369,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3580, + "id": 3632, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3568, + "referencedDeclaration": 3620, "src": "1538:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -390,32 +390,32 @@ ], "expression": { "argumentTypes": null, - "id": 3578, + "id": 3630, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "1527:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3579, + "id": 3631, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "read", "nodeType": "MemberAccess", - "referencedDeclaration": 3766, + "referencedDeclaration": 3818, "src": "1527:10:21", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes_memory_ptr_$returns$_t_address_$", "typeString": "function (bytes memory) view external returns (address)" } }, - "id": 3581, + "id": 3633, "isConstant": false, "isLValue": false, "isPure": false, @@ -435,7 +435,7 @@ "typeString": "address" } }, - "id": 3583, + "id": 3635, "nodeType": "ExpressionStatement", "src": "1518:26:21" }, @@ -446,18 +446,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3588, + "id": 3640, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3584, + "id": 3636, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1558:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -472,7 +472,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3586, + "id": 3638, "isConstant": false, "isLValue": false, "isPure": true, @@ -495,7 +495,7 @@ "typeString": "int_const 0" } ], - "id": 3585, + "id": 3637, "isConstant": false, "isLValue": false, "isPure": true, @@ -508,7 +508,7 @@ }, "typeName": "address" }, - "id": 3587, + "id": 3639, "isConstant": false, "isLValue": false, "isPure": true, @@ -529,29 +529,29 @@ } }, "falseBody": null, - "id": 3597, + "id": 3649, "nodeType": "IfStatement", "src": "1554:138:21", "trueBody": { - "id": 3596, + "id": 3648, "nodeType": "Block", "src": "1580:112:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3594, + "id": 3646, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3589, + "id": 3641, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1654:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -565,11 +565,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3592, + "id": 3644, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3568, + "referencedDeclaration": 3620, "src": "1675:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -586,32 +586,32 @@ ], "expression": { "argumentTypes": null, - "id": 3590, + "id": 3642, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "1663:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3591, + "id": 3643, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "write", "nodeType": "MemberAccess", - "referencedDeclaration": 3787, + "referencedDeclaration": 3839, "src": "1663:11:21", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes_memory_ptr_$returns$_t_address_$", "typeString": "function (bytes memory) external returns (address)" } }, - "id": 3593, + "id": 3645, "isConstant": false, "isLValue": false, "isPure": false, @@ -631,7 +631,7 @@ "typeString": "address" } }, - "id": 3595, + "id": 3647, "nodeType": "ExpressionStatement", "src": "1654:27:21" } @@ -641,18 +641,18 @@ { "expression": { "argumentTypes": null, - "id": 3603, + "id": 3655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3598, + "id": 3650, "name": "response", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3575, + "referencedDeclaration": 3627, "src": "1702:8:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -666,11 +666,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3600, + "id": 3652, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1721:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -679,11 +679,11 @@ }, { "argumentTypes": null, - "id": 3601, + "id": 3653, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3570, + "referencedDeclaration": 3622, "src": "1729:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -702,21 +702,21 @@ "typeString": "bytes memory" } ], - "id": 3599, + "id": 3651, "name": "execute", "nodeType": "Identifier", "overloadedDeclarations": [ - 3606, - 3630 + 3658, + 3682 ], - "referencedDeclaration": 3630, + "referencedDeclaration": 3682, "src": "1713:7:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$", "typeString": "function (address,bytes memory) returns (bytes memory)" } }, - "id": 3602, + "id": 3654, "isConstant": false, "isLValue": false, "isPure": false, @@ -736,29 +736,29 @@ "typeString": "bytes memory" } }, - "id": 3604, + "id": 3656, "nodeType": "ExpressionStatement", "src": "1702:33:21" } ] }, "documentation": null, - "id": 3606, + "id": 3658, "implemented": true, "kind": "function", "modifiers": [], "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 3571, + "id": 3623, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3568, + "id": 3620, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1377:18:21", "stateVariable": false, "storageLocation": "memory", @@ -767,7 +767,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3567, + "id": 3619, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1377:5:21", @@ -781,10 +781,10 @@ }, { "constant": false, - "id": 3570, + "id": 3622, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1397:18:21", "stateVariable": false, "storageLocation": "memory", @@ -793,7 +793,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3569, + "id": 3621, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1397:5:21", @@ -809,15 +809,15 @@ "src": "1376:40:21" }, "returnParameters": { - "id": 3576, + "id": 3628, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3573, + "id": 3625, "name": "target", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1465:14:21", "stateVariable": false, "storageLocation": "default", @@ -826,7 +826,7 @@ "typeString": "address" }, "typeName": { - "id": 3572, + "id": 3624, "name": "address", "nodeType": "ElementaryTypeName", "src": "1465:7:21", @@ -841,10 +841,10 @@ }, { "constant": false, - "id": 3575, + "id": 3627, "name": "response", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1481:21:21", "stateVariable": false, "storageLocation": "memory", @@ -853,7 +853,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3574, + "id": 3626, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1481:5:21", @@ -868,7 +868,7 @@ ], "src": "1464:39:21" }, - "scope": 3660, + "scope": 3712, "src": "1360:382:21", "stateMutability": "payable", "superFunction": null, @@ -876,7 +876,7 @@ }, { "body": { - "id": 3629, + "id": 3681, "nodeType": "Block", "src": "1903:685:21", "statements": [ @@ -890,18 +890,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3624, + "id": 3676, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3620, + "id": 3672, "name": "_target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3608, + "referencedDeclaration": 3660, "src": "1921:7:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -916,7 +916,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3622, + "id": 3674, "isConstant": false, "isLValue": false, "isPure": true, @@ -939,7 +939,7 @@ "typeString": "int_const 0" } ], - "id": 3621, + "id": 3673, "isConstant": false, "isLValue": false, "isPure": true, @@ -952,7 +952,7 @@ }, "typeName": "address" }, - "id": 3623, + "id": 3675, "isConstant": false, "isLValue": false, "isPure": true, @@ -975,7 +975,7 @@ { "argumentTypes": null, "hexValue": "64732d70726f78792d7461726765742d616464726573732d7265717569726564", - "id": 3625, + "id": 3677, "isConstant": false, "isLValue": false, "isPure": true, @@ -1002,21 +1002,21 @@ "typeString": "literal_string \"ds-proxy-target-address-required\"" } ], - "id": 3619, + "id": 3671, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1913:7:21", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3626, + "id": 3678, "isConstant": false, "isLValue": false, "isPure": false, @@ -1030,7 +1030,7 @@ "typeString": "tuple()" } }, - "id": 3627, + "id": 3679, "nodeType": "ExpressionStatement", "src": "1913:66:21" }, @@ -1038,7 +1038,7 @@ "externalReferences": [ { "_data": { - "declaration": 3610, + "declaration": 3662, "isOffset": false, "isSlot": false, "src": "2136:5:21", @@ -1047,7 +1047,7 @@ }, { "_data": { - "declaration": 3610, + "declaration": 3662, "isOffset": false, "isSlot": false, "src": "2116:5:21", @@ -1056,7 +1056,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2202:8:21", @@ -1065,7 +1065,7 @@ }, { "_target": { - "declaration": 3608, + "declaration": 3660, "isOffset": false, "isSlot": false, "src": "2103:7:21", @@ -1074,7 +1074,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2376:8:21", @@ -1083,7 +1083,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2329:8:21", @@ -1092,7 +1092,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2255:8:21", @@ -1101,7 +1101,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2536:8:21", @@ -1109,7 +1109,7 @@ } } ], - "id": 3628, + "id": 3680, "nodeType": "InlineAssembly", "operations": "{\n let succeeded := delegatecall(sub(gas(), 5000), _target, add(_data, 0x20), mload(_data), 0, 0)\n let size := returndatasize()\n response := mload(0x40)\n mstore(0x40, add(response, and(add(add(size, 0x20), 0x1f), not(0x1f))))\n mstore(response, size)\n returndatacopy(add(response, 0x20), 0, size)\n switch iszero(succeeded)\n case 1 {\n revert(add(response, 0x20), size)\n }\n}", "src": "2034:548:21" @@ -1117,20 +1117,20 @@ ] }, "documentation": null, - "id": 3630, + "id": 3682, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3613, + "id": 3665, "modifierName": { "argumentTypes": null, - "id": 3612, + "id": 3664, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1825:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -1142,14 +1142,14 @@ }, { "arguments": null, - "id": 3615, + "id": 3667, "modifierName": { "argumentTypes": null, - "id": 3614, + "id": 3666, "name": "note", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, + "referencedDeclaration": 3593, "src": "1838:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -1163,15 +1163,15 @@ "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 3611, + "id": 3663, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3608, + "id": 3660, "name": "_target", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1765:15:21", "stateVariable": false, "storageLocation": "default", @@ -1180,7 +1180,7 @@ "typeString": "address" }, "typeName": { - "id": 3607, + "id": 3659, "name": "address", "nodeType": "ElementaryTypeName", "src": "1765:7:21", @@ -1195,10 +1195,10 @@ }, { "constant": false, - "id": 3610, + "id": 3662, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1782:18:21", "stateVariable": false, "storageLocation": "memory", @@ -1207,7 +1207,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3609, + "id": 3661, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1782:5:21", @@ -1223,15 +1223,15 @@ "src": "1764:37:21" }, "returnParameters": { - "id": 3618, + "id": 3670, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3617, + "id": 3669, "name": "response", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1876:21:21", "stateVariable": false, "storageLocation": "memory", @@ -1240,7 +1240,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3616, + "id": 3668, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1876:5:21", @@ -1255,7 +1255,7 @@ ], "src": "1875:23:21" }, - "scope": 3660, + "scope": 3712, "src": "1748:840:21", "stateMutability": "payable", "superFunction": null, @@ -1263,7 +1263,7 @@ }, { "body": { - "id": 3658, + "id": 3710, "nodeType": "Block", "src": "2720:168:21", "statements": [ @@ -1277,18 +1277,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3646, + "id": 3698, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3642, + "id": 3694, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, + "referencedDeclaration": 3684, "src": "2738:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1303,7 +1303,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3644, + "id": 3696, "isConstant": false, "isLValue": false, "isPure": true, @@ -1326,7 +1326,7 @@ "typeString": "int_const 0" } ], - "id": 3643, + "id": 3695, "isConstant": false, "isLValue": false, "isPure": true, @@ -1339,7 +1339,7 @@ }, "typeName": "address" }, - "id": 3645, + "id": 3697, "isConstant": false, "isLValue": false, "isPure": true, @@ -1362,7 +1362,7 @@ { "argumentTypes": null, "hexValue": "64732d70726f78792d63616368652d616464726573732d7265717569726564", - "id": 3647, + "id": 3699, "isConstant": false, "isLValue": false, "isPure": true, @@ -1389,21 +1389,21 @@ "typeString": "literal_string \"ds-proxy-cache-address-required\"" } ], - "id": 3641, + "id": 3693, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2730:7:21", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3648, + "id": 3700, "isConstant": false, "isLValue": false, "isPure": false, @@ -1417,28 +1417,28 @@ "typeString": "tuple()" } }, - "id": 3649, + "id": 3701, "nodeType": "ExpressionStatement", "src": "2730:68:21" }, { "expression": { "argumentTypes": null, - "id": 3654, + "id": 3706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3650, + "id": 3702, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "2808:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -1449,11 +1449,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3652, + "id": 3704, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, + "referencedDeclaration": 3684, "src": "2829:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1468,18 +1468,18 @@ "typeString": "address" } ], - "id": 3651, + "id": 3703, "name": "DSProxyCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "2816:12:21", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_type$_t_contract$_DSProxyCache_$3840_$", "typeString": "type(contract DSProxyCache)" } }, - "id": 3653, + "id": 3705, "isConstant": false, "isLValue": false, "isPure": false, @@ -1489,17 +1489,17 @@ "nodeType": "FunctionCall", "src": "2816:24:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "2808:32:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3655, + "id": 3707, "nodeType": "ExpressionStatement", "src": "2808:32:21" }, @@ -1507,7 +1507,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3656, + "id": 3708, "isConstant": false, "isLValue": false, "isPure": true, @@ -1522,28 +1522,28 @@ }, "value": "true" }, - "functionReturnParameters": 3640, - "id": 3657, + "functionReturnParameters": 3692, + "id": 3709, "nodeType": "Return", "src": "2870:11:21" } ] }, "documentation": null, - "id": 3659, + "id": 3711, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3635, + "id": 3687, "modifierName": { "argumentTypes": null, - "id": 3634, + "id": 3686, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "2675:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -1555,14 +1555,14 @@ }, { "arguments": null, - "id": 3637, + "id": 3689, "modifierName": { "argumentTypes": null, - "id": 3636, + "id": 3688, "name": "note", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, + "referencedDeclaration": 3593, "src": "2688:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -1576,15 +1576,15 @@ "name": "setCache", "nodeType": "FunctionDefinition", "parameters": { - "id": 3633, + "id": 3685, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3632, + "id": 3684, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 3659, + "scope": 3711, "src": "2632:18:21", "stateVariable": false, "storageLocation": "default", @@ -1593,7 +1593,7 @@ "typeString": "address" }, "typeName": { - "id": 3631, + "id": 3683, "name": "address", "nodeType": "ElementaryTypeName", "src": "2632:7:21", @@ -1610,15 +1610,15 @@ "src": "2631:20:21" }, "returnParameters": { - "id": 3640, + "id": 3692, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3639, + "id": 3691, "name": "", "nodeType": "VariableDeclaration", - "scope": 3659, + "scope": 3711, "src": "2710:4:21", "stateVariable": false, "storageLocation": "default", @@ -1627,7 +1627,7 @@ "typeString": "bool" }, "typeName": { - "id": 3638, + "id": 3690, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2710:4:21", @@ -1642,28 +1642,28 @@ ], "src": "2709:6:21" }, - "scope": 3660, + "scope": 3712, "src": "2614:274:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "1068:1822:21" }, { "baseContracts": [], "contractDependencies": [ - 3660, - 3788 + 3712, + 3840 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3744, + "id": 3796, "linearizedBaseContracts": [ - 3744 + 3796 ], "name": "DSProxyFactory", "nodeType": "ContractDefinition", @@ -1671,20 +1671,20 @@ { "anonymous": false, "documentation": null, - "id": 3670, + "id": 3722, "name": "Created", "nodeType": "EventDefinition", "parameters": { - "id": 3669, + "id": 3721, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3662, + "id": 3714, "indexed": true, "name": "sender", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3053:22:21", "stateVariable": false, "storageLocation": "default", @@ -1693,7 +1693,7 @@ "typeString": "address" }, "typeName": { - "id": 3661, + "id": 3713, "name": "address", "nodeType": "ElementaryTypeName", "src": "3053:7:21", @@ -1708,11 +1708,11 @@ }, { "constant": false, - "id": 3664, + "id": 3716, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3077:21:21", "stateVariable": false, "storageLocation": "default", @@ -1721,7 +1721,7 @@ "typeString": "address" }, "typeName": { - "id": 3663, + "id": 3715, "name": "address", "nodeType": "ElementaryTypeName", "src": "3077:7:21", @@ -1736,11 +1736,11 @@ }, { "constant": false, - "id": 3666, + "id": 3718, "indexed": false, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3100:13:21", "stateVariable": false, "storageLocation": "default", @@ -1749,7 +1749,7 @@ "typeString": "address" }, "typeName": { - "id": 3665, + "id": 3717, "name": "address", "nodeType": "ElementaryTypeName", "src": "3100:7:21", @@ -1764,11 +1764,11 @@ }, { "constant": false, - "id": 3668, + "id": 3720, "indexed": false, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3115:13:21", "stateVariable": false, "storageLocation": "default", @@ -1777,7 +1777,7 @@ "typeString": "address" }, "typeName": { - "id": 3667, + "id": 3719, "name": "address", "nodeType": "ElementaryTypeName", "src": "3115:7:21", @@ -1797,10 +1797,10 @@ }, { "constant": false, - "id": 3674, + "id": 3726, "name": "proxies", "nodeType": "VariableDeclaration", - "scope": 3744, + "scope": 3796, "src": "3135:40:21", "stateVariable": true, "storageLocation": "default", @@ -1809,9 +1809,9 @@ "typeString": "mapping(address => address)" }, "typeName": { - "id": 3673, + "id": 3725, "keyType": { - "id": 3671, + "id": 3723, "name": "address", "nodeType": "ElementaryTypeName", "src": "3143:7:21", @@ -1827,7 +1827,7 @@ "typeString": "mapping(address => address)" }, "valueType": { - "id": 3672, + "id": 3724, "name": "address", "nodeType": "ElementaryTypeName", "src": "3152:7:21", @@ -1843,26 +1843,26 @@ }, { "constant": false, - "id": 3676, + "id": 3728, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3744, + "scope": 3796, "src": "3181:25:21", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 3675, + "id": 3727, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "3181:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -1871,28 +1871,28 @@ }, { "body": { - "id": 3685, + "id": 3737, "nodeType": "Block", "src": "3234:43:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3683, + "id": 3735, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3679, + "id": 3731, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3244:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -1903,7 +1903,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3681, + "id": 3733, "isConstant": false, "isLValue": false, "isPure": false, @@ -1911,23 +1911,23 @@ "nodeType": "NewExpression", "src": "3252:16:21", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3840_$", "typeString": "function () returns (contract DSProxyCache)" }, "typeName": { "contractScope": null, - "id": 3680, + "id": 3732, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "3256:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } }, - "id": 3682, + "id": 3734, "isConstant": false, "isLValue": false, "isPure": false, @@ -1937,42 +1937,42 @@ "nodeType": "FunctionCall", "src": "3252:18:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "3244:26:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3684, + "id": 3736, "nodeType": "ExpressionStatement", "src": "3244:26:21" } ] }, "documentation": null, - "id": 3686, + "id": 3738, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3677, + "id": 3729, "nodeType": "ParameterList", "parameters": [], "src": "3224:2:21" }, "returnParameters": { - "id": 3678, + "id": 3730, "nodeType": "ParameterList", "parameters": [], "src": "3234:0:21" }, - "scope": 3744, + "scope": 3796, "src": "3213:64:21", "stateMutability": "nonpayable", "superFunction": null, @@ -1980,25 +1980,25 @@ }, { "body": { - "id": 3698, + "id": 3750, "nodeType": "Block", "src": "3412:42:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3696, + "id": 3748, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3691, + "id": 3743, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, + "referencedDeclaration": 3741, "src": "3422:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2014,18 +2014,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3693, + "id": 3745, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "3436:3:21", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3694, + "id": 3746, "isConstant": false, "isLValue": false, "isPure": false, @@ -2047,21 +2047,21 @@ "typeString": "address payable" } ], - "id": 3692, + "id": 3744, "name": "build", "nodeType": "Identifier", "overloadedDeclarations": [ - 3699, - 3743 + 3751, + 3795 ], - "referencedDeclaration": 3743, + "referencedDeclaration": 3795, "src": "3430:5:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_address_payable_$", "typeString": "function (address) returns (address payable)" } }, - "id": 3695, + "id": 3747, "isConstant": false, "isLValue": false, "isPure": false, @@ -2081,35 +2081,35 @@ "typeString": "address payable" } }, - "id": 3697, + "id": 3749, "nodeType": "ExpressionStatement", "src": "3422:25:21" } ] }, "documentation": null, - "id": 3699, + "id": 3751, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 3687, + "id": 3739, "nodeType": "ParameterList", "parameters": [], "src": "3370:2:21" }, "returnParameters": { - "id": 3690, + "id": 3742, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3689, + "id": 3741, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3699, + "scope": 3751, "src": "3389:21:21", "stateVariable": false, "storageLocation": "default", @@ -2118,7 +2118,7 @@ "typeString": "address payable" }, "typeName": { - "id": 3688, + "id": 3740, "name": "address", "nodeType": "ElementaryTypeName", "src": "3389:15:21", @@ -2134,7 +2134,7 @@ ], "src": "3388:23:21" }, - "scope": 3744, + "scope": 3796, "src": "3356:98:21", "stateMutability": "nonpayable", "superFunction": null, @@ -2142,25 +2142,25 @@ }, { "body": { - "id": 3742, + "id": 3794, "nodeType": "Block", "src": "3599:206:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3715, + "id": 3767, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3706, + "id": 3758, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3609:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2180,14 +2180,14 @@ "arguments": [ { "argumentTypes": null, - "id": 3711, + "id": 3763, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3645:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -2195,11 +2195,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 3710, + "id": 3762, "isConstant": false, "isLValue": false, "isPure": true, @@ -2212,7 +2212,7 @@ }, "typeName": "address" }, - "id": 3712, + "id": 3764, "isConstant": false, "isLValue": false, "isPure": false, @@ -2234,7 +2234,7 @@ "typeString": "address" } ], - "id": 3709, + "id": 3761, "isConstant": false, "isLValue": false, "isPure": false, @@ -2242,23 +2242,23 @@ "nodeType": "NewExpression", "src": "3625:11:21", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DSProxy_$3660_$", + "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DSProxy_$3712_$", "typeString": "function (address) returns (contract DSProxy)" }, "typeName": { "contractScope": null, - "id": 3708, + "id": 3760, "name": "DSProxy", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "3629:7:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } } }, - "id": 3713, + "id": 3765, "isConstant": false, "isLValue": false, "isPure": false, @@ -2268,7 +2268,7 @@ "nodeType": "FunctionCall", "src": "3625:27:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } } @@ -2276,11 +2276,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } ], - "id": 3707, + "id": 3759, "isConstant": false, "isLValue": false, "isPure": true, @@ -2293,7 +2293,7 @@ }, "typeName": "address" }, - "id": 3714, + "id": 3766, "isConstant": false, "isLValue": false, "isPure": false, @@ -2313,7 +2313,7 @@ "typeString": "address payable" } }, - "id": 3716, + "id": 3768, "nodeType": "ExpressionStatement", "src": "3609:44:21" }, @@ -2325,18 +2325,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3718, + "id": 3770, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "3676:3:21", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3719, + "id": 3771, "isConstant": false, "isLValue": false, "isPure": false, @@ -2352,11 +2352,11 @@ }, { "argumentTypes": null, - "id": 3720, + "id": 3772, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3688:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2368,11 +2368,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3722, + "id": 3774, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3703:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2387,7 +2387,7 @@ "typeString": "address payable" } ], - "id": 3721, + "id": 3773, "isConstant": false, "isLValue": false, "isPure": true, @@ -2400,7 +2400,7 @@ }, "typeName": "address" }, - "id": 3723, + "id": 3775, "isConstant": false, "isLValue": false, "isPure": false, @@ -2419,14 +2419,14 @@ "arguments": [ { "argumentTypes": null, - "id": 3725, + "id": 3777, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3719:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -2434,11 +2434,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 3724, + "id": 3776, "isConstant": false, "isLValue": false, "isPure": true, @@ -2451,7 +2451,7 @@ }, "typeName": "address" }, - "id": 3726, + "id": 3778, "isConstant": false, "isLValue": false, "isPure": false, @@ -2485,18 +2485,18 @@ "typeString": "address" } ], - "id": 3717, + "id": 3769, "name": "Created", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3670, + "referencedDeclaration": 3722, "src": "3668:7:21", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_address_$returns$__$", "typeString": "function (address,address,address,address)" } }, - "id": 3727, + "id": 3779, "isConstant": false, "isLValue": false, "isPure": false, @@ -2510,7 +2510,7 @@ "typeString": "tuple()" } }, - "id": 3728, + "id": 3780, "nodeType": "EmitStatement", "src": "3663:63:21" }, @@ -2520,11 +2520,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3733, + "id": 3785, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3760:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2544,11 +2544,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3730, + "id": 3782, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3744:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2563,18 +2563,18 @@ "typeString": "address payable" } ], - "id": 3729, + "id": 3781, "name": "DSProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "3736:7:21", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSProxy_$3660_$", + "typeIdentifier": "t_type$_t_contract$_DSProxy_$3712_$", "typeString": "type(contract DSProxy)" } }, - "id": 3731, + "id": 3783, "isConstant": false, "isLValue": false, "isPure": false, @@ -2584,25 +2584,25 @@ "nodeType": "FunctionCall", "src": "3736:14:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } }, - "id": 3732, + "id": 3784, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "3736:23:21", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 3734, + "id": 3786, "isConstant": false, "isLValue": false, "isPure": false, @@ -2616,14 +2616,14 @@ "typeString": "tuple()" } }, - "id": 3735, + "id": 3787, "nodeType": "ExpressionStatement", "src": "3736:30:21" }, { "expression": { "argumentTypes": null, - "id": 3740, + "id": 3792, "isConstant": false, "isLValue": false, "isPure": false, @@ -2632,25 +2632,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3736, + "id": 3788, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3674, + "referencedDeclaration": 3726, "src": "3776:7:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 3738, + "id": 3790, "indexExpression": { "argumentTypes": null, - "id": 3737, + "id": 3789, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3784:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2672,11 +2672,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3739, + "id": 3791, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3793:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2689,29 +2689,29 @@ "typeString": "address" } }, - "id": 3741, + "id": 3793, "nodeType": "ExpressionStatement", "src": "3776:22:21" } ] }, "documentation": null, - "id": 3743, + "id": 3795, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 3702, + "id": 3754, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3701, + "id": 3753, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3743, + "scope": 3795, "src": "3545:13:21", "stateVariable": false, "storageLocation": "default", @@ -2720,7 +2720,7 @@ "typeString": "address" }, "typeName": { - "id": 3700, + "id": 3752, "name": "address", "nodeType": "ElementaryTypeName", "src": "3545:7:21", @@ -2737,15 +2737,15 @@ "src": "3544:15:21" }, "returnParameters": { - "id": 3705, + "id": 3757, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3704, + "id": 3756, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3743, + "scope": 3795, "src": "3576:21:21", "stateVariable": false, "storageLocation": "default", @@ -2754,7 +2754,7 @@ "typeString": "address payable" }, "typeName": { - "id": 3703, + "id": 3755, "name": "address", "nodeType": "ElementaryTypeName", "src": "3576:15:21", @@ -2770,14 +2770,14 @@ ], "src": "3575:23:21" }, - "scope": 3744, + "scope": 3796, "src": "3530:275:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "3009:798:21" }, { @@ -2786,19 +2786,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3788, + "id": 3840, "linearizedBaseContracts": [ - 3788 + 3840 ], "name": "DSProxyCache", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3748, + "id": 3800, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3788, + "scope": 3840, "src": "4263:33:21", "stateVariable": true, "storageLocation": "default", @@ -2807,9 +2807,9 @@ "typeString": "mapping(bytes32 => address)" }, "typeName": { - "id": 3747, + "id": 3799, "keyType": { - "id": 3745, + "id": 3797, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4271:7:21", @@ -2825,7 +2825,7 @@ "typeString": "mapping(bytes32 => address)" }, "valueType": { - "id": 3746, + "id": 3798, "name": "address", "nodeType": "ElementaryTypeName", "src": "4282:7:21", @@ -2841,21 +2841,21 @@ }, { "body": { - "id": 3765, + "id": 3817, "nodeType": "Block", "src": "4367:76:21", "statements": [ { "assignments": [ - 3756 + 3808 ], "declarations": [ { "constant": false, - "id": 3756, + "id": 3808, "name": "hash", "nodeType": "VariableDeclaration", - "scope": 3765, + "scope": 3817, "src": "4377:12:21", "stateVariable": false, "storageLocation": "default", @@ -2864,7 +2864,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3755, + "id": 3807, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4377:7:21", @@ -2877,17 +2877,17 @@ "visibility": "internal" } ], - "id": 3760, + "id": 3812, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3758, + "id": 3810, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3750, + "referencedDeclaration": 3802, "src": "4402:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -2902,18 +2902,18 @@ "typeString": "bytes memory" } ], - "id": 3757, + "id": 3809, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7821, + "referencedDeclaration": 7812, "src": "4392:9:21", "typeDescriptions": { "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$", "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 3759, + "id": 3811, "isConstant": false, "isLValue": false, "isPure": false, @@ -2935,25 +2935,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3761, + "id": 3813, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3748, + "referencedDeclaration": 3800, "src": "4425:5:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_address_$", "typeString": "mapping(bytes32 => address)" } }, - "id": 3763, + "id": 3815, "indexExpression": { "argumentTypes": null, - "id": 3762, + "id": 3814, "name": "hash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3756, + "referencedDeclaration": 3808, "src": "4431:4:21", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -2971,30 +2971,30 @@ "typeString": "address" } }, - "functionReturnParameters": 3754, - "id": 3764, + "functionReturnParameters": 3806, + "id": 3816, "nodeType": "Return", "src": "4418:18:21" } ] }, "documentation": null, - "id": 3766, + "id": 3818, "implemented": true, "kind": "function", "modifiers": [], "name": "read", "nodeType": "FunctionDefinition", "parameters": { - "id": 3751, + "id": 3803, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3750, + "id": 3802, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3766, + "scope": 3818, "src": "4317:18:21", "stateVariable": false, "storageLocation": "memory", @@ -3003,7 +3003,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3749, + "id": 3801, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4317:5:21", @@ -3019,15 +3019,15 @@ "src": "4316:20:21" }, "returnParameters": { - "id": 3754, + "id": 3806, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3753, + "id": 3805, "name": "", "nodeType": "VariableDeclaration", - "scope": 3766, + "scope": 3818, "src": "4358:7:21", "stateVariable": false, "storageLocation": "default", @@ -3036,7 +3036,7 @@ "typeString": "address" }, "typeName": { - "id": 3752, + "id": 3804, "name": "address", "nodeType": "ElementaryTypeName", "src": "4358:7:21", @@ -3052,7 +3052,7 @@ ], "src": "4357:9:21" }, - "scope": 3788, + "scope": 3840, "src": "4303:140:21", "stateMutability": "view", "superFunction": null, @@ -3060,7 +3060,7 @@ }, { "body": { - "id": 3786, + "id": 3838, "nodeType": "Block", "src": "4516:336:21", "statements": [ @@ -3068,7 +3068,7 @@ "externalReferences": [ { "target": { - "declaration": 3771, + "declaration": 3823, "isOffset": false, "isSlot": false, "src": "4549:6:21", @@ -3077,7 +3077,7 @@ }, { "_code": { - "declaration": 3768, + "declaration": 3820, "isOffset": false, "isSlot": false, "src": "4593:5:21", @@ -3086,7 +3086,7 @@ }, { "_code": { - "declaration": 3768, + "declaration": 3820, "isOffset": false, "isSlot": false, "src": "4573:5:21", @@ -3095,7 +3095,7 @@ }, { "target": { - "declaration": 3771, + "declaration": 3823, "isOffset": false, "isSlot": false, "src": "4639:6:21", @@ -3103,22 +3103,22 @@ } } ], - "id": 3773, + "id": 3825, "nodeType": "InlineAssembly", "operations": "{\n target := create(0, add(_code, 0x20), mload(_code))\n switch iszero(extcodesize(target))\n case 1 { revert(0, 0) }\n}", "src": "4526:249:21" }, { "assignments": [ - 3775 + 3827 ], "declarations": [ { "constant": false, - "id": 3775, + "id": 3827, "name": "hash", "nodeType": "VariableDeclaration", - "scope": 3786, + "scope": 3838, "src": "4784:12:21", "stateVariable": false, "storageLocation": "default", @@ -3127,7 +3127,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3774, + "id": 3826, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4784:7:21", @@ -3140,17 +3140,17 @@ "visibility": "internal" } ], - "id": 3779, + "id": 3831, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3777, + "id": 3829, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3768, + "referencedDeclaration": 3820, "src": "4809:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3165,18 +3165,18 @@ "typeString": "bytes memory" } ], - "id": 3776, + "id": 3828, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7821, + "referencedDeclaration": 7812, "src": "4799:9:21", "typeDescriptions": { "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$", "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 3778, + "id": 3830, "isConstant": false, "isLValue": false, "isPure": false, @@ -3196,7 +3196,7 @@ { "expression": { "argumentTypes": null, - "id": 3784, + "id": 3836, "isConstant": false, "isLValue": false, "isPure": false, @@ -3205,25 +3205,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3780, + "id": 3832, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3748, + "referencedDeclaration": 3800, "src": "4825:5:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_address_$", "typeString": "mapping(bytes32 => address)" } }, - "id": 3782, + "id": 3834, "indexExpression": { "argumentTypes": null, - "id": 3781, + "id": 3833, "name": "hash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3775, + "referencedDeclaration": 3827, "src": "4831:4:21", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -3245,11 +3245,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3783, + "id": 3835, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3771, + "referencedDeclaration": 3823, "src": "4839:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3262,29 +3262,29 @@ "typeString": "address" } }, - "id": 3785, + "id": 3837, "nodeType": "ExpressionStatement", "src": "4825:20:21" } ] }, "documentation": null, - "id": 3787, + "id": 3839, "implemented": true, "kind": "function", "modifiers": [], "name": "write", "nodeType": "FunctionDefinition", "parameters": { - "id": 3769, + "id": 3821, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3768, + "id": 3820, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3787, + "scope": 3839, "src": "4464:18:21", "stateVariable": false, "storageLocation": "memory", @@ -3293,7 +3293,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3767, + "id": 3819, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4464:5:21", @@ -3309,15 +3309,15 @@ "src": "4463:20:21" }, "returnParameters": { - "id": 3772, + "id": 3824, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3771, + "id": 3823, "name": "target", "nodeType": "VariableDeclaration", - "scope": 3787, + "scope": 3839, "src": "4500:14:21", "stateVariable": false, "storageLocation": "default", @@ -3326,7 +3326,7 @@ "typeString": "address" }, "typeName": { - "id": 3770, + "id": 3822, "name": "address", "nodeType": "ElementaryTypeName", "src": "4500:7:21", @@ -3342,14 +3342,14 @@ ], "src": "4499:16:21" }, - "scope": 3788, + "scope": 3840, "src": "4449:403:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "4235:619:21" } ], @@ -3359,20 +3359,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol", "exportedSymbols": { "DSProxy": [ - 3660 + 3712 ], "DSProxyCache": [ - 3788 + 3840 ], "DSProxyFactory": [ - 3744 + 3796 ] }, - "id": 3789, + "id": 3841, "nodeType": "SourceUnit", "nodes": [ { - "id": 3544, + "id": 3596, "literals": [ "solidity", ">=", @@ -3388,10 +3388,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "file": "./Auth.sol", - "id": 3545, + "id": 3597, "nodeType": "ImportDirective", - "scope": 3789, - "sourceUnit": 2925, + "scope": 3841, + "sourceUnit": 2977, "src": "785:20:21", "symbolAliases": [], "unitAlias": "" @@ -3399,10 +3399,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol", "file": "./Note.sol", - "id": 3546, + "id": 3598, "nodeType": "ImportDirective", - "scope": 3789, - "sourceUnit": 3543, + "scope": 3841, + "sourceUnit": 3595, "src": "806:20:21", "symbolAliases": [], "unitAlias": "" @@ -3413,17 +3413,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3547, + "id": 3599, "name": "DSAuth", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2924, + "referencedDeclaration": 2976, "src": "1088:6:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } }, - "id": 3548, + "id": 3600, "nodeType": "InheritanceSpecifier", "src": "1088:6:21" }, @@ -3431,61 +3431,61 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3549, + "id": 3601, "name": "DSNote", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3542, + "referencedDeclaration": 3594, "src": "1096:6:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSNote_$3542", + "typeIdentifier": "t_contract$_DSNote_$3594", "typeString": "contract DSNote" } }, - "id": 3550, + "id": 3602, "nodeType": "InheritanceSpecifier", "src": "1096:6:21" } ], "contractDependencies": [ - 2808, - 2924, - 3542 + 2860, + 2976, + 3594 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3660, + "id": 3712, "linearizedBaseContracts": [ - 3660, - 3542, - 2924, - 2808 + 3712, + 3594, + 2976, + 2860 ], "name": "DSProxy", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3552, + "id": 3604, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3660, + "scope": 3712, "src": "1109:25:21", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 3551, + "id": 3603, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "1109:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -3494,7 +3494,7 @@ }, { "body": { - "id": 3561, + "id": 3613, "nodeType": "Block", "src": "1211:37:21", "statements": [ @@ -3504,11 +3504,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3558, + "id": 3610, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3554, + "referencedDeclaration": 3606, "src": "1230:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3523,18 +3523,18 @@ "typeString": "address" } ], - "id": 3557, + "id": 3609, "name": "setCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3659, + "referencedDeclaration": 3711, "src": "1221:8:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_bool_$", "typeString": "function (address) returns (bool)" } }, - "id": 3559, + "id": 3611, "isConstant": false, "isLValue": false, "isPure": false, @@ -3548,29 +3548,29 @@ "typeString": "bool" } }, - "id": 3560, + "id": 3612, "nodeType": "ExpressionStatement", "src": "1221:20:21" } ] }, "documentation": null, - "id": 3562, + "id": 3614, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3555, + "id": 3607, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3554, + "id": 3606, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 3562, + "scope": 3614, "src": "1184:18:21", "stateVariable": false, "storageLocation": "default", @@ -3579,7 +3579,7 @@ "typeString": "address" }, "typeName": { - "id": 3553, + "id": 3605, "name": "address", "nodeType": "ElementaryTypeName", "src": "1184:7:21", @@ -3596,12 +3596,12 @@ "src": "1183:20:21" }, "returnParameters": { - "id": 3556, + "id": 3608, "nodeType": "ParameterList", "parameters": [], "src": "1211:0:21" }, - "scope": 3660, + "scope": 3712, "src": "1172:76:21", "stateMutability": "nonpayable", "superFunction": null, @@ -3609,31 +3609,31 @@ }, { "body": { - "id": 3565, + "id": 3617, "nodeType": "Block", "src": "1282:7:21", "statements": [] }, "documentation": null, - "id": 3566, + "id": 3618, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3563, + "id": 3615, "nodeType": "ParameterList", "parameters": [], "src": "1262:2:21" }, "returnParameters": { - "id": 3564, + "id": 3616, "nodeType": "ParameterList", "parameters": [], "src": "1282:0:21" }, - "scope": 3660, + "scope": 3712, "src": "1254:35:21", "stateMutability": "payable", "superFunction": null, @@ -3641,25 +3641,25 @@ }, { "body": { - "id": 3605, + "id": 3657, "nodeType": "Block", "src": "1508:234:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3582, + "id": 3634, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3577, + "id": 3629, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1518:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3673,11 +3673,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3580, + "id": 3632, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3568, + "referencedDeclaration": 3620, "src": "1538:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3694,32 +3694,32 @@ ], "expression": { "argumentTypes": null, - "id": 3578, + "id": 3630, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "1527:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3579, + "id": 3631, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "read", "nodeType": "MemberAccess", - "referencedDeclaration": 3766, + "referencedDeclaration": 3818, "src": "1527:10:21", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes_memory_ptr_$returns$_t_address_$", "typeString": "function (bytes memory) view external returns (address)" } }, - "id": 3581, + "id": 3633, "isConstant": false, "isLValue": false, "isPure": false, @@ -3739,7 +3739,7 @@ "typeString": "address" } }, - "id": 3583, + "id": 3635, "nodeType": "ExpressionStatement", "src": "1518:26:21" }, @@ -3750,18 +3750,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3588, + "id": 3640, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3584, + "id": 3636, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1558:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3776,7 +3776,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3586, + "id": 3638, "isConstant": false, "isLValue": false, "isPure": true, @@ -3799,7 +3799,7 @@ "typeString": "int_const 0" } ], - "id": 3585, + "id": 3637, "isConstant": false, "isLValue": false, "isPure": true, @@ -3812,7 +3812,7 @@ }, "typeName": "address" }, - "id": 3587, + "id": 3639, "isConstant": false, "isLValue": false, "isPure": true, @@ -3833,29 +3833,29 @@ } }, "falseBody": null, - "id": 3597, + "id": 3649, "nodeType": "IfStatement", "src": "1554:138:21", "trueBody": { - "id": 3596, + "id": 3648, "nodeType": "Block", "src": "1580:112:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3594, + "id": 3646, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3589, + "id": 3641, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1654:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3869,11 +3869,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3592, + "id": 3644, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3568, + "referencedDeclaration": 3620, "src": "1675:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3890,32 +3890,32 @@ ], "expression": { "argumentTypes": null, - "id": 3590, + "id": 3642, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "1663:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3591, + "id": 3643, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "write", "nodeType": "MemberAccess", - "referencedDeclaration": 3787, + "referencedDeclaration": 3839, "src": "1663:11:21", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes_memory_ptr_$returns$_t_address_$", "typeString": "function (bytes memory) external returns (address)" } }, - "id": 3593, + "id": 3645, "isConstant": false, "isLValue": false, "isPure": false, @@ -3935,7 +3935,7 @@ "typeString": "address" } }, - "id": 3595, + "id": 3647, "nodeType": "ExpressionStatement", "src": "1654:27:21" } @@ -3945,18 +3945,18 @@ { "expression": { "argumentTypes": null, - "id": 3603, + "id": 3655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3598, + "id": 3650, "name": "response", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3575, + "referencedDeclaration": 3627, "src": "1702:8:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3970,11 +3970,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3600, + "id": 3652, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1721:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3983,11 +3983,11 @@ }, { "argumentTypes": null, - "id": 3601, + "id": 3653, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3570, + "referencedDeclaration": 3622, "src": "1729:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -4006,21 +4006,21 @@ "typeString": "bytes memory" } ], - "id": 3599, + "id": 3651, "name": "execute", "nodeType": "Identifier", "overloadedDeclarations": [ - 3606, - 3630 + 3658, + 3682 ], - "referencedDeclaration": 3630, + "referencedDeclaration": 3682, "src": "1713:7:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$", "typeString": "function (address,bytes memory) returns (bytes memory)" } }, - "id": 3602, + "id": 3654, "isConstant": false, "isLValue": false, "isPure": false, @@ -4040,29 +4040,29 @@ "typeString": "bytes memory" } }, - "id": 3604, + "id": 3656, "nodeType": "ExpressionStatement", "src": "1702:33:21" } ] }, "documentation": null, - "id": 3606, + "id": 3658, "implemented": true, "kind": "function", "modifiers": [], "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 3571, + "id": 3623, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3568, + "id": 3620, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1377:18:21", "stateVariable": false, "storageLocation": "memory", @@ -4071,7 +4071,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3567, + "id": 3619, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1377:5:21", @@ -4085,10 +4085,10 @@ }, { "constant": false, - "id": 3570, + "id": 3622, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1397:18:21", "stateVariable": false, "storageLocation": "memory", @@ -4097,7 +4097,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3569, + "id": 3621, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1397:5:21", @@ -4113,15 +4113,15 @@ "src": "1376:40:21" }, "returnParameters": { - "id": 3576, + "id": 3628, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3573, + "id": 3625, "name": "target", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1465:14:21", "stateVariable": false, "storageLocation": "default", @@ -4130,7 +4130,7 @@ "typeString": "address" }, "typeName": { - "id": 3572, + "id": 3624, "name": "address", "nodeType": "ElementaryTypeName", "src": "1465:7:21", @@ -4145,10 +4145,10 @@ }, { "constant": false, - "id": 3575, + "id": 3627, "name": "response", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1481:21:21", "stateVariable": false, "storageLocation": "memory", @@ -4157,7 +4157,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3574, + "id": 3626, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1481:5:21", @@ -4172,7 +4172,7 @@ ], "src": "1464:39:21" }, - "scope": 3660, + "scope": 3712, "src": "1360:382:21", "stateMutability": "payable", "superFunction": null, @@ -4180,7 +4180,7 @@ }, { "body": { - "id": 3629, + "id": 3681, "nodeType": "Block", "src": "1903:685:21", "statements": [ @@ -4194,18 +4194,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3624, + "id": 3676, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3620, + "id": 3672, "name": "_target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3608, + "referencedDeclaration": 3660, "src": "1921:7:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4220,7 +4220,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3622, + "id": 3674, "isConstant": false, "isLValue": false, "isPure": true, @@ -4243,7 +4243,7 @@ "typeString": "int_const 0" } ], - "id": 3621, + "id": 3673, "isConstant": false, "isLValue": false, "isPure": true, @@ -4256,7 +4256,7 @@ }, "typeName": "address" }, - "id": 3623, + "id": 3675, "isConstant": false, "isLValue": false, "isPure": true, @@ -4279,7 +4279,7 @@ { "argumentTypes": null, "hexValue": "64732d70726f78792d7461726765742d616464726573732d7265717569726564", - "id": 3625, + "id": 3677, "isConstant": false, "isLValue": false, "isPure": true, @@ -4306,21 +4306,21 @@ "typeString": "literal_string \"ds-proxy-target-address-required\"" } ], - "id": 3619, + "id": 3671, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1913:7:21", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3626, + "id": 3678, "isConstant": false, "isLValue": false, "isPure": false, @@ -4334,7 +4334,7 @@ "typeString": "tuple()" } }, - "id": 3627, + "id": 3679, "nodeType": "ExpressionStatement", "src": "1913:66:21" }, @@ -4342,7 +4342,7 @@ "externalReferences": [ { "_data": { - "declaration": 3610, + "declaration": 3662, "isOffset": false, "isSlot": false, "src": "2136:5:21", @@ -4351,7 +4351,7 @@ }, { "_data": { - "declaration": 3610, + "declaration": 3662, "isOffset": false, "isSlot": false, "src": "2116:5:21", @@ -4360,7 +4360,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2202:8:21", @@ -4369,7 +4369,7 @@ }, { "_target": { - "declaration": 3608, + "declaration": 3660, "isOffset": false, "isSlot": false, "src": "2103:7:21", @@ -4378,7 +4378,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2376:8:21", @@ -4387,7 +4387,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2329:8:21", @@ -4396,7 +4396,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2255:8:21", @@ -4405,7 +4405,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2536:8:21", @@ -4413,7 +4413,7 @@ } } ], - "id": 3628, + "id": 3680, "nodeType": "InlineAssembly", "operations": "{\n let succeeded := delegatecall(sub(gas(), 5000), _target, add(_data, 0x20), mload(_data), 0, 0)\n let size := returndatasize()\n response := mload(0x40)\n mstore(0x40, add(response, and(add(add(size, 0x20), 0x1f), not(0x1f))))\n mstore(response, size)\n returndatacopy(add(response, 0x20), 0, size)\n switch iszero(succeeded)\n case 1 {\n revert(add(response, 0x20), size)\n }\n}", "src": "2034:548:21" @@ -4421,20 +4421,20 @@ ] }, "documentation": null, - "id": 3630, + "id": 3682, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3613, + "id": 3665, "modifierName": { "argumentTypes": null, - "id": 3612, + "id": 3664, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1825:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -4446,14 +4446,14 @@ }, { "arguments": null, - "id": 3615, + "id": 3667, "modifierName": { "argumentTypes": null, - "id": 3614, + "id": 3666, "name": "note", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, + "referencedDeclaration": 3593, "src": "1838:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -4467,15 +4467,15 @@ "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 3611, + "id": 3663, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3608, + "id": 3660, "name": "_target", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1765:15:21", "stateVariable": false, "storageLocation": "default", @@ -4484,7 +4484,7 @@ "typeString": "address" }, "typeName": { - "id": 3607, + "id": 3659, "name": "address", "nodeType": "ElementaryTypeName", "src": "1765:7:21", @@ -4499,10 +4499,10 @@ }, { "constant": false, - "id": 3610, + "id": 3662, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1782:18:21", "stateVariable": false, "storageLocation": "memory", @@ -4511,7 +4511,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3609, + "id": 3661, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1782:5:21", @@ -4527,15 +4527,15 @@ "src": "1764:37:21" }, "returnParameters": { - "id": 3618, + "id": 3670, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3617, + "id": 3669, "name": "response", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1876:21:21", "stateVariable": false, "storageLocation": "memory", @@ -4544,7 +4544,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3616, + "id": 3668, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1876:5:21", @@ -4559,7 +4559,7 @@ ], "src": "1875:23:21" }, - "scope": 3660, + "scope": 3712, "src": "1748:840:21", "stateMutability": "payable", "superFunction": null, @@ -4567,7 +4567,7 @@ }, { "body": { - "id": 3658, + "id": 3710, "nodeType": "Block", "src": "2720:168:21", "statements": [ @@ -4581,18 +4581,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3646, + "id": 3698, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3642, + "id": 3694, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, + "referencedDeclaration": 3684, "src": "2738:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4607,7 +4607,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3644, + "id": 3696, "isConstant": false, "isLValue": false, "isPure": true, @@ -4630,7 +4630,7 @@ "typeString": "int_const 0" } ], - "id": 3643, + "id": 3695, "isConstant": false, "isLValue": false, "isPure": true, @@ -4643,7 +4643,7 @@ }, "typeName": "address" }, - "id": 3645, + "id": 3697, "isConstant": false, "isLValue": false, "isPure": true, @@ -4666,7 +4666,7 @@ { "argumentTypes": null, "hexValue": "64732d70726f78792d63616368652d616464726573732d7265717569726564", - "id": 3647, + "id": 3699, "isConstant": false, "isLValue": false, "isPure": true, @@ -4693,21 +4693,21 @@ "typeString": "literal_string \"ds-proxy-cache-address-required\"" } ], - "id": 3641, + "id": 3693, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2730:7:21", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3648, + "id": 3700, "isConstant": false, "isLValue": false, "isPure": false, @@ -4721,28 +4721,28 @@ "typeString": "tuple()" } }, - "id": 3649, + "id": 3701, "nodeType": "ExpressionStatement", "src": "2730:68:21" }, { "expression": { "argumentTypes": null, - "id": 3654, + "id": 3706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3650, + "id": 3702, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "2808:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -4753,11 +4753,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3652, + "id": 3704, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, + "referencedDeclaration": 3684, "src": "2829:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4772,18 +4772,18 @@ "typeString": "address" } ], - "id": 3651, + "id": 3703, "name": "DSProxyCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "2816:12:21", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_type$_t_contract$_DSProxyCache_$3840_$", "typeString": "type(contract DSProxyCache)" } }, - "id": 3653, + "id": 3705, "isConstant": false, "isLValue": false, "isPure": false, @@ -4793,17 +4793,17 @@ "nodeType": "FunctionCall", "src": "2816:24:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "2808:32:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3655, + "id": 3707, "nodeType": "ExpressionStatement", "src": "2808:32:21" }, @@ -4811,7 +4811,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3656, + "id": 3708, "isConstant": false, "isLValue": false, "isPure": true, @@ -4826,28 +4826,28 @@ }, "value": "true" }, - "functionReturnParameters": 3640, - "id": 3657, + "functionReturnParameters": 3692, + "id": 3709, "nodeType": "Return", "src": "2870:11:21" } ] }, "documentation": null, - "id": 3659, + "id": 3711, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3635, + "id": 3687, "modifierName": { "argumentTypes": null, - "id": 3634, + "id": 3686, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "2675:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -4859,14 +4859,14 @@ }, { "arguments": null, - "id": 3637, + "id": 3689, "modifierName": { "argumentTypes": null, - "id": 3636, + "id": 3688, "name": "note", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, + "referencedDeclaration": 3593, "src": "2688:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -4880,15 +4880,15 @@ "name": "setCache", "nodeType": "FunctionDefinition", "parameters": { - "id": 3633, + "id": 3685, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3632, + "id": 3684, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 3659, + "scope": 3711, "src": "2632:18:21", "stateVariable": false, "storageLocation": "default", @@ -4897,7 +4897,7 @@ "typeString": "address" }, "typeName": { - "id": 3631, + "id": 3683, "name": "address", "nodeType": "ElementaryTypeName", "src": "2632:7:21", @@ -4914,15 +4914,15 @@ "src": "2631:20:21" }, "returnParameters": { - "id": 3640, + "id": 3692, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3639, + "id": 3691, "name": "", "nodeType": "VariableDeclaration", - "scope": 3659, + "scope": 3711, "src": "2710:4:21", "stateVariable": false, "storageLocation": "default", @@ -4931,7 +4931,7 @@ "typeString": "bool" }, "typeName": { - "id": 3638, + "id": 3690, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2710:4:21", @@ -4946,28 +4946,28 @@ ], "src": "2709:6:21" }, - "scope": 3660, + "scope": 3712, "src": "2614:274:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "1068:1822:21" }, { "baseContracts": [], "contractDependencies": [ - 3660, - 3788 + 3712, + 3840 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3744, + "id": 3796, "linearizedBaseContracts": [ - 3744 + 3796 ], "name": "DSProxyFactory", "nodeType": "ContractDefinition", @@ -4975,20 +4975,20 @@ { "anonymous": false, "documentation": null, - "id": 3670, + "id": 3722, "name": "Created", "nodeType": "EventDefinition", "parameters": { - "id": 3669, + "id": 3721, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3662, + "id": 3714, "indexed": true, "name": "sender", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3053:22:21", "stateVariable": false, "storageLocation": "default", @@ -4997,7 +4997,7 @@ "typeString": "address" }, "typeName": { - "id": 3661, + "id": 3713, "name": "address", "nodeType": "ElementaryTypeName", "src": "3053:7:21", @@ -5012,11 +5012,11 @@ }, { "constant": false, - "id": 3664, + "id": 3716, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3077:21:21", "stateVariable": false, "storageLocation": "default", @@ -5025,7 +5025,7 @@ "typeString": "address" }, "typeName": { - "id": 3663, + "id": 3715, "name": "address", "nodeType": "ElementaryTypeName", "src": "3077:7:21", @@ -5040,11 +5040,11 @@ }, { "constant": false, - "id": 3666, + "id": 3718, "indexed": false, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3100:13:21", "stateVariable": false, "storageLocation": "default", @@ -5053,7 +5053,7 @@ "typeString": "address" }, "typeName": { - "id": 3665, + "id": 3717, "name": "address", "nodeType": "ElementaryTypeName", "src": "3100:7:21", @@ -5068,11 +5068,11 @@ }, { "constant": false, - "id": 3668, + "id": 3720, "indexed": false, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3115:13:21", "stateVariable": false, "storageLocation": "default", @@ -5081,7 +5081,7 @@ "typeString": "address" }, "typeName": { - "id": 3667, + "id": 3719, "name": "address", "nodeType": "ElementaryTypeName", "src": "3115:7:21", @@ -5101,10 +5101,10 @@ }, { "constant": false, - "id": 3674, + "id": 3726, "name": "proxies", "nodeType": "VariableDeclaration", - "scope": 3744, + "scope": 3796, "src": "3135:40:21", "stateVariable": true, "storageLocation": "default", @@ -5113,9 +5113,9 @@ "typeString": "mapping(address => address)" }, "typeName": { - "id": 3673, + "id": 3725, "keyType": { - "id": 3671, + "id": 3723, "name": "address", "nodeType": "ElementaryTypeName", "src": "3143:7:21", @@ -5131,7 +5131,7 @@ "typeString": "mapping(address => address)" }, "valueType": { - "id": 3672, + "id": 3724, "name": "address", "nodeType": "ElementaryTypeName", "src": "3152:7:21", @@ -5147,26 +5147,26 @@ }, { "constant": false, - "id": 3676, + "id": 3728, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3744, + "scope": 3796, "src": "3181:25:21", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 3675, + "id": 3727, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "3181:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -5175,28 +5175,28 @@ }, { "body": { - "id": 3685, + "id": 3737, "nodeType": "Block", "src": "3234:43:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3683, + "id": 3735, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3679, + "id": 3731, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3244:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -5207,7 +5207,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3681, + "id": 3733, "isConstant": false, "isLValue": false, "isPure": false, @@ -5215,23 +5215,23 @@ "nodeType": "NewExpression", "src": "3252:16:21", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3840_$", "typeString": "function () returns (contract DSProxyCache)" }, "typeName": { "contractScope": null, - "id": 3680, + "id": 3732, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "3256:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } }, - "id": 3682, + "id": 3734, "isConstant": false, "isLValue": false, "isPure": false, @@ -5241,42 +5241,42 @@ "nodeType": "FunctionCall", "src": "3252:18:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "3244:26:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3684, + "id": 3736, "nodeType": "ExpressionStatement", "src": "3244:26:21" } ] }, "documentation": null, - "id": 3686, + "id": 3738, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3677, + "id": 3729, "nodeType": "ParameterList", "parameters": [], "src": "3224:2:21" }, "returnParameters": { - "id": 3678, + "id": 3730, "nodeType": "ParameterList", "parameters": [], "src": "3234:0:21" }, - "scope": 3744, + "scope": 3796, "src": "3213:64:21", "stateMutability": "nonpayable", "superFunction": null, @@ -5284,25 +5284,25 @@ }, { "body": { - "id": 3698, + "id": 3750, "nodeType": "Block", "src": "3412:42:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3696, + "id": 3748, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3691, + "id": 3743, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, + "referencedDeclaration": 3741, "src": "3422:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5318,18 +5318,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3693, + "id": 3745, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "3436:3:21", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3694, + "id": 3746, "isConstant": false, "isLValue": false, "isPure": false, @@ -5351,21 +5351,21 @@ "typeString": "address payable" } ], - "id": 3692, + "id": 3744, "name": "build", "nodeType": "Identifier", "overloadedDeclarations": [ - 3699, - 3743 + 3751, + 3795 ], - "referencedDeclaration": 3743, + "referencedDeclaration": 3795, "src": "3430:5:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_address_payable_$", "typeString": "function (address) returns (address payable)" } }, - "id": 3695, + "id": 3747, "isConstant": false, "isLValue": false, "isPure": false, @@ -5385,35 +5385,35 @@ "typeString": "address payable" } }, - "id": 3697, + "id": 3749, "nodeType": "ExpressionStatement", "src": "3422:25:21" } ] }, "documentation": null, - "id": 3699, + "id": 3751, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 3687, + "id": 3739, "nodeType": "ParameterList", "parameters": [], "src": "3370:2:21" }, "returnParameters": { - "id": 3690, + "id": 3742, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3689, + "id": 3741, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3699, + "scope": 3751, "src": "3389:21:21", "stateVariable": false, "storageLocation": "default", @@ -5422,7 +5422,7 @@ "typeString": "address payable" }, "typeName": { - "id": 3688, + "id": 3740, "name": "address", "nodeType": "ElementaryTypeName", "src": "3389:15:21", @@ -5438,7 +5438,7 @@ ], "src": "3388:23:21" }, - "scope": 3744, + "scope": 3796, "src": "3356:98:21", "stateMutability": "nonpayable", "superFunction": null, @@ -5446,25 +5446,25 @@ }, { "body": { - "id": 3742, + "id": 3794, "nodeType": "Block", "src": "3599:206:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3715, + "id": 3767, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3706, + "id": 3758, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3609:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5484,14 +5484,14 @@ "arguments": [ { "argumentTypes": null, - "id": 3711, + "id": 3763, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3645:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -5499,11 +5499,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 3710, + "id": 3762, "isConstant": false, "isLValue": false, "isPure": true, @@ -5516,7 +5516,7 @@ }, "typeName": "address" }, - "id": 3712, + "id": 3764, "isConstant": false, "isLValue": false, "isPure": false, @@ -5538,7 +5538,7 @@ "typeString": "address" } ], - "id": 3709, + "id": 3761, "isConstant": false, "isLValue": false, "isPure": false, @@ -5546,23 +5546,23 @@ "nodeType": "NewExpression", "src": "3625:11:21", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DSProxy_$3660_$", + "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DSProxy_$3712_$", "typeString": "function (address) returns (contract DSProxy)" }, "typeName": { "contractScope": null, - "id": 3708, + "id": 3760, "name": "DSProxy", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "3629:7:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } } }, - "id": 3713, + "id": 3765, "isConstant": false, "isLValue": false, "isPure": false, @@ -5572,7 +5572,7 @@ "nodeType": "FunctionCall", "src": "3625:27:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } } @@ -5580,11 +5580,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } ], - "id": 3707, + "id": 3759, "isConstant": false, "isLValue": false, "isPure": true, @@ -5597,7 +5597,7 @@ }, "typeName": "address" }, - "id": 3714, + "id": 3766, "isConstant": false, "isLValue": false, "isPure": false, @@ -5617,7 +5617,7 @@ "typeString": "address payable" } }, - "id": 3716, + "id": 3768, "nodeType": "ExpressionStatement", "src": "3609:44:21" }, @@ -5629,18 +5629,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3718, + "id": 3770, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "3676:3:21", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3719, + "id": 3771, "isConstant": false, "isLValue": false, "isPure": false, @@ -5656,11 +5656,11 @@ }, { "argumentTypes": null, - "id": 3720, + "id": 3772, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3688:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5672,11 +5672,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3722, + "id": 3774, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3703:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5691,7 +5691,7 @@ "typeString": "address payable" } ], - "id": 3721, + "id": 3773, "isConstant": false, "isLValue": false, "isPure": true, @@ -5704,7 +5704,7 @@ }, "typeName": "address" }, - "id": 3723, + "id": 3775, "isConstant": false, "isLValue": false, "isPure": false, @@ -5723,14 +5723,14 @@ "arguments": [ { "argumentTypes": null, - "id": 3725, + "id": 3777, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3719:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -5738,11 +5738,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 3724, + "id": 3776, "isConstant": false, "isLValue": false, "isPure": true, @@ -5755,7 +5755,7 @@ }, "typeName": "address" }, - "id": 3726, + "id": 3778, "isConstant": false, "isLValue": false, "isPure": false, @@ -5789,18 +5789,18 @@ "typeString": "address" } ], - "id": 3717, + "id": 3769, "name": "Created", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3670, + "referencedDeclaration": 3722, "src": "3668:7:21", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_address_$returns$__$", "typeString": "function (address,address,address,address)" } }, - "id": 3727, + "id": 3779, "isConstant": false, "isLValue": false, "isPure": false, @@ -5814,7 +5814,7 @@ "typeString": "tuple()" } }, - "id": 3728, + "id": 3780, "nodeType": "EmitStatement", "src": "3663:63:21" }, @@ -5824,11 +5824,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3733, + "id": 3785, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3760:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5848,11 +5848,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3730, + "id": 3782, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3744:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5867,18 +5867,18 @@ "typeString": "address payable" } ], - "id": 3729, + "id": 3781, "name": "DSProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "3736:7:21", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSProxy_$3660_$", + "typeIdentifier": "t_type$_t_contract$_DSProxy_$3712_$", "typeString": "type(contract DSProxy)" } }, - "id": 3731, + "id": 3783, "isConstant": false, "isLValue": false, "isPure": false, @@ -5888,25 +5888,25 @@ "nodeType": "FunctionCall", "src": "3736:14:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } }, - "id": 3732, + "id": 3784, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "3736:23:21", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 3734, + "id": 3786, "isConstant": false, "isLValue": false, "isPure": false, @@ -5920,14 +5920,14 @@ "typeString": "tuple()" } }, - "id": 3735, + "id": 3787, "nodeType": "ExpressionStatement", "src": "3736:30:21" }, { "expression": { "argumentTypes": null, - "id": 3740, + "id": 3792, "isConstant": false, "isLValue": false, "isPure": false, @@ -5936,25 +5936,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3736, + "id": 3788, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3674, + "referencedDeclaration": 3726, "src": "3776:7:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 3738, + "id": 3790, "indexExpression": { "argumentTypes": null, - "id": 3737, + "id": 3789, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3784:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5976,11 +5976,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3739, + "id": 3791, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3793:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5993,29 +5993,29 @@ "typeString": "address" } }, - "id": 3741, + "id": 3793, "nodeType": "ExpressionStatement", "src": "3776:22:21" } ] }, "documentation": null, - "id": 3743, + "id": 3795, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 3702, + "id": 3754, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3701, + "id": 3753, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3743, + "scope": 3795, "src": "3545:13:21", "stateVariable": false, "storageLocation": "default", @@ -6024,7 +6024,7 @@ "typeString": "address" }, "typeName": { - "id": 3700, + "id": 3752, "name": "address", "nodeType": "ElementaryTypeName", "src": "3545:7:21", @@ -6041,15 +6041,15 @@ "src": "3544:15:21" }, "returnParameters": { - "id": 3705, + "id": 3757, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3704, + "id": 3756, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3743, + "scope": 3795, "src": "3576:21:21", "stateVariable": false, "storageLocation": "default", @@ -6058,7 +6058,7 @@ "typeString": "address payable" }, "typeName": { - "id": 3703, + "id": 3755, "name": "address", "nodeType": "ElementaryTypeName", "src": "3576:15:21", @@ -6074,14 +6074,14 @@ ], "src": "3575:23:21" }, - "scope": 3744, + "scope": 3796, "src": "3530:275:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "3009:798:21" }, { @@ -6090,19 +6090,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3788, + "id": 3840, "linearizedBaseContracts": [ - 3788 + 3840 ], "name": "DSProxyCache", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3748, + "id": 3800, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3788, + "scope": 3840, "src": "4263:33:21", "stateVariable": true, "storageLocation": "default", @@ -6111,9 +6111,9 @@ "typeString": "mapping(bytes32 => address)" }, "typeName": { - "id": 3747, + "id": 3799, "keyType": { - "id": 3745, + "id": 3797, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4271:7:21", @@ -6129,7 +6129,7 @@ "typeString": "mapping(bytes32 => address)" }, "valueType": { - "id": 3746, + "id": 3798, "name": "address", "nodeType": "ElementaryTypeName", "src": "4282:7:21", @@ -6145,21 +6145,21 @@ }, { "body": { - "id": 3765, + "id": 3817, "nodeType": "Block", "src": "4367:76:21", "statements": [ { "assignments": [ - 3756 + 3808 ], "declarations": [ { "constant": false, - "id": 3756, + "id": 3808, "name": "hash", "nodeType": "VariableDeclaration", - "scope": 3765, + "scope": 3817, "src": "4377:12:21", "stateVariable": false, "storageLocation": "default", @@ -6168,7 +6168,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3755, + "id": 3807, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4377:7:21", @@ -6181,17 +6181,17 @@ "visibility": "internal" } ], - "id": 3760, + "id": 3812, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3758, + "id": 3810, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3750, + "referencedDeclaration": 3802, "src": "4402:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -6206,18 +6206,18 @@ "typeString": "bytes memory" } ], - "id": 3757, + "id": 3809, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7821, + "referencedDeclaration": 7812, "src": "4392:9:21", "typeDescriptions": { "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$", "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 3759, + "id": 3811, "isConstant": false, "isLValue": false, "isPure": false, @@ -6239,25 +6239,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3761, + "id": 3813, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3748, + "referencedDeclaration": 3800, "src": "4425:5:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_address_$", "typeString": "mapping(bytes32 => address)" } }, - "id": 3763, + "id": 3815, "indexExpression": { "argumentTypes": null, - "id": 3762, + "id": 3814, "name": "hash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3756, + "referencedDeclaration": 3808, "src": "4431:4:21", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6275,30 +6275,30 @@ "typeString": "address" } }, - "functionReturnParameters": 3754, - "id": 3764, + "functionReturnParameters": 3806, + "id": 3816, "nodeType": "Return", "src": "4418:18:21" } ] }, "documentation": null, - "id": 3766, + "id": 3818, "implemented": true, "kind": "function", "modifiers": [], "name": "read", "nodeType": "FunctionDefinition", "parameters": { - "id": 3751, + "id": 3803, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3750, + "id": 3802, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3766, + "scope": 3818, "src": "4317:18:21", "stateVariable": false, "storageLocation": "memory", @@ -6307,7 +6307,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3749, + "id": 3801, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4317:5:21", @@ -6323,15 +6323,15 @@ "src": "4316:20:21" }, "returnParameters": { - "id": 3754, + "id": 3806, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3753, + "id": 3805, "name": "", "nodeType": "VariableDeclaration", - "scope": 3766, + "scope": 3818, "src": "4358:7:21", "stateVariable": false, "storageLocation": "default", @@ -6340,7 +6340,7 @@ "typeString": "address" }, "typeName": { - "id": 3752, + "id": 3804, "name": "address", "nodeType": "ElementaryTypeName", "src": "4358:7:21", @@ -6356,7 +6356,7 @@ ], "src": "4357:9:21" }, - "scope": 3788, + "scope": 3840, "src": "4303:140:21", "stateMutability": "view", "superFunction": null, @@ -6364,7 +6364,7 @@ }, { "body": { - "id": 3786, + "id": 3838, "nodeType": "Block", "src": "4516:336:21", "statements": [ @@ -6372,7 +6372,7 @@ "externalReferences": [ { "target": { - "declaration": 3771, + "declaration": 3823, "isOffset": false, "isSlot": false, "src": "4549:6:21", @@ -6381,7 +6381,7 @@ }, { "_code": { - "declaration": 3768, + "declaration": 3820, "isOffset": false, "isSlot": false, "src": "4593:5:21", @@ -6390,7 +6390,7 @@ }, { "_code": { - "declaration": 3768, + "declaration": 3820, "isOffset": false, "isSlot": false, "src": "4573:5:21", @@ -6399,7 +6399,7 @@ }, { "target": { - "declaration": 3771, + "declaration": 3823, "isOffset": false, "isSlot": false, "src": "4639:6:21", @@ -6407,22 +6407,22 @@ } } ], - "id": 3773, + "id": 3825, "nodeType": "InlineAssembly", "operations": "{\n target := create(0, add(_code, 0x20), mload(_code))\n switch iszero(extcodesize(target))\n case 1 { revert(0, 0) }\n}", "src": "4526:249:21" }, { "assignments": [ - 3775 + 3827 ], "declarations": [ { "constant": false, - "id": 3775, + "id": 3827, "name": "hash", "nodeType": "VariableDeclaration", - "scope": 3786, + "scope": 3838, "src": "4784:12:21", "stateVariable": false, "storageLocation": "default", @@ -6431,7 +6431,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3774, + "id": 3826, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4784:7:21", @@ -6444,17 +6444,17 @@ "visibility": "internal" } ], - "id": 3779, + "id": 3831, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3777, + "id": 3829, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3768, + "referencedDeclaration": 3820, "src": "4809:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -6469,18 +6469,18 @@ "typeString": "bytes memory" } ], - "id": 3776, + "id": 3828, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7821, + "referencedDeclaration": 7812, "src": "4799:9:21", "typeDescriptions": { "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$", "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 3778, + "id": 3830, "isConstant": false, "isLValue": false, "isPure": false, @@ -6500,7 +6500,7 @@ { "expression": { "argumentTypes": null, - "id": 3784, + "id": 3836, "isConstant": false, "isLValue": false, "isPure": false, @@ -6509,25 +6509,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3780, + "id": 3832, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3748, + "referencedDeclaration": 3800, "src": "4825:5:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_address_$", "typeString": "mapping(bytes32 => address)" } }, - "id": 3782, + "id": 3834, "indexExpression": { "argumentTypes": null, - "id": 3781, + "id": 3833, "name": "hash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3775, + "referencedDeclaration": 3827, "src": "4831:4:21", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6549,11 +6549,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3783, + "id": 3835, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3771, + "referencedDeclaration": 3823, "src": "4839:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6566,29 +6566,29 @@ "typeString": "address" } }, - "id": 3785, + "id": 3837, "nodeType": "ExpressionStatement", "src": "4825:20:21" } ] }, "documentation": null, - "id": 3787, + "id": 3839, "implemented": true, "kind": "function", "modifiers": [], "name": "write", "nodeType": "FunctionDefinition", "parameters": { - "id": 3769, + "id": 3821, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3768, + "id": 3820, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3787, + "scope": 3839, "src": "4464:18:21", "stateVariable": false, "storageLocation": "memory", @@ -6597,7 +6597,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3767, + "id": 3819, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4464:5:21", @@ -6613,15 +6613,15 @@ "src": "4463:20:21" }, "returnParameters": { - "id": 3772, + "id": 3824, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3771, + "id": 3823, "name": "target", "nodeType": "VariableDeclaration", - "scope": 3787, + "scope": 3839, "src": "4500:14:21", "stateVariable": false, "storageLocation": "default", @@ -6630,7 +6630,7 @@ "typeString": "address" }, "typeName": { - "id": 3770, + "id": 3822, "name": "address", "nodeType": "ElementaryTypeName", "src": "4500:7:21", @@ -6646,14 +6646,14 @@ ], "src": "4499:16:21" }, - "scope": 3788, + "scope": 3840, "src": "4449:403:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "4235:619:21" } ], @@ -6665,7 +6665,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.521Z", + "updatedAt": "2020-04-08T12:21:13.756Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DSProxyFactory.json b/packages/smart-contracts/artifacts/DSProxyFactory.json index c78bf07..11aa123 100644 --- a/packages/smart-contracts/artifacts/DSProxyFactory.json +++ b/packages/smart-contracts/artifacts/DSProxyFactory.json @@ -122,20 +122,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol", "exportedSymbols": { "DSProxy": [ - 3660 + 3712 ], "DSProxyCache": [ - 3788 + 3840 ], "DSProxyFactory": [ - 3744 + 3796 ] }, - "id": 3789, + "id": 3841, "nodeType": "SourceUnit", "nodes": [ { - "id": 3544, + "id": 3596, "literals": [ "solidity", ">=", @@ -151,10 +151,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "file": "./Auth.sol", - "id": 3545, + "id": 3597, "nodeType": "ImportDirective", - "scope": 3789, - "sourceUnit": 2925, + "scope": 3841, + "sourceUnit": 2977, "src": "785:20:21", "symbolAliases": [], "unitAlias": "" @@ -162,10 +162,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol", "file": "./Note.sol", - "id": 3546, + "id": 3598, "nodeType": "ImportDirective", - "scope": 3789, - "sourceUnit": 3543, + "scope": 3841, + "sourceUnit": 3595, "src": "806:20:21", "symbolAliases": [], "unitAlias": "" @@ -176,17 +176,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3547, + "id": 3599, "name": "DSAuth", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2924, + "referencedDeclaration": 2976, "src": "1088:6:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } }, - "id": 3548, + "id": 3600, "nodeType": "InheritanceSpecifier", "src": "1088:6:21" }, @@ -194,61 +194,61 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3549, + "id": 3601, "name": "DSNote", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3542, + "referencedDeclaration": 3594, "src": "1096:6:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSNote_$3542", + "typeIdentifier": "t_contract$_DSNote_$3594", "typeString": "contract DSNote" } }, - "id": 3550, + "id": 3602, "nodeType": "InheritanceSpecifier", "src": "1096:6:21" } ], "contractDependencies": [ - 2808, - 2924, - 3542 + 2860, + 2976, + 3594 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3660, + "id": 3712, "linearizedBaseContracts": [ - 3660, - 3542, - 2924, - 2808 + 3712, + 3594, + 2976, + 2860 ], "name": "DSProxy", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3552, + "id": 3604, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3660, + "scope": 3712, "src": "1109:25:21", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 3551, + "id": 3603, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "1109:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -257,7 +257,7 @@ }, { "body": { - "id": 3561, + "id": 3613, "nodeType": "Block", "src": "1211:37:21", "statements": [ @@ -267,11 +267,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3558, + "id": 3610, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3554, + "referencedDeclaration": 3606, "src": "1230:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -286,18 +286,18 @@ "typeString": "address" } ], - "id": 3557, + "id": 3609, "name": "setCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3659, + "referencedDeclaration": 3711, "src": "1221:8:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_bool_$", "typeString": "function (address) returns (bool)" } }, - "id": 3559, + "id": 3611, "isConstant": false, "isLValue": false, "isPure": false, @@ -311,29 +311,29 @@ "typeString": "bool" } }, - "id": 3560, + "id": 3612, "nodeType": "ExpressionStatement", "src": "1221:20:21" } ] }, "documentation": null, - "id": 3562, + "id": 3614, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3555, + "id": 3607, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3554, + "id": 3606, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 3562, + "scope": 3614, "src": "1184:18:21", "stateVariable": false, "storageLocation": "default", @@ -342,7 +342,7 @@ "typeString": "address" }, "typeName": { - "id": 3553, + "id": 3605, "name": "address", "nodeType": "ElementaryTypeName", "src": "1184:7:21", @@ -359,12 +359,12 @@ "src": "1183:20:21" }, "returnParameters": { - "id": 3556, + "id": 3608, "nodeType": "ParameterList", "parameters": [], "src": "1211:0:21" }, - "scope": 3660, + "scope": 3712, "src": "1172:76:21", "stateMutability": "nonpayable", "superFunction": null, @@ -372,31 +372,31 @@ }, { "body": { - "id": 3565, + "id": 3617, "nodeType": "Block", "src": "1282:7:21", "statements": [] }, "documentation": null, - "id": 3566, + "id": 3618, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3563, + "id": 3615, "nodeType": "ParameterList", "parameters": [], "src": "1262:2:21" }, "returnParameters": { - "id": 3564, + "id": 3616, "nodeType": "ParameterList", "parameters": [], "src": "1282:0:21" }, - "scope": 3660, + "scope": 3712, "src": "1254:35:21", "stateMutability": "payable", "superFunction": null, @@ -404,25 +404,25 @@ }, { "body": { - "id": 3605, + "id": 3657, "nodeType": "Block", "src": "1508:234:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3582, + "id": 3634, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3577, + "id": 3629, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1518:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -436,11 +436,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3580, + "id": 3632, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3568, + "referencedDeclaration": 3620, "src": "1538:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -457,32 +457,32 @@ ], "expression": { "argumentTypes": null, - "id": 3578, + "id": 3630, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "1527:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3579, + "id": 3631, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "read", "nodeType": "MemberAccess", - "referencedDeclaration": 3766, + "referencedDeclaration": 3818, "src": "1527:10:21", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes_memory_ptr_$returns$_t_address_$", "typeString": "function (bytes memory) view external returns (address)" } }, - "id": 3581, + "id": 3633, "isConstant": false, "isLValue": false, "isPure": false, @@ -502,7 +502,7 @@ "typeString": "address" } }, - "id": 3583, + "id": 3635, "nodeType": "ExpressionStatement", "src": "1518:26:21" }, @@ -513,18 +513,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3588, + "id": 3640, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3584, + "id": 3636, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1558:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -539,7 +539,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3586, + "id": 3638, "isConstant": false, "isLValue": false, "isPure": true, @@ -562,7 +562,7 @@ "typeString": "int_const 0" } ], - "id": 3585, + "id": 3637, "isConstant": false, "isLValue": false, "isPure": true, @@ -575,7 +575,7 @@ }, "typeName": "address" }, - "id": 3587, + "id": 3639, "isConstant": false, "isLValue": false, "isPure": true, @@ -596,29 +596,29 @@ } }, "falseBody": null, - "id": 3597, + "id": 3649, "nodeType": "IfStatement", "src": "1554:138:21", "trueBody": { - "id": 3596, + "id": 3648, "nodeType": "Block", "src": "1580:112:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3594, + "id": 3646, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3589, + "id": 3641, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1654:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -632,11 +632,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3592, + "id": 3644, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3568, + "referencedDeclaration": 3620, "src": "1675:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -653,32 +653,32 @@ ], "expression": { "argumentTypes": null, - "id": 3590, + "id": 3642, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "1663:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3591, + "id": 3643, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "write", "nodeType": "MemberAccess", - "referencedDeclaration": 3787, + "referencedDeclaration": 3839, "src": "1663:11:21", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes_memory_ptr_$returns$_t_address_$", "typeString": "function (bytes memory) external returns (address)" } }, - "id": 3593, + "id": 3645, "isConstant": false, "isLValue": false, "isPure": false, @@ -698,7 +698,7 @@ "typeString": "address" } }, - "id": 3595, + "id": 3647, "nodeType": "ExpressionStatement", "src": "1654:27:21" } @@ -708,18 +708,18 @@ { "expression": { "argumentTypes": null, - "id": 3603, + "id": 3655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3598, + "id": 3650, "name": "response", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3575, + "referencedDeclaration": 3627, "src": "1702:8:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -733,11 +733,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3600, + "id": 3652, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1721:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -746,11 +746,11 @@ }, { "argumentTypes": null, - "id": 3601, + "id": 3653, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3570, + "referencedDeclaration": 3622, "src": "1729:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -769,21 +769,21 @@ "typeString": "bytes memory" } ], - "id": 3599, + "id": 3651, "name": "execute", "nodeType": "Identifier", "overloadedDeclarations": [ - 3606, - 3630 + 3658, + 3682 ], - "referencedDeclaration": 3630, + "referencedDeclaration": 3682, "src": "1713:7:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$", "typeString": "function (address,bytes memory) returns (bytes memory)" } }, - "id": 3602, + "id": 3654, "isConstant": false, "isLValue": false, "isPure": false, @@ -803,29 +803,29 @@ "typeString": "bytes memory" } }, - "id": 3604, + "id": 3656, "nodeType": "ExpressionStatement", "src": "1702:33:21" } ] }, "documentation": null, - "id": 3606, + "id": 3658, "implemented": true, "kind": "function", "modifiers": [], "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 3571, + "id": 3623, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3568, + "id": 3620, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1377:18:21", "stateVariable": false, "storageLocation": "memory", @@ -834,7 +834,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3567, + "id": 3619, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1377:5:21", @@ -848,10 +848,10 @@ }, { "constant": false, - "id": 3570, + "id": 3622, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1397:18:21", "stateVariable": false, "storageLocation": "memory", @@ -860,7 +860,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3569, + "id": 3621, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1397:5:21", @@ -876,15 +876,15 @@ "src": "1376:40:21" }, "returnParameters": { - "id": 3576, + "id": 3628, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3573, + "id": 3625, "name": "target", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1465:14:21", "stateVariable": false, "storageLocation": "default", @@ -893,7 +893,7 @@ "typeString": "address" }, "typeName": { - "id": 3572, + "id": 3624, "name": "address", "nodeType": "ElementaryTypeName", "src": "1465:7:21", @@ -908,10 +908,10 @@ }, { "constant": false, - "id": 3575, + "id": 3627, "name": "response", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1481:21:21", "stateVariable": false, "storageLocation": "memory", @@ -920,7 +920,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3574, + "id": 3626, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1481:5:21", @@ -935,7 +935,7 @@ ], "src": "1464:39:21" }, - "scope": 3660, + "scope": 3712, "src": "1360:382:21", "stateMutability": "payable", "superFunction": null, @@ -943,7 +943,7 @@ }, { "body": { - "id": 3629, + "id": 3681, "nodeType": "Block", "src": "1903:685:21", "statements": [ @@ -957,18 +957,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3624, + "id": 3676, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3620, + "id": 3672, "name": "_target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3608, + "referencedDeclaration": 3660, "src": "1921:7:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -983,7 +983,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3622, + "id": 3674, "isConstant": false, "isLValue": false, "isPure": true, @@ -1006,7 +1006,7 @@ "typeString": "int_const 0" } ], - "id": 3621, + "id": 3673, "isConstant": false, "isLValue": false, "isPure": true, @@ -1019,7 +1019,7 @@ }, "typeName": "address" }, - "id": 3623, + "id": 3675, "isConstant": false, "isLValue": false, "isPure": true, @@ -1042,7 +1042,7 @@ { "argumentTypes": null, "hexValue": "64732d70726f78792d7461726765742d616464726573732d7265717569726564", - "id": 3625, + "id": 3677, "isConstant": false, "isLValue": false, "isPure": true, @@ -1069,21 +1069,21 @@ "typeString": "literal_string \"ds-proxy-target-address-required\"" } ], - "id": 3619, + "id": 3671, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1913:7:21", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3626, + "id": 3678, "isConstant": false, "isLValue": false, "isPure": false, @@ -1097,7 +1097,7 @@ "typeString": "tuple()" } }, - "id": 3627, + "id": 3679, "nodeType": "ExpressionStatement", "src": "1913:66:21" }, @@ -1105,7 +1105,7 @@ "externalReferences": [ { "_data": { - "declaration": 3610, + "declaration": 3662, "isOffset": false, "isSlot": false, "src": "2136:5:21", @@ -1114,7 +1114,7 @@ }, { "_data": { - "declaration": 3610, + "declaration": 3662, "isOffset": false, "isSlot": false, "src": "2116:5:21", @@ -1123,7 +1123,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2202:8:21", @@ -1132,7 +1132,7 @@ }, { "_target": { - "declaration": 3608, + "declaration": 3660, "isOffset": false, "isSlot": false, "src": "2103:7:21", @@ -1141,7 +1141,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2376:8:21", @@ -1150,7 +1150,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2329:8:21", @@ -1159,7 +1159,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2255:8:21", @@ -1168,7 +1168,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2536:8:21", @@ -1176,7 +1176,7 @@ } } ], - "id": 3628, + "id": 3680, "nodeType": "InlineAssembly", "operations": "{\n let succeeded := delegatecall(sub(gas(), 5000), _target, add(_data, 0x20), mload(_data), 0, 0)\n let size := returndatasize()\n response := mload(0x40)\n mstore(0x40, add(response, and(add(add(size, 0x20), 0x1f), not(0x1f))))\n mstore(response, size)\n returndatacopy(add(response, 0x20), 0, size)\n switch iszero(succeeded)\n case 1 {\n revert(add(response, 0x20), size)\n }\n}", "src": "2034:548:21" @@ -1184,20 +1184,20 @@ ] }, "documentation": null, - "id": 3630, + "id": 3682, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3613, + "id": 3665, "modifierName": { "argumentTypes": null, - "id": 3612, + "id": 3664, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1825:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -1209,14 +1209,14 @@ }, { "arguments": null, - "id": 3615, + "id": 3667, "modifierName": { "argumentTypes": null, - "id": 3614, + "id": 3666, "name": "note", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, + "referencedDeclaration": 3593, "src": "1838:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -1230,15 +1230,15 @@ "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 3611, + "id": 3663, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3608, + "id": 3660, "name": "_target", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1765:15:21", "stateVariable": false, "storageLocation": "default", @@ -1247,7 +1247,7 @@ "typeString": "address" }, "typeName": { - "id": 3607, + "id": 3659, "name": "address", "nodeType": "ElementaryTypeName", "src": "1765:7:21", @@ -1262,10 +1262,10 @@ }, { "constant": false, - "id": 3610, + "id": 3662, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1782:18:21", "stateVariable": false, "storageLocation": "memory", @@ -1274,7 +1274,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3609, + "id": 3661, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1782:5:21", @@ -1290,15 +1290,15 @@ "src": "1764:37:21" }, "returnParameters": { - "id": 3618, + "id": 3670, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3617, + "id": 3669, "name": "response", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1876:21:21", "stateVariable": false, "storageLocation": "memory", @@ -1307,7 +1307,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3616, + "id": 3668, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1876:5:21", @@ -1322,7 +1322,7 @@ ], "src": "1875:23:21" }, - "scope": 3660, + "scope": 3712, "src": "1748:840:21", "stateMutability": "payable", "superFunction": null, @@ -1330,7 +1330,7 @@ }, { "body": { - "id": 3658, + "id": 3710, "nodeType": "Block", "src": "2720:168:21", "statements": [ @@ -1344,18 +1344,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3646, + "id": 3698, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3642, + "id": 3694, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, + "referencedDeclaration": 3684, "src": "2738:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1370,7 +1370,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3644, + "id": 3696, "isConstant": false, "isLValue": false, "isPure": true, @@ -1393,7 +1393,7 @@ "typeString": "int_const 0" } ], - "id": 3643, + "id": 3695, "isConstant": false, "isLValue": false, "isPure": true, @@ -1406,7 +1406,7 @@ }, "typeName": "address" }, - "id": 3645, + "id": 3697, "isConstant": false, "isLValue": false, "isPure": true, @@ -1429,7 +1429,7 @@ { "argumentTypes": null, "hexValue": "64732d70726f78792d63616368652d616464726573732d7265717569726564", - "id": 3647, + "id": 3699, "isConstant": false, "isLValue": false, "isPure": true, @@ -1456,21 +1456,21 @@ "typeString": "literal_string \"ds-proxy-cache-address-required\"" } ], - "id": 3641, + "id": 3693, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2730:7:21", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3648, + "id": 3700, "isConstant": false, "isLValue": false, "isPure": false, @@ -1484,28 +1484,28 @@ "typeString": "tuple()" } }, - "id": 3649, + "id": 3701, "nodeType": "ExpressionStatement", "src": "2730:68:21" }, { "expression": { "argumentTypes": null, - "id": 3654, + "id": 3706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3650, + "id": 3702, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "2808:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -1516,11 +1516,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3652, + "id": 3704, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, + "referencedDeclaration": 3684, "src": "2829:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1535,18 +1535,18 @@ "typeString": "address" } ], - "id": 3651, + "id": 3703, "name": "DSProxyCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "2816:12:21", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_type$_t_contract$_DSProxyCache_$3840_$", "typeString": "type(contract DSProxyCache)" } }, - "id": 3653, + "id": 3705, "isConstant": false, "isLValue": false, "isPure": false, @@ -1556,17 +1556,17 @@ "nodeType": "FunctionCall", "src": "2816:24:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "2808:32:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3655, + "id": 3707, "nodeType": "ExpressionStatement", "src": "2808:32:21" }, @@ -1574,7 +1574,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3656, + "id": 3708, "isConstant": false, "isLValue": false, "isPure": true, @@ -1589,28 +1589,28 @@ }, "value": "true" }, - "functionReturnParameters": 3640, - "id": 3657, + "functionReturnParameters": 3692, + "id": 3709, "nodeType": "Return", "src": "2870:11:21" } ] }, "documentation": null, - "id": 3659, + "id": 3711, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3635, + "id": 3687, "modifierName": { "argumentTypes": null, - "id": 3634, + "id": 3686, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "2675:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -1622,14 +1622,14 @@ }, { "arguments": null, - "id": 3637, + "id": 3689, "modifierName": { "argumentTypes": null, - "id": 3636, + "id": 3688, "name": "note", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, + "referencedDeclaration": 3593, "src": "2688:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -1643,15 +1643,15 @@ "name": "setCache", "nodeType": "FunctionDefinition", "parameters": { - "id": 3633, + "id": 3685, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3632, + "id": 3684, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 3659, + "scope": 3711, "src": "2632:18:21", "stateVariable": false, "storageLocation": "default", @@ -1660,7 +1660,7 @@ "typeString": "address" }, "typeName": { - "id": 3631, + "id": 3683, "name": "address", "nodeType": "ElementaryTypeName", "src": "2632:7:21", @@ -1677,15 +1677,15 @@ "src": "2631:20:21" }, "returnParameters": { - "id": 3640, + "id": 3692, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3639, + "id": 3691, "name": "", "nodeType": "VariableDeclaration", - "scope": 3659, + "scope": 3711, "src": "2710:4:21", "stateVariable": false, "storageLocation": "default", @@ -1694,7 +1694,7 @@ "typeString": "bool" }, "typeName": { - "id": 3638, + "id": 3690, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2710:4:21", @@ -1709,28 +1709,28 @@ ], "src": "2709:6:21" }, - "scope": 3660, + "scope": 3712, "src": "2614:274:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "1068:1822:21" }, { "baseContracts": [], "contractDependencies": [ - 3660, - 3788 + 3712, + 3840 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3744, + "id": 3796, "linearizedBaseContracts": [ - 3744 + 3796 ], "name": "DSProxyFactory", "nodeType": "ContractDefinition", @@ -1738,20 +1738,20 @@ { "anonymous": false, "documentation": null, - "id": 3670, + "id": 3722, "name": "Created", "nodeType": "EventDefinition", "parameters": { - "id": 3669, + "id": 3721, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3662, + "id": 3714, "indexed": true, "name": "sender", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3053:22:21", "stateVariable": false, "storageLocation": "default", @@ -1760,7 +1760,7 @@ "typeString": "address" }, "typeName": { - "id": 3661, + "id": 3713, "name": "address", "nodeType": "ElementaryTypeName", "src": "3053:7:21", @@ -1775,11 +1775,11 @@ }, { "constant": false, - "id": 3664, + "id": 3716, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3077:21:21", "stateVariable": false, "storageLocation": "default", @@ -1788,7 +1788,7 @@ "typeString": "address" }, "typeName": { - "id": 3663, + "id": 3715, "name": "address", "nodeType": "ElementaryTypeName", "src": "3077:7:21", @@ -1803,11 +1803,11 @@ }, { "constant": false, - "id": 3666, + "id": 3718, "indexed": false, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3100:13:21", "stateVariable": false, "storageLocation": "default", @@ -1816,7 +1816,7 @@ "typeString": "address" }, "typeName": { - "id": 3665, + "id": 3717, "name": "address", "nodeType": "ElementaryTypeName", "src": "3100:7:21", @@ -1831,11 +1831,11 @@ }, { "constant": false, - "id": 3668, + "id": 3720, "indexed": false, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3115:13:21", "stateVariable": false, "storageLocation": "default", @@ -1844,7 +1844,7 @@ "typeString": "address" }, "typeName": { - "id": 3667, + "id": 3719, "name": "address", "nodeType": "ElementaryTypeName", "src": "3115:7:21", @@ -1864,10 +1864,10 @@ }, { "constant": false, - "id": 3674, + "id": 3726, "name": "proxies", "nodeType": "VariableDeclaration", - "scope": 3744, + "scope": 3796, "src": "3135:40:21", "stateVariable": true, "storageLocation": "default", @@ -1876,9 +1876,9 @@ "typeString": "mapping(address => address)" }, "typeName": { - "id": 3673, + "id": 3725, "keyType": { - "id": 3671, + "id": 3723, "name": "address", "nodeType": "ElementaryTypeName", "src": "3143:7:21", @@ -1894,7 +1894,7 @@ "typeString": "mapping(address => address)" }, "valueType": { - "id": 3672, + "id": 3724, "name": "address", "nodeType": "ElementaryTypeName", "src": "3152:7:21", @@ -1910,26 +1910,26 @@ }, { "constant": false, - "id": 3676, + "id": 3728, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3744, + "scope": 3796, "src": "3181:25:21", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 3675, + "id": 3727, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "3181:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -1938,28 +1938,28 @@ }, { "body": { - "id": 3685, + "id": 3737, "nodeType": "Block", "src": "3234:43:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3683, + "id": 3735, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3679, + "id": 3731, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3244:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -1970,7 +1970,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3681, + "id": 3733, "isConstant": false, "isLValue": false, "isPure": false, @@ -1978,23 +1978,23 @@ "nodeType": "NewExpression", "src": "3252:16:21", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3840_$", "typeString": "function () returns (contract DSProxyCache)" }, "typeName": { "contractScope": null, - "id": 3680, + "id": 3732, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "3256:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } }, - "id": 3682, + "id": 3734, "isConstant": false, "isLValue": false, "isPure": false, @@ -2004,42 +2004,42 @@ "nodeType": "FunctionCall", "src": "3252:18:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "3244:26:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3684, + "id": 3736, "nodeType": "ExpressionStatement", "src": "3244:26:21" } ] }, "documentation": null, - "id": 3686, + "id": 3738, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3677, + "id": 3729, "nodeType": "ParameterList", "parameters": [], "src": "3224:2:21" }, "returnParameters": { - "id": 3678, + "id": 3730, "nodeType": "ParameterList", "parameters": [], "src": "3234:0:21" }, - "scope": 3744, + "scope": 3796, "src": "3213:64:21", "stateMutability": "nonpayable", "superFunction": null, @@ -2047,25 +2047,25 @@ }, { "body": { - "id": 3698, + "id": 3750, "nodeType": "Block", "src": "3412:42:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3696, + "id": 3748, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3691, + "id": 3743, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, + "referencedDeclaration": 3741, "src": "3422:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2081,18 +2081,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3693, + "id": 3745, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "3436:3:21", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3694, + "id": 3746, "isConstant": false, "isLValue": false, "isPure": false, @@ -2114,21 +2114,21 @@ "typeString": "address payable" } ], - "id": 3692, + "id": 3744, "name": "build", "nodeType": "Identifier", "overloadedDeclarations": [ - 3699, - 3743 + 3751, + 3795 ], - "referencedDeclaration": 3743, + "referencedDeclaration": 3795, "src": "3430:5:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_address_payable_$", "typeString": "function (address) returns (address payable)" } }, - "id": 3695, + "id": 3747, "isConstant": false, "isLValue": false, "isPure": false, @@ -2148,35 +2148,35 @@ "typeString": "address payable" } }, - "id": 3697, + "id": 3749, "nodeType": "ExpressionStatement", "src": "3422:25:21" } ] }, "documentation": null, - "id": 3699, + "id": 3751, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 3687, + "id": 3739, "nodeType": "ParameterList", "parameters": [], "src": "3370:2:21" }, "returnParameters": { - "id": 3690, + "id": 3742, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3689, + "id": 3741, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3699, + "scope": 3751, "src": "3389:21:21", "stateVariable": false, "storageLocation": "default", @@ -2185,7 +2185,7 @@ "typeString": "address payable" }, "typeName": { - "id": 3688, + "id": 3740, "name": "address", "nodeType": "ElementaryTypeName", "src": "3389:15:21", @@ -2201,7 +2201,7 @@ ], "src": "3388:23:21" }, - "scope": 3744, + "scope": 3796, "src": "3356:98:21", "stateMutability": "nonpayable", "superFunction": null, @@ -2209,25 +2209,25 @@ }, { "body": { - "id": 3742, + "id": 3794, "nodeType": "Block", "src": "3599:206:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3715, + "id": 3767, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3706, + "id": 3758, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3609:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2247,14 +2247,14 @@ "arguments": [ { "argumentTypes": null, - "id": 3711, + "id": 3763, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3645:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -2262,11 +2262,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 3710, + "id": 3762, "isConstant": false, "isLValue": false, "isPure": true, @@ -2279,7 +2279,7 @@ }, "typeName": "address" }, - "id": 3712, + "id": 3764, "isConstant": false, "isLValue": false, "isPure": false, @@ -2301,7 +2301,7 @@ "typeString": "address" } ], - "id": 3709, + "id": 3761, "isConstant": false, "isLValue": false, "isPure": false, @@ -2309,23 +2309,23 @@ "nodeType": "NewExpression", "src": "3625:11:21", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DSProxy_$3660_$", + "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DSProxy_$3712_$", "typeString": "function (address) returns (contract DSProxy)" }, "typeName": { "contractScope": null, - "id": 3708, + "id": 3760, "name": "DSProxy", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "3629:7:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } } }, - "id": 3713, + "id": 3765, "isConstant": false, "isLValue": false, "isPure": false, @@ -2335,7 +2335,7 @@ "nodeType": "FunctionCall", "src": "3625:27:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } } @@ -2343,11 +2343,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } ], - "id": 3707, + "id": 3759, "isConstant": false, "isLValue": false, "isPure": true, @@ -2360,7 +2360,7 @@ }, "typeName": "address" }, - "id": 3714, + "id": 3766, "isConstant": false, "isLValue": false, "isPure": false, @@ -2380,7 +2380,7 @@ "typeString": "address payable" } }, - "id": 3716, + "id": 3768, "nodeType": "ExpressionStatement", "src": "3609:44:21" }, @@ -2392,18 +2392,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3718, + "id": 3770, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "3676:3:21", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3719, + "id": 3771, "isConstant": false, "isLValue": false, "isPure": false, @@ -2419,11 +2419,11 @@ }, { "argumentTypes": null, - "id": 3720, + "id": 3772, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3688:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2435,11 +2435,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3722, + "id": 3774, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3703:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2454,7 +2454,7 @@ "typeString": "address payable" } ], - "id": 3721, + "id": 3773, "isConstant": false, "isLValue": false, "isPure": true, @@ -2467,7 +2467,7 @@ }, "typeName": "address" }, - "id": 3723, + "id": 3775, "isConstant": false, "isLValue": false, "isPure": false, @@ -2486,14 +2486,14 @@ "arguments": [ { "argumentTypes": null, - "id": 3725, + "id": 3777, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3719:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -2501,11 +2501,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 3724, + "id": 3776, "isConstant": false, "isLValue": false, "isPure": true, @@ -2518,7 +2518,7 @@ }, "typeName": "address" }, - "id": 3726, + "id": 3778, "isConstant": false, "isLValue": false, "isPure": false, @@ -2552,18 +2552,18 @@ "typeString": "address" } ], - "id": 3717, + "id": 3769, "name": "Created", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3670, + "referencedDeclaration": 3722, "src": "3668:7:21", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_address_$returns$__$", "typeString": "function (address,address,address,address)" } }, - "id": 3727, + "id": 3779, "isConstant": false, "isLValue": false, "isPure": false, @@ -2577,7 +2577,7 @@ "typeString": "tuple()" } }, - "id": 3728, + "id": 3780, "nodeType": "EmitStatement", "src": "3663:63:21" }, @@ -2587,11 +2587,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3733, + "id": 3785, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3760:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2611,11 +2611,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3730, + "id": 3782, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3744:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2630,18 +2630,18 @@ "typeString": "address payable" } ], - "id": 3729, + "id": 3781, "name": "DSProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "3736:7:21", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSProxy_$3660_$", + "typeIdentifier": "t_type$_t_contract$_DSProxy_$3712_$", "typeString": "type(contract DSProxy)" } }, - "id": 3731, + "id": 3783, "isConstant": false, "isLValue": false, "isPure": false, @@ -2651,25 +2651,25 @@ "nodeType": "FunctionCall", "src": "3736:14:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } }, - "id": 3732, + "id": 3784, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "3736:23:21", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 3734, + "id": 3786, "isConstant": false, "isLValue": false, "isPure": false, @@ -2683,14 +2683,14 @@ "typeString": "tuple()" } }, - "id": 3735, + "id": 3787, "nodeType": "ExpressionStatement", "src": "3736:30:21" }, { "expression": { "argumentTypes": null, - "id": 3740, + "id": 3792, "isConstant": false, "isLValue": false, "isPure": false, @@ -2699,25 +2699,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3736, + "id": 3788, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3674, + "referencedDeclaration": 3726, "src": "3776:7:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 3738, + "id": 3790, "indexExpression": { "argumentTypes": null, - "id": 3737, + "id": 3789, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3784:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2739,11 +2739,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3739, + "id": 3791, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3793:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2756,29 +2756,29 @@ "typeString": "address" } }, - "id": 3741, + "id": 3793, "nodeType": "ExpressionStatement", "src": "3776:22:21" } ] }, "documentation": null, - "id": 3743, + "id": 3795, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 3702, + "id": 3754, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3701, + "id": 3753, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3743, + "scope": 3795, "src": "3545:13:21", "stateVariable": false, "storageLocation": "default", @@ -2787,7 +2787,7 @@ "typeString": "address" }, "typeName": { - "id": 3700, + "id": 3752, "name": "address", "nodeType": "ElementaryTypeName", "src": "3545:7:21", @@ -2804,15 +2804,15 @@ "src": "3544:15:21" }, "returnParameters": { - "id": 3705, + "id": 3757, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3704, + "id": 3756, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3743, + "scope": 3795, "src": "3576:21:21", "stateVariable": false, "storageLocation": "default", @@ -2821,7 +2821,7 @@ "typeString": "address payable" }, "typeName": { - "id": 3703, + "id": 3755, "name": "address", "nodeType": "ElementaryTypeName", "src": "3576:15:21", @@ -2837,14 +2837,14 @@ ], "src": "3575:23:21" }, - "scope": 3744, + "scope": 3796, "src": "3530:275:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "3009:798:21" }, { @@ -2853,19 +2853,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3788, + "id": 3840, "linearizedBaseContracts": [ - 3788 + 3840 ], "name": "DSProxyCache", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3748, + "id": 3800, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3788, + "scope": 3840, "src": "4263:33:21", "stateVariable": true, "storageLocation": "default", @@ -2874,9 +2874,9 @@ "typeString": "mapping(bytes32 => address)" }, "typeName": { - "id": 3747, + "id": 3799, "keyType": { - "id": 3745, + "id": 3797, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4271:7:21", @@ -2892,7 +2892,7 @@ "typeString": "mapping(bytes32 => address)" }, "valueType": { - "id": 3746, + "id": 3798, "name": "address", "nodeType": "ElementaryTypeName", "src": "4282:7:21", @@ -2908,21 +2908,21 @@ }, { "body": { - "id": 3765, + "id": 3817, "nodeType": "Block", "src": "4367:76:21", "statements": [ { "assignments": [ - 3756 + 3808 ], "declarations": [ { "constant": false, - "id": 3756, + "id": 3808, "name": "hash", "nodeType": "VariableDeclaration", - "scope": 3765, + "scope": 3817, "src": "4377:12:21", "stateVariable": false, "storageLocation": "default", @@ -2931,7 +2931,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3755, + "id": 3807, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4377:7:21", @@ -2944,17 +2944,17 @@ "visibility": "internal" } ], - "id": 3760, + "id": 3812, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3758, + "id": 3810, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3750, + "referencedDeclaration": 3802, "src": "4402:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -2969,18 +2969,18 @@ "typeString": "bytes memory" } ], - "id": 3757, + "id": 3809, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7821, + "referencedDeclaration": 7812, "src": "4392:9:21", "typeDescriptions": { "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$", "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 3759, + "id": 3811, "isConstant": false, "isLValue": false, "isPure": false, @@ -3002,25 +3002,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3761, + "id": 3813, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3748, + "referencedDeclaration": 3800, "src": "4425:5:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_address_$", "typeString": "mapping(bytes32 => address)" } }, - "id": 3763, + "id": 3815, "indexExpression": { "argumentTypes": null, - "id": 3762, + "id": 3814, "name": "hash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3756, + "referencedDeclaration": 3808, "src": "4431:4:21", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -3038,30 +3038,30 @@ "typeString": "address" } }, - "functionReturnParameters": 3754, - "id": 3764, + "functionReturnParameters": 3806, + "id": 3816, "nodeType": "Return", "src": "4418:18:21" } ] }, "documentation": null, - "id": 3766, + "id": 3818, "implemented": true, "kind": "function", "modifiers": [], "name": "read", "nodeType": "FunctionDefinition", "parameters": { - "id": 3751, + "id": 3803, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3750, + "id": 3802, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3766, + "scope": 3818, "src": "4317:18:21", "stateVariable": false, "storageLocation": "memory", @@ -3070,7 +3070,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3749, + "id": 3801, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4317:5:21", @@ -3086,15 +3086,15 @@ "src": "4316:20:21" }, "returnParameters": { - "id": 3754, + "id": 3806, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3753, + "id": 3805, "name": "", "nodeType": "VariableDeclaration", - "scope": 3766, + "scope": 3818, "src": "4358:7:21", "stateVariable": false, "storageLocation": "default", @@ -3103,7 +3103,7 @@ "typeString": "address" }, "typeName": { - "id": 3752, + "id": 3804, "name": "address", "nodeType": "ElementaryTypeName", "src": "4358:7:21", @@ -3119,7 +3119,7 @@ ], "src": "4357:9:21" }, - "scope": 3788, + "scope": 3840, "src": "4303:140:21", "stateMutability": "view", "superFunction": null, @@ -3127,7 +3127,7 @@ }, { "body": { - "id": 3786, + "id": 3838, "nodeType": "Block", "src": "4516:336:21", "statements": [ @@ -3135,7 +3135,7 @@ "externalReferences": [ { "target": { - "declaration": 3771, + "declaration": 3823, "isOffset": false, "isSlot": false, "src": "4549:6:21", @@ -3144,7 +3144,7 @@ }, { "_code": { - "declaration": 3768, + "declaration": 3820, "isOffset": false, "isSlot": false, "src": "4593:5:21", @@ -3153,7 +3153,7 @@ }, { "_code": { - "declaration": 3768, + "declaration": 3820, "isOffset": false, "isSlot": false, "src": "4573:5:21", @@ -3162,7 +3162,7 @@ }, { "target": { - "declaration": 3771, + "declaration": 3823, "isOffset": false, "isSlot": false, "src": "4639:6:21", @@ -3170,22 +3170,22 @@ } } ], - "id": 3773, + "id": 3825, "nodeType": "InlineAssembly", "operations": "{\n target := create(0, add(_code, 0x20), mload(_code))\n switch iszero(extcodesize(target))\n case 1 { revert(0, 0) }\n}", "src": "4526:249:21" }, { "assignments": [ - 3775 + 3827 ], "declarations": [ { "constant": false, - "id": 3775, + "id": 3827, "name": "hash", "nodeType": "VariableDeclaration", - "scope": 3786, + "scope": 3838, "src": "4784:12:21", "stateVariable": false, "storageLocation": "default", @@ -3194,7 +3194,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3774, + "id": 3826, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4784:7:21", @@ -3207,17 +3207,17 @@ "visibility": "internal" } ], - "id": 3779, + "id": 3831, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3777, + "id": 3829, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3768, + "referencedDeclaration": 3820, "src": "4809:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3232,18 +3232,18 @@ "typeString": "bytes memory" } ], - "id": 3776, + "id": 3828, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7821, + "referencedDeclaration": 7812, "src": "4799:9:21", "typeDescriptions": { "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$", "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 3778, + "id": 3830, "isConstant": false, "isLValue": false, "isPure": false, @@ -3263,7 +3263,7 @@ { "expression": { "argumentTypes": null, - "id": 3784, + "id": 3836, "isConstant": false, "isLValue": false, "isPure": false, @@ -3272,25 +3272,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3780, + "id": 3832, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3748, + "referencedDeclaration": 3800, "src": "4825:5:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_address_$", "typeString": "mapping(bytes32 => address)" } }, - "id": 3782, + "id": 3834, "indexExpression": { "argumentTypes": null, - "id": 3781, + "id": 3833, "name": "hash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3775, + "referencedDeclaration": 3827, "src": "4831:4:21", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -3312,11 +3312,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3783, + "id": 3835, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3771, + "referencedDeclaration": 3823, "src": "4839:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3329,29 +3329,29 @@ "typeString": "address" } }, - "id": 3785, + "id": 3837, "nodeType": "ExpressionStatement", "src": "4825:20:21" } ] }, "documentation": null, - "id": 3787, + "id": 3839, "implemented": true, "kind": "function", "modifiers": [], "name": "write", "nodeType": "FunctionDefinition", "parameters": { - "id": 3769, + "id": 3821, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3768, + "id": 3820, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3787, + "scope": 3839, "src": "4464:18:21", "stateVariable": false, "storageLocation": "memory", @@ -3360,7 +3360,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3767, + "id": 3819, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4464:5:21", @@ -3376,15 +3376,15 @@ "src": "4463:20:21" }, "returnParameters": { - "id": 3772, + "id": 3824, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3771, + "id": 3823, "name": "target", "nodeType": "VariableDeclaration", - "scope": 3787, + "scope": 3839, "src": "4500:14:21", "stateVariable": false, "storageLocation": "default", @@ -3393,7 +3393,7 @@ "typeString": "address" }, "typeName": { - "id": 3770, + "id": 3822, "name": "address", "nodeType": "ElementaryTypeName", "src": "4500:7:21", @@ -3409,14 +3409,14 @@ ], "src": "4499:16:21" }, - "scope": 3788, + "scope": 3840, "src": "4449:403:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "4235:619:21" } ], @@ -3426,20 +3426,20 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol", "exportedSymbols": { "DSProxy": [ - 3660 + 3712 ], "DSProxyCache": [ - 3788 + 3840 ], "DSProxyFactory": [ - 3744 + 3796 ] }, - "id": 3789, + "id": 3841, "nodeType": "SourceUnit", "nodes": [ { - "id": 3544, + "id": 3596, "literals": [ "solidity", ">=", @@ -3455,10 +3455,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol", "file": "./Auth.sol", - "id": 3545, + "id": 3597, "nodeType": "ImportDirective", - "scope": 3789, - "sourceUnit": 2925, + "scope": 3841, + "sourceUnit": 2977, "src": "785:20:21", "symbolAliases": [], "unitAlias": "" @@ -3466,10 +3466,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol", "file": "./Note.sol", - "id": 3546, + "id": 3598, "nodeType": "ImportDirective", - "scope": 3789, - "sourceUnit": 3543, + "scope": 3841, + "sourceUnit": 3595, "src": "806:20:21", "symbolAliases": [], "unitAlias": "" @@ -3480,17 +3480,17 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3547, + "id": 3599, "name": "DSAuth", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2924, + "referencedDeclaration": 2976, "src": "1088:6:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuth_$2924", + "typeIdentifier": "t_contract$_DSAuth_$2976", "typeString": "contract DSAuth" } }, - "id": 3548, + "id": 3600, "nodeType": "InheritanceSpecifier", "src": "1088:6:21" }, @@ -3498,61 +3498,61 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 3549, + "id": 3601, "name": "DSNote", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3542, + "referencedDeclaration": 3594, "src": "1096:6:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSNote_$3542", + "typeIdentifier": "t_contract$_DSNote_$3594", "typeString": "contract DSNote" } }, - "id": 3550, + "id": 3602, "nodeType": "InheritanceSpecifier", "src": "1096:6:21" } ], "contractDependencies": [ - 2808, - 2924, - 3542 + 2860, + 2976, + 3594 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3660, + "id": 3712, "linearizedBaseContracts": [ - 3660, - 3542, - 2924, - 2808 + 3712, + 3594, + 2976, + 2860 ], "name": "DSProxy", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3552, + "id": 3604, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3660, + "scope": 3712, "src": "1109:25:21", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 3551, + "id": 3603, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "1109:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -3561,7 +3561,7 @@ }, { "body": { - "id": 3561, + "id": 3613, "nodeType": "Block", "src": "1211:37:21", "statements": [ @@ -3571,11 +3571,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3558, + "id": 3610, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3554, + "referencedDeclaration": 3606, "src": "1230:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3590,18 +3590,18 @@ "typeString": "address" } ], - "id": 3557, + "id": 3609, "name": "setCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3659, + "referencedDeclaration": 3711, "src": "1221:8:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_bool_$", "typeString": "function (address) returns (bool)" } }, - "id": 3559, + "id": 3611, "isConstant": false, "isLValue": false, "isPure": false, @@ -3615,29 +3615,29 @@ "typeString": "bool" } }, - "id": 3560, + "id": 3612, "nodeType": "ExpressionStatement", "src": "1221:20:21" } ] }, "documentation": null, - "id": 3562, + "id": 3614, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3555, + "id": 3607, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3554, + "id": 3606, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 3562, + "scope": 3614, "src": "1184:18:21", "stateVariable": false, "storageLocation": "default", @@ -3646,7 +3646,7 @@ "typeString": "address" }, "typeName": { - "id": 3553, + "id": 3605, "name": "address", "nodeType": "ElementaryTypeName", "src": "1184:7:21", @@ -3663,12 +3663,12 @@ "src": "1183:20:21" }, "returnParameters": { - "id": 3556, + "id": 3608, "nodeType": "ParameterList", "parameters": [], "src": "1211:0:21" }, - "scope": 3660, + "scope": 3712, "src": "1172:76:21", "stateMutability": "nonpayable", "superFunction": null, @@ -3676,31 +3676,31 @@ }, { "body": { - "id": 3565, + "id": 3617, "nodeType": "Block", "src": "1282:7:21", "statements": [] }, "documentation": null, - "id": 3566, + "id": 3618, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3563, + "id": 3615, "nodeType": "ParameterList", "parameters": [], "src": "1262:2:21" }, "returnParameters": { - "id": 3564, + "id": 3616, "nodeType": "ParameterList", "parameters": [], "src": "1282:0:21" }, - "scope": 3660, + "scope": 3712, "src": "1254:35:21", "stateMutability": "payable", "superFunction": null, @@ -3708,25 +3708,25 @@ }, { "body": { - "id": 3605, + "id": 3657, "nodeType": "Block", "src": "1508:234:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3582, + "id": 3634, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3577, + "id": 3629, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1518:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3740,11 +3740,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3580, + "id": 3632, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3568, + "referencedDeclaration": 3620, "src": "1538:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3761,32 +3761,32 @@ ], "expression": { "argumentTypes": null, - "id": 3578, + "id": 3630, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "1527:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3579, + "id": 3631, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "read", "nodeType": "MemberAccess", - "referencedDeclaration": 3766, + "referencedDeclaration": 3818, "src": "1527:10:21", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes_memory_ptr_$returns$_t_address_$", "typeString": "function (bytes memory) view external returns (address)" } }, - "id": 3581, + "id": 3633, "isConstant": false, "isLValue": false, "isPure": false, @@ -3806,7 +3806,7 @@ "typeString": "address" } }, - "id": 3583, + "id": 3635, "nodeType": "ExpressionStatement", "src": "1518:26:21" }, @@ -3817,18 +3817,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3588, + "id": 3640, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3584, + "id": 3636, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1558:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3843,7 +3843,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3586, + "id": 3638, "isConstant": false, "isLValue": false, "isPure": true, @@ -3866,7 +3866,7 @@ "typeString": "int_const 0" } ], - "id": 3585, + "id": 3637, "isConstant": false, "isLValue": false, "isPure": true, @@ -3879,7 +3879,7 @@ }, "typeName": "address" }, - "id": 3587, + "id": 3639, "isConstant": false, "isLValue": false, "isPure": true, @@ -3900,29 +3900,29 @@ } }, "falseBody": null, - "id": 3597, + "id": 3649, "nodeType": "IfStatement", "src": "1554:138:21", "trueBody": { - "id": 3596, + "id": 3648, "nodeType": "Block", "src": "1580:112:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3594, + "id": 3646, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3589, + "id": 3641, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1654:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3936,11 +3936,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3592, + "id": 3644, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3568, + "referencedDeclaration": 3620, "src": "1675:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -3957,32 +3957,32 @@ ], "expression": { "argumentTypes": null, - "id": 3590, + "id": 3642, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "1663:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3591, + "id": 3643, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "write", "nodeType": "MemberAccess", - "referencedDeclaration": 3787, + "referencedDeclaration": 3839, "src": "1663:11:21", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes_memory_ptr_$returns$_t_address_$", "typeString": "function (bytes memory) external returns (address)" } }, - "id": 3593, + "id": 3645, "isConstant": false, "isLValue": false, "isPure": false, @@ -4002,7 +4002,7 @@ "typeString": "address" } }, - "id": 3595, + "id": 3647, "nodeType": "ExpressionStatement", "src": "1654:27:21" } @@ -4012,18 +4012,18 @@ { "expression": { "argumentTypes": null, - "id": 3603, + "id": 3655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3598, + "id": 3650, "name": "response", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3575, + "referencedDeclaration": 3627, "src": "1702:8:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -4037,11 +4037,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3600, + "id": 3652, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3573, + "referencedDeclaration": 3625, "src": "1721:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4050,11 +4050,11 @@ }, { "argumentTypes": null, - "id": 3601, + "id": 3653, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3570, + "referencedDeclaration": 3622, "src": "1729:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -4073,21 +4073,21 @@ "typeString": "bytes memory" } ], - "id": 3599, + "id": 3651, "name": "execute", "nodeType": "Identifier", "overloadedDeclarations": [ - 3606, - 3630 + 3658, + 3682 ], - "referencedDeclaration": 3630, + "referencedDeclaration": 3682, "src": "1713:7:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$_t_bytes_memory_ptr_$", "typeString": "function (address,bytes memory) returns (bytes memory)" } }, - "id": 3602, + "id": 3654, "isConstant": false, "isLValue": false, "isPure": false, @@ -4107,29 +4107,29 @@ "typeString": "bytes memory" } }, - "id": 3604, + "id": 3656, "nodeType": "ExpressionStatement", "src": "1702:33:21" } ] }, "documentation": null, - "id": 3606, + "id": 3658, "implemented": true, "kind": "function", "modifiers": [], "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 3571, + "id": 3623, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3568, + "id": 3620, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1377:18:21", "stateVariable": false, "storageLocation": "memory", @@ -4138,7 +4138,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3567, + "id": 3619, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1377:5:21", @@ -4152,10 +4152,10 @@ }, { "constant": false, - "id": 3570, + "id": 3622, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1397:18:21", "stateVariable": false, "storageLocation": "memory", @@ -4164,7 +4164,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3569, + "id": 3621, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1397:5:21", @@ -4180,15 +4180,15 @@ "src": "1376:40:21" }, "returnParameters": { - "id": 3576, + "id": 3628, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3573, + "id": 3625, "name": "target", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1465:14:21", "stateVariable": false, "storageLocation": "default", @@ -4197,7 +4197,7 @@ "typeString": "address" }, "typeName": { - "id": 3572, + "id": 3624, "name": "address", "nodeType": "ElementaryTypeName", "src": "1465:7:21", @@ -4212,10 +4212,10 @@ }, { "constant": false, - "id": 3575, + "id": 3627, "name": "response", "nodeType": "VariableDeclaration", - "scope": 3606, + "scope": 3658, "src": "1481:21:21", "stateVariable": false, "storageLocation": "memory", @@ -4224,7 +4224,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3574, + "id": 3626, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1481:5:21", @@ -4239,7 +4239,7 @@ ], "src": "1464:39:21" }, - "scope": 3660, + "scope": 3712, "src": "1360:382:21", "stateMutability": "payable", "superFunction": null, @@ -4247,7 +4247,7 @@ }, { "body": { - "id": 3629, + "id": 3681, "nodeType": "Block", "src": "1903:685:21", "statements": [ @@ -4261,18 +4261,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3624, + "id": 3676, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3620, + "id": 3672, "name": "_target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3608, + "referencedDeclaration": 3660, "src": "1921:7:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4287,7 +4287,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3622, + "id": 3674, "isConstant": false, "isLValue": false, "isPure": true, @@ -4310,7 +4310,7 @@ "typeString": "int_const 0" } ], - "id": 3621, + "id": 3673, "isConstant": false, "isLValue": false, "isPure": true, @@ -4323,7 +4323,7 @@ }, "typeName": "address" }, - "id": 3623, + "id": 3675, "isConstant": false, "isLValue": false, "isPure": true, @@ -4346,7 +4346,7 @@ { "argumentTypes": null, "hexValue": "64732d70726f78792d7461726765742d616464726573732d7265717569726564", - "id": 3625, + "id": 3677, "isConstant": false, "isLValue": false, "isPure": true, @@ -4373,21 +4373,21 @@ "typeString": "literal_string \"ds-proxy-target-address-required\"" } ], - "id": 3619, + "id": 3671, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1913:7:21", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3626, + "id": 3678, "isConstant": false, "isLValue": false, "isPure": false, @@ -4401,7 +4401,7 @@ "typeString": "tuple()" } }, - "id": 3627, + "id": 3679, "nodeType": "ExpressionStatement", "src": "1913:66:21" }, @@ -4409,7 +4409,7 @@ "externalReferences": [ { "_data": { - "declaration": 3610, + "declaration": 3662, "isOffset": false, "isSlot": false, "src": "2136:5:21", @@ -4418,7 +4418,7 @@ }, { "_data": { - "declaration": 3610, + "declaration": 3662, "isOffset": false, "isSlot": false, "src": "2116:5:21", @@ -4427,7 +4427,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2202:8:21", @@ -4436,7 +4436,7 @@ }, { "_target": { - "declaration": 3608, + "declaration": 3660, "isOffset": false, "isSlot": false, "src": "2103:7:21", @@ -4445,7 +4445,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2376:8:21", @@ -4454,7 +4454,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2329:8:21", @@ -4463,7 +4463,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2255:8:21", @@ -4472,7 +4472,7 @@ }, { "response": { - "declaration": 3617, + "declaration": 3669, "isOffset": false, "isSlot": false, "src": "2536:8:21", @@ -4480,7 +4480,7 @@ } } ], - "id": 3628, + "id": 3680, "nodeType": "InlineAssembly", "operations": "{\n let succeeded := delegatecall(sub(gas(), 5000), _target, add(_data, 0x20), mload(_data), 0, 0)\n let size := returndatasize()\n response := mload(0x40)\n mstore(0x40, add(response, and(add(add(size, 0x20), 0x1f), not(0x1f))))\n mstore(response, size)\n returndatacopy(add(response, 0x20), 0, size)\n switch iszero(succeeded)\n case 1 {\n revert(add(response, 0x20), size)\n }\n}", "src": "2034:548:21" @@ -4488,20 +4488,20 @@ ] }, "documentation": null, - "id": 3630, + "id": 3682, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3613, + "id": 3665, "modifierName": { "argumentTypes": null, - "id": 3612, + "id": 3664, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "1825:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -4513,14 +4513,14 @@ }, { "arguments": null, - "id": 3615, + "id": 3667, "modifierName": { "argumentTypes": null, - "id": 3614, + "id": 3666, "name": "note", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, + "referencedDeclaration": 3593, "src": "1838:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -4534,15 +4534,15 @@ "name": "execute", "nodeType": "FunctionDefinition", "parameters": { - "id": 3611, + "id": 3663, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3608, + "id": 3660, "name": "_target", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1765:15:21", "stateVariable": false, "storageLocation": "default", @@ -4551,7 +4551,7 @@ "typeString": "address" }, "typeName": { - "id": 3607, + "id": 3659, "name": "address", "nodeType": "ElementaryTypeName", "src": "1765:7:21", @@ -4566,10 +4566,10 @@ }, { "constant": false, - "id": 3610, + "id": 3662, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1782:18:21", "stateVariable": false, "storageLocation": "memory", @@ -4578,7 +4578,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3609, + "id": 3661, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1782:5:21", @@ -4594,15 +4594,15 @@ "src": "1764:37:21" }, "returnParameters": { - "id": 3618, + "id": 3670, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3617, + "id": 3669, "name": "response", "nodeType": "VariableDeclaration", - "scope": 3630, + "scope": 3682, "src": "1876:21:21", "stateVariable": false, "storageLocation": "memory", @@ -4611,7 +4611,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3616, + "id": 3668, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "1876:5:21", @@ -4626,7 +4626,7 @@ ], "src": "1875:23:21" }, - "scope": 3660, + "scope": 3712, "src": "1748:840:21", "stateMutability": "payable", "superFunction": null, @@ -4634,7 +4634,7 @@ }, { "body": { - "id": 3658, + "id": 3710, "nodeType": "Block", "src": "2720:168:21", "statements": [ @@ -4648,18 +4648,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 3646, + "id": 3698, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 3642, + "id": 3694, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, + "referencedDeclaration": 3684, "src": "2738:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4674,7 +4674,7 @@ { "argumentTypes": null, "hexValue": "30", - "id": 3644, + "id": 3696, "isConstant": false, "isLValue": false, "isPure": true, @@ -4697,7 +4697,7 @@ "typeString": "int_const 0" } ], - "id": 3643, + "id": 3695, "isConstant": false, "isLValue": false, "isPure": true, @@ -4710,7 +4710,7 @@ }, "typeName": "address" }, - "id": 3645, + "id": 3697, "isConstant": false, "isLValue": false, "isPure": true, @@ -4733,7 +4733,7 @@ { "argumentTypes": null, "hexValue": "64732d70726f78792d63616368652d616464726573732d7265717569726564", - "id": 3647, + "id": 3699, "isConstant": false, "isLValue": false, "isPure": true, @@ -4760,21 +4760,21 @@ "typeString": "literal_string \"ds-proxy-cache-address-required\"" } ], - "id": 3641, + "id": 3693, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2730:7:21", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 3648, + "id": 3700, "isConstant": false, "isLValue": false, "isPure": false, @@ -4788,28 +4788,28 @@ "typeString": "tuple()" } }, - "id": 3649, + "id": 3701, "nodeType": "ExpressionStatement", "src": "2730:68:21" }, { "expression": { "argumentTypes": null, - "id": 3654, + "id": 3706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3650, + "id": 3702, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3552, + "referencedDeclaration": 3604, "src": "2808:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -4820,11 +4820,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3652, + "id": 3704, "name": "_cacheAddr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3632, + "referencedDeclaration": 3684, "src": "2829:10:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4839,18 +4839,18 @@ "typeString": "address" } ], - "id": 3651, + "id": 3703, "name": "DSProxyCache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "2816:12:21", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_type$_t_contract$_DSProxyCache_$3840_$", "typeString": "type(contract DSProxyCache)" } }, - "id": 3653, + "id": 3705, "isConstant": false, "isLValue": false, "isPure": false, @@ -4860,17 +4860,17 @@ "nodeType": "FunctionCall", "src": "2816:24:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "2808:32:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3655, + "id": 3707, "nodeType": "ExpressionStatement", "src": "2808:32:21" }, @@ -4878,7 +4878,7 @@ "expression": { "argumentTypes": null, "hexValue": "74727565", - "id": 3656, + "id": 3708, "isConstant": false, "isLValue": false, "isPure": true, @@ -4893,28 +4893,28 @@ }, "value": "true" }, - "functionReturnParameters": 3640, - "id": 3657, + "functionReturnParameters": 3692, + "id": 3709, "nodeType": "Return", "src": "2870:11:21" } ] }, "documentation": null, - "id": 3659, + "id": 3711, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 3635, + "id": 3687, "modifierName": { "argumentTypes": null, - "id": 3634, + "id": 3686, "name": "auth", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2876, + "referencedDeclaration": 2928, "src": "2675:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -4926,14 +4926,14 @@ }, { "arguments": null, - "id": 3637, + "id": 3689, "modifierName": { "argumentTypes": null, - "id": 3636, + "id": 3688, "name": "note", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3541, + "referencedDeclaration": 3593, "src": "2688:4:21", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", @@ -4947,15 +4947,15 @@ "name": "setCache", "nodeType": "FunctionDefinition", "parameters": { - "id": 3633, + "id": 3685, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3632, + "id": 3684, "name": "_cacheAddr", "nodeType": "VariableDeclaration", - "scope": 3659, + "scope": 3711, "src": "2632:18:21", "stateVariable": false, "storageLocation": "default", @@ -4964,7 +4964,7 @@ "typeString": "address" }, "typeName": { - "id": 3631, + "id": 3683, "name": "address", "nodeType": "ElementaryTypeName", "src": "2632:7:21", @@ -4981,15 +4981,15 @@ "src": "2631:20:21" }, "returnParameters": { - "id": 3640, + "id": 3692, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3639, + "id": 3691, "name": "", "nodeType": "VariableDeclaration", - "scope": 3659, + "scope": 3711, "src": "2710:4:21", "stateVariable": false, "storageLocation": "default", @@ -4998,7 +4998,7 @@ "typeString": "bool" }, "typeName": { - "id": 3638, + "id": 3690, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2710:4:21", @@ -5013,28 +5013,28 @@ ], "src": "2709:6:21" }, - "scope": 3660, + "scope": 3712, "src": "2614:274:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "1068:1822:21" }, { "baseContracts": [], "contractDependencies": [ - 3660, - 3788 + 3712, + 3840 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3744, + "id": 3796, "linearizedBaseContracts": [ - 3744 + 3796 ], "name": "DSProxyFactory", "nodeType": "ContractDefinition", @@ -5042,20 +5042,20 @@ { "anonymous": false, "documentation": null, - "id": 3670, + "id": 3722, "name": "Created", "nodeType": "EventDefinition", "parameters": { - "id": 3669, + "id": 3721, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3662, + "id": 3714, "indexed": true, "name": "sender", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3053:22:21", "stateVariable": false, "storageLocation": "default", @@ -5064,7 +5064,7 @@ "typeString": "address" }, "typeName": { - "id": 3661, + "id": 3713, "name": "address", "nodeType": "ElementaryTypeName", "src": "3053:7:21", @@ -5079,11 +5079,11 @@ }, { "constant": false, - "id": 3664, + "id": 3716, "indexed": true, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3077:21:21", "stateVariable": false, "storageLocation": "default", @@ -5092,7 +5092,7 @@ "typeString": "address" }, "typeName": { - "id": 3663, + "id": 3715, "name": "address", "nodeType": "ElementaryTypeName", "src": "3077:7:21", @@ -5107,11 +5107,11 @@ }, { "constant": false, - "id": 3666, + "id": 3718, "indexed": false, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3100:13:21", "stateVariable": false, "storageLocation": "default", @@ -5120,7 +5120,7 @@ "typeString": "address" }, "typeName": { - "id": 3665, + "id": 3717, "name": "address", "nodeType": "ElementaryTypeName", "src": "3100:7:21", @@ -5135,11 +5135,11 @@ }, { "constant": false, - "id": 3668, + "id": 3720, "indexed": false, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3670, + "scope": 3722, "src": "3115:13:21", "stateVariable": false, "storageLocation": "default", @@ -5148,7 +5148,7 @@ "typeString": "address" }, "typeName": { - "id": 3667, + "id": 3719, "name": "address", "nodeType": "ElementaryTypeName", "src": "3115:7:21", @@ -5168,10 +5168,10 @@ }, { "constant": false, - "id": 3674, + "id": 3726, "name": "proxies", "nodeType": "VariableDeclaration", - "scope": 3744, + "scope": 3796, "src": "3135:40:21", "stateVariable": true, "storageLocation": "default", @@ -5180,9 +5180,9 @@ "typeString": "mapping(address => address)" }, "typeName": { - "id": 3673, + "id": 3725, "keyType": { - "id": 3671, + "id": 3723, "name": "address", "nodeType": "ElementaryTypeName", "src": "3143:7:21", @@ -5198,7 +5198,7 @@ "typeString": "mapping(address => address)" }, "valueType": { - "id": 3672, + "id": 3724, "name": "address", "nodeType": "ElementaryTypeName", "src": "3152:7:21", @@ -5214,26 +5214,26 @@ }, { "constant": false, - "id": 3676, + "id": 3728, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3744, + "scope": 3796, "src": "3181:25:21", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" }, "typeName": { "contractScope": null, - "id": 3675, + "id": 3727, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "3181:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -5242,28 +5242,28 @@ }, { "body": { - "id": 3685, + "id": 3737, "nodeType": "Block", "src": "3234:43:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3683, + "id": 3735, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3679, + "id": 3731, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3244:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, @@ -5274,7 +5274,7 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 3681, + "id": 3733, "isConstant": false, "isLValue": false, "isPure": false, @@ -5282,23 +5282,23 @@ "nodeType": "NewExpression", "src": "3252:16:21", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3788_$", + "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_DSProxyCache_$3840_$", "typeString": "function () returns (contract DSProxyCache)" }, "typeName": { "contractScope": null, - "id": 3680, + "id": 3732, "name": "DSProxyCache", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3788, + "referencedDeclaration": 3840, "src": "3256:12:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } }, - "id": 3682, + "id": 3734, "isConstant": false, "isLValue": false, "isPure": false, @@ -5308,42 +5308,42 @@ "nodeType": "FunctionCall", "src": "3252:18:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, "src": "3244:26:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } }, - "id": 3684, + "id": 3736, "nodeType": "ExpressionStatement", "src": "3244:26:21" } ] }, "documentation": null, - "id": 3686, + "id": 3738, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 3677, + "id": 3729, "nodeType": "ParameterList", "parameters": [], "src": "3224:2:21" }, "returnParameters": { - "id": 3678, + "id": 3730, "nodeType": "ParameterList", "parameters": [], "src": "3234:0:21" }, - "scope": 3744, + "scope": 3796, "src": "3213:64:21", "stateMutability": "nonpayable", "superFunction": null, @@ -5351,25 +5351,25 @@ }, { "body": { - "id": 3698, + "id": 3750, "nodeType": "Block", "src": "3412:42:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3696, + "id": 3748, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3691, + "id": 3743, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3689, + "referencedDeclaration": 3741, "src": "3422:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5385,18 +5385,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3693, + "id": 3745, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "3436:3:21", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3694, + "id": 3746, "isConstant": false, "isLValue": false, "isPure": false, @@ -5418,21 +5418,21 @@ "typeString": "address payable" } ], - "id": 3692, + "id": 3744, "name": "build", "nodeType": "Identifier", "overloadedDeclarations": [ - 3699, - 3743 + 3751, + 3795 ], - "referencedDeclaration": 3743, + "referencedDeclaration": 3795, "src": "3430:5:21", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$returns$_t_address_payable_$", "typeString": "function (address) returns (address payable)" } }, - "id": 3695, + "id": 3747, "isConstant": false, "isLValue": false, "isPure": false, @@ -5452,35 +5452,35 @@ "typeString": "address payable" } }, - "id": 3697, + "id": 3749, "nodeType": "ExpressionStatement", "src": "3422:25:21" } ] }, "documentation": null, - "id": 3699, + "id": 3751, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 3687, + "id": 3739, "nodeType": "ParameterList", "parameters": [], "src": "3370:2:21" }, "returnParameters": { - "id": 3690, + "id": 3742, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3689, + "id": 3741, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3699, + "scope": 3751, "src": "3389:21:21", "stateVariable": false, "storageLocation": "default", @@ -5489,7 +5489,7 @@ "typeString": "address payable" }, "typeName": { - "id": 3688, + "id": 3740, "name": "address", "nodeType": "ElementaryTypeName", "src": "3389:15:21", @@ -5505,7 +5505,7 @@ ], "src": "3388:23:21" }, - "scope": 3744, + "scope": 3796, "src": "3356:98:21", "stateMutability": "nonpayable", "superFunction": null, @@ -5513,25 +5513,25 @@ }, { "body": { - "id": 3742, + "id": 3794, "nodeType": "Block", "src": "3599:206:21", "statements": [ { "expression": { "argumentTypes": null, - "id": 3715, + "id": 3767, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 3706, + "id": 3758, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3609:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5551,14 +5551,14 @@ "arguments": [ { "argumentTypes": null, - "id": 3711, + "id": 3763, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3645:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -5566,11 +5566,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 3710, + "id": 3762, "isConstant": false, "isLValue": false, "isPure": true, @@ -5583,7 +5583,7 @@ }, "typeName": "address" }, - "id": 3712, + "id": 3764, "isConstant": false, "isLValue": false, "isPure": false, @@ -5605,7 +5605,7 @@ "typeString": "address" } ], - "id": 3709, + "id": 3761, "isConstant": false, "isLValue": false, "isPure": false, @@ -5613,23 +5613,23 @@ "nodeType": "NewExpression", "src": "3625:11:21", "typeDescriptions": { - "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DSProxy_$3660_$", + "typeIdentifier": "t_function_creation_nonpayable$_t_address_$returns$_t_contract$_DSProxy_$3712_$", "typeString": "function (address) returns (contract DSProxy)" }, "typeName": { "contractScope": null, - "id": 3708, + "id": 3760, "name": "DSProxy", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "3629:7:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } } }, - "id": 3713, + "id": 3765, "isConstant": false, "isLValue": false, "isPure": false, @@ -5639,7 +5639,7 @@ "nodeType": "FunctionCall", "src": "3625:27:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } } @@ -5647,11 +5647,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } ], - "id": 3707, + "id": 3759, "isConstant": false, "isLValue": false, "isPure": true, @@ -5664,7 +5664,7 @@ }, "typeName": "address" }, - "id": 3714, + "id": 3766, "isConstant": false, "isLValue": false, "isPure": false, @@ -5684,7 +5684,7 @@ "typeString": "address payable" } }, - "id": 3716, + "id": 3768, "nodeType": "ExpressionStatement", "src": "3609:44:21" }, @@ -5696,18 +5696,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 3718, + "id": 3770, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "3676:3:21", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 3719, + "id": 3771, "isConstant": false, "isLValue": false, "isPure": false, @@ -5723,11 +5723,11 @@ }, { "argumentTypes": null, - "id": 3720, + "id": 3772, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3688:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5739,11 +5739,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3722, + "id": 3774, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3703:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5758,7 +5758,7 @@ "typeString": "address payable" } ], - "id": 3721, + "id": 3773, "isConstant": false, "isLValue": false, "isPure": true, @@ -5771,7 +5771,7 @@ }, "typeName": "address" }, - "id": 3723, + "id": 3775, "isConstant": false, "isLValue": false, "isPure": false, @@ -5790,14 +5790,14 @@ "arguments": [ { "argumentTypes": null, - "id": 3725, + "id": 3777, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3676, + "referencedDeclaration": 3728, "src": "3719:5:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } } @@ -5805,11 +5805,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSProxyCache_$3788", + "typeIdentifier": "t_contract$_DSProxyCache_$3840", "typeString": "contract DSProxyCache" } ], - "id": 3724, + "id": 3776, "isConstant": false, "isLValue": false, "isPure": true, @@ -5822,7 +5822,7 @@ }, "typeName": "address" }, - "id": 3726, + "id": 3778, "isConstant": false, "isLValue": false, "isPure": false, @@ -5856,18 +5856,18 @@ "typeString": "address" } ], - "id": 3717, + "id": 3769, "name": "Created", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3670, + "referencedDeclaration": 3722, "src": "3668:7:21", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$_t_address_$_t_address_$returns$__$", "typeString": "function (address,address,address,address)" } }, - "id": 3727, + "id": 3779, "isConstant": false, "isLValue": false, "isPure": false, @@ -5881,7 +5881,7 @@ "typeString": "tuple()" } }, - "id": 3728, + "id": 3780, "nodeType": "EmitStatement", "src": "3663:63:21" }, @@ -5891,11 +5891,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3733, + "id": 3785, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3760:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5915,11 +5915,11 @@ "arguments": [ { "argumentTypes": null, - "id": 3730, + "id": 3782, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3744:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -5934,18 +5934,18 @@ "typeString": "address payable" } ], - "id": 3729, + "id": 3781, "name": "DSProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3660, + "referencedDeclaration": 3712, "src": "3736:7:21", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSProxy_$3660_$", + "typeIdentifier": "t_type$_t_contract$_DSProxy_$3712_$", "typeString": "type(contract DSProxy)" } }, - "id": 3731, + "id": 3783, "isConstant": false, "isLValue": false, "isPure": false, @@ -5955,25 +5955,25 @@ "nodeType": "FunctionCall", "src": "3736:14:21", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSProxy_$3660", + "typeIdentifier": "t_contract$_DSProxy_$3712", "typeString": "contract DSProxy" } }, - "id": 3732, + "id": 3784, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "setOwner", "nodeType": "MemberAccess", - "referencedDeclaration": 2844, + "referencedDeclaration": 2896, "src": "3736:23:21", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$returns$__$", "typeString": "function (address) external" } }, - "id": 3734, + "id": 3786, "isConstant": false, "isLValue": false, "isPure": false, @@ -5987,14 +5987,14 @@ "typeString": "tuple()" } }, - "id": 3735, + "id": 3787, "nodeType": "ExpressionStatement", "src": "3736:30:21" }, { "expression": { "argumentTypes": null, - "id": 3740, + "id": 3792, "isConstant": false, "isLValue": false, "isPure": false, @@ -6003,25 +6003,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3736, + "id": 3788, "name": "proxies", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3674, + "referencedDeclaration": 3726, "src": "3776:7:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_address_$", "typeString": "mapping(address => address)" } }, - "id": 3738, + "id": 3790, "indexExpression": { "argumentTypes": null, - "id": 3737, + "id": 3789, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3701, + "referencedDeclaration": 3753, "src": "3784:5:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6043,11 +6043,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3739, + "id": 3791, "name": "proxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3704, + "referencedDeclaration": 3756, "src": "3793:5:21", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -6060,29 +6060,29 @@ "typeString": "address" } }, - "id": 3741, + "id": 3793, "nodeType": "ExpressionStatement", "src": "3776:22:21" } ] }, "documentation": null, - "id": 3743, + "id": 3795, "implemented": true, "kind": "function", "modifiers": [], "name": "build", "nodeType": "FunctionDefinition", "parameters": { - "id": 3702, + "id": 3754, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3701, + "id": 3753, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 3743, + "scope": 3795, "src": "3545:13:21", "stateVariable": false, "storageLocation": "default", @@ -6091,7 +6091,7 @@ "typeString": "address" }, "typeName": { - "id": 3700, + "id": 3752, "name": "address", "nodeType": "ElementaryTypeName", "src": "3545:7:21", @@ -6108,15 +6108,15 @@ "src": "3544:15:21" }, "returnParameters": { - "id": 3705, + "id": 3757, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3704, + "id": 3756, "name": "proxy", "nodeType": "VariableDeclaration", - "scope": 3743, + "scope": 3795, "src": "3576:21:21", "stateVariable": false, "storageLocation": "default", @@ -6125,7 +6125,7 @@ "typeString": "address payable" }, "typeName": { - "id": 3703, + "id": 3755, "name": "address", "nodeType": "ElementaryTypeName", "src": "3576:15:21", @@ -6141,14 +6141,14 @@ ], "src": "3575:23:21" }, - "scope": 3744, + "scope": 3796, "src": "3530:275:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "3009:798:21" }, { @@ -6157,19 +6157,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 3788, + "id": 3840, "linearizedBaseContracts": [ - 3788 + 3840 ], "name": "DSProxyCache", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 3748, + "id": 3800, "name": "cache", "nodeType": "VariableDeclaration", - "scope": 3788, + "scope": 3840, "src": "4263:33:21", "stateVariable": true, "storageLocation": "default", @@ -6178,9 +6178,9 @@ "typeString": "mapping(bytes32 => address)" }, "typeName": { - "id": 3747, + "id": 3799, "keyType": { - "id": 3745, + "id": 3797, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4271:7:21", @@ -6196,7 +6196,7 @@ "typeString": "mapping(bytes32 => address)" }, "valueType": { - "id": 3746, + "id": 3798, "name": "address", "nodeType": "ElementaryTypeName", "src": "4282:7:21", @@ -6212,21 +6212,21 @@ }, { "body": { - "id": 3765, + "id": 3817, "nodeType": "Block", "src": "4367:76:21", "statements": [ { "assignments": [ - 3756 + 3808 ], "declarations": [ { "constant": false, - "id": 3756, + "id": 3808, "name": "hash", "nodeType": "VariableDeclaration", - "scope": 3765, + "scope": 3817, "src": "4377:12:21", "stateVariable": false, "storageLocation": "default", @@ -6235,7 +6235,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3755, + "id": 3807, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4377:7:21", @@ -6248,17 +6248,17 @@ "visibility": "internal" } ], - "id": 3760, + "id": 3812, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3758, + "id": 3810, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3750, + "referencedDeclaration": 3802, "src": "4402:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -6273,18 +6273,18 @@ "typeString": "bytes memory" } ], - "id": 3757, + "id": 3809, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7821, + "referencedDeclaration": 7812, "src": "4392:9:21", "typeDescriptions": { "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$", "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 3759, + "id": 3811, "isConstant": false, "isLValue": false, "isPure": false, @@ -6306,25 +6306,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3761, + "id": 3813, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3748, + "referencedDeclaration": 3800, "src": "4425:5:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_address_$", "typeString": "mapping(bytes32 => address)" } }, - "id": 3763, + "id": 3815, "indexExpression": { "argumentTypes": null, - "id": 3762, + "id": 3814, "name": "hash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3756, + "referencedDeclaration": 3808, "src": "4431:4:21", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6342,30 +6342,30 @@ "typeString": "address" } }, - "functionReturnParameters": 3754, - "id": 3764, + "functionReturnParameters": 3806, + "id": 3816, "nodeType": "Return", "src": "4418:18:21" } ] }, "documentation": null, - "id": 3766, + "id": 3818, "implemented": true, "kind": "function", "modifiers": [], "name": "read", "nodeType": "FunctionDefinition", "parameters": { - "id": 3751, + "id": 3803, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3750, + "id": 3802, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3766, + "scope": 3818, "src": "4317:18:21", "stateVariable": false, "storageLocation": "memory", @@ -6374,7 +6374,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3749, + "id": 3801, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4317:5:21", @@ -6390,15 +6390,15 @@ "src": "4316:20:21" }, "returnParameters": { - "id": 3754, + "id": 3806, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3753, + "id": 3805, "name": "", "nodeType": "VariableDeclaration", - "scope": 3766, + "scope": 3818, "src": "4358:7:21", "stateVariable": false, "storageLocation": "default", @@ -6407,7 +6407,7 @@ "typeString": "address" }, "typeName": { - "id": 3752, + "id": 3804, "name": "address", "nodeType": "ElementaryTypeName", "src": "4358:7:21", @@ -6423,7 +6423,7 @@ ], "src": "4357:9:21" }, - "scope": 3788, + "scope": 3840, "src": "4303:140:21", "stateMutability": "view", "superFunction": null, @@ -6431,7 +6431,7 @@ }, { "body": { - "id": 3786, + "id": 3838, "nodeType": "Block", "src": "4516:336:21", "statements": [ @@ -6439,7 +6439,7 @@ "externalReferences": [ { "target": { - "declaration": 3771, + "declaration": 3823, "isOffset": false, "isSlot": false, "src": "4549:6:21", @@ -6448,7 +6448,7 @@ }, { "_code": { - "declaration": 3768, + "declaration": 3820, "isOffset": false, "isSlot": false, "src": "4593:5:21", @@ -6457,7 +6457,7 @@ }, { "_code": { - "declaration": 3768, + "declaration": 3820, "isOffset": false, "isSlot": false, "src": "4573:5:21", @@ -6466,7 +6466,7 @@ }, { "target": { - "declaration": 3771, + "declaration": 3823, "isOffset": false, "isSlot": false, "src": "4639:6:21", @@ -6474,22 +6474,22 @@ } } ], - "id": 3773, + "id": 3825, "nodeType": "InlineAssembly", "operations": "{\n target := create(0, add(_code, 0x20), mload(_code))\n switch iszero(extcodesize(target))\n case 1 { revert(0, 0) }\n}", "src": "4526:249:21" }, { "assignments": [ - 3775 + 3827 ], "declarations": [ { "constant": false, - "id": 3775, + "id": 3827, "name": "hash", "nodeType": "VariableDeclaration", - "scope": 3786, + "scope": 3838, "src": "4784:12:21", "stateVariable": false, "storageLocation": "default", @@ -6498,7 +6498,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3774, + "id": 3826, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4784:7:21", @@ -6511,17 +6511,17 @@ "visibility": "internal" } ], - "id": 3779, + "id": 3831, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 3777, + "id": 3829, "name": "_code", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3768, + "referencedDeclaration": 3820, "src": "4809:5:21", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -6536,18 +6536,18 @@ "typeString": "bytes memory" } ], - "id": 3776, + "id": 3828, "name": "keccak256", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7821, + "referencedDeclaration": 7812, "src": "4799:9:21", "typeDescriptions": { "typeIdentifier": "t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$", "typeString": "function (bytes memory) pure returns (bytes32)" } }, - "id": 3778, + "id": 3830, "isConstant": false, "isLValue": false, "isPure": false, @@ -6567,7 +6567,7 @@ { "expression": { "argumentTypes": null, - "id": 3784, + "id": 3836, "isConstant": false, "isLValue": false, "isPure": false, @@ -6576,25 +6576,25 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 3780, + "id": 3832, "name": "cache", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3748, + "referencedDeclaration": 3800, "src": "4825:5:21", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_address_$", "typeString": "mapping(bytes32 => address)" } }, - "id": 3782, + "id": 3834, "indexExpression": { "argumentTypes": null, - "id": 3781, + "id": 3833, "name": "hash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3775, + "referencedDeclaration": 3827, "src": "4831:4:21", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6616,11 +6616,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 3783, + "id": 3835, "name": "target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3771, + "referencedDeclaration": 3823, "src": "4839:6:21", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6633,29 +6633,29 @@ "typeString": "address" } }, - "id": 3785, + "id": 3837, "nodeType": "ExpressionStatement", "src": "4825:20:21" } ] }, "documentation": null, - "id": 3787, + "id": 3839, "implemented": true, "kind": "function", "modifiers": [], "name": "write", "nodeType": "FunctionDefinition", "parameters": { - "id": 3769, + "id": 3821, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3768, + "id": 3820, "name": "_code", "nodeType": "VariableDeclaration", - "scope": 3787, + "scope": 3839, "src": "4464:18:21", "stateVariable": false, "storageLocation": "memory", @@ -6664,7 +6664,7 @@ "typeString": "bytes" }, "typeName": { - "id": 3767, + "id": 3819, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4464:5:21", @@ -6680,15 +6680,15 @@ "src": "4463:20:21" }, "returnParameters": { - "id": 3772, + "id": 3824, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3771, + "id": 3823, "name": "target", "nodeType": "VariableDeclaration", - "scope": 3787, + "scope": 3839, "src": "4500:14:21", "stateVariable": false, "storageLocation": "default", @@ -6697,7 +6697,7 @@ "typeString": "address" }, "typeName": { - "id": 3770, + "id": 3822, "name": "address", "nodeType": "ElementaryTypeName", "src": "4500:7:21", @@ -6713,14 +6713,14 @@ ], "src": "4499:16:21" }, - "scope": 3788, + "scope": 3840, "src": "4449:403:21", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 3789, + "scope": 3841, "src": "4235:619:21" } ], @@ -6732,7 +6732,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.525Z", + "updatedAt": "2020-04-08T12:21:13.761Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DaiJoinLike.json b/packages/smart-contracts/artifacts/DaiJoinLike.json index e05e4c0..6f0f4a2 100644 --- a/packages/smart-contracts/artifacts/DaiJoinLike.json +++ b/packages/smart-contracts/artifacts/DaiJoinLike.json @@ -83,35 +83,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -123,9 +123,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -137,9 +137,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -147,22 +147,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -171,7 +171,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -186,10 +186,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -198,7 +198,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -214,12 +214,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -228,22 +228,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -252,7 +252,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -267,10 +267,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -279,7 +279,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -295,12 +295,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -309,22 +309,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -333,7 +333,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -348,10 +348,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -360,7 +360,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -375,10 +375,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -387,7 +387,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -403,12 +403,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -417,25 +417,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -444,22 +444,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -468,7 +468,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -484,19 +484,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -505,9 +505,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -515,22 +515,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -539,7 +539,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -554,10 +554,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -566,7 +566,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -580,10 +580,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -592,7 +592,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -609,15 +609,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -626,7 +626,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -641,7 +641,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -650,22 +650,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -674,7 +674,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -690,15 +690,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -707,7 +707,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -722,7 +722,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -731,22 +731,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -755,7 +755,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -771,15 +771,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -788,7 +788,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -804,7 +804,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -813,22 +813,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -837,7 +837,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -853,15 +853,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -870,7 +870,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -886,7 +886,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -895,28 +895,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -925,7 +925,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -941,7 +941,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -950,22 +950,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -974,7 +974,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -988,10 +988,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -1000,7 +1000,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -1017,15 +1017,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -1034,7 +1034,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -1049,7 +1049,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1058,22 +1058,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -1082,7 +1082,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -1096,10 +1096,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -1108,7 +1108,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -1125,12 +1125,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1139,22 +1139,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -1163,7 +1163,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -1177,10 +1177,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -1189,7 +1189,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -1204,10 +1204,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -1216,7 +1216,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -1232,12 +1232,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1246,22 +1246,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -1270,7 +1270,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -1285,10 +1285,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -1297,7 +1297,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -1313,12 +1313,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1327,22 +1327,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -1351,7 +1351,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -1365,10 +1365,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -1377,7 +1377,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -1391,10 +1391,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -1403,7 +1403,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -1419,12 +1419,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1433,22 +1433,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -1457,7 +1457,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -1471,10 +1471,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -1483,7 +1483,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -1498,10 +1498,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -1510,7 +1510,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -1526,12 +1526,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1540,22 +1540,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -1564,7 +1564,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -1578,10 +1578,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -1590,7 +1590,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -1605,10 +1605,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -1617,7 +1617,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -1633,12 +1633,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1647,22 +1647,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -1671,7 +1671,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -1686,10 +1686,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -1698,7 +1698,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -1712,10 +1712,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -1724,7 +1724,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -1739,10 +1739,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -1751,7 +1751,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -1767,12 +1767,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1781,22 +1781,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -1805,7 +1805,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -1819,10 +1819,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -1831,7 +1831,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -1848,12 +1848,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1862,22 +1862,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -1886,7 +1886,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -1901,10 +1901,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -1913,7 +1913,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -1929,12 +1929,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1943,22 +1943,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -1967,7 +1967,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -1981,10 +1981,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -1993,7 +1993,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -2009,19 +2009,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -2030,9 +2030,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -2040,22 +2040,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -2064,7 +2064,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -2079,10 +2079,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -2091,7 +2091,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -2108,15 +2108,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -2125,7 +2125,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -2140,7 +2140,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -2149,22 +2149,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -2173,7 +2173,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -2189,15 +2189,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -2206,7 +2206,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -2220,10 +2220,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -2232,7 +2232,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -2246,10 +2246,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -2258,7 +2258,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -2272,10 +2272,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -2284,7 +2284,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -2298,10 +2298,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -2310,7 +2310,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -2325,7 +2325,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -2334,22 +2334,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -2358,7 +2358,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -2375,15 +2375,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -2392,7 +2392,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -2407,7 +2407,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -2416,22 +2416,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -2440,7 +2440,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -2454,10 +2454,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -2466,7 +2466,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -2483,15 +2483,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -2500,7 +2500,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -2514,10 +2514,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -2526,7 +2526,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -2541,7 +2541,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -2550,22 +2550,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -2574,7 +2574,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -2588,10 +2588,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -2600,7 +2600,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -2615,10 +2615,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -2627,7 +2627,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -2642,10 +2642,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -2654,7 +2654,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -2669,10 +2669,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -2681,7 +2681,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -2695,10 +2695,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -2707,7 +2707,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -2723,12 +2723,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2737,22 +2737,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -2761,7 +2761,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -2778,12 +2778,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2792,22 +2792,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -2816,7 +2816,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -2831,10 +2831,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -2843,7 +2843,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -2858,10 +2858,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -2870,7 +2870,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -2886,19 +2886,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -2907,9 +2907,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -2917,28 +2917,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -2947,7 +2947,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -2962,7 +2962,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2971,44 +2971,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3018,7 +3018,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3027,22 +3027,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -3051,7 +3051,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -3066,10 +3066,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -3078,7 +3078,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -3094,12 +3094,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -3108,22 +3108,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -3132,7 +3132,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -3147,10 +3147,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -3159,7 +3159,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -3175,19 +3175,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -3196,9 +3196,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -3206,44 +3206,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -3253,7 +3253,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3262,44 +3262,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3309,7 +3309,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3318,22 +3318,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -3342,7 +3342,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -3357,10 +3357,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -3369,7 +3369,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -3385,12 +3385,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -3399,22 +3399,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -3423,7 +3423,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -3438,10 +3438,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -3450,7 +3450,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -3466,19 +3466,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -3487,9 +3487,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -3497,22 +3497,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -3521,7 +3521,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -3537,15 +3537,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -3554,7 +3554,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -3569,14 +3569,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -3585,19 +3585,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -3606,7 +3606,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -3621,7 +3621,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -3629,7 +3629,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -3649,7 +3649,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -3674,7 +3674,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -3688,7 +3688,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -3699,18 +3699,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3722,7 +3722,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -3751,7 +3751,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -3762,7 +3762,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -3772,18 +3772,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3798,18 +3798,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3820,11 +3820,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3844,7 +3844,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -3861,11 +3861,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3882,11 +3882,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3908,7 +3908,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -3935,21 +3935,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -3963,29 +3963,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -3994,7 +3994,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -4008,10 +4008,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -4020,7 +4020,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -4036,15 +4036,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -4053,7 +4053,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -4068,7 +4068,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -4076,7 +4076,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -4086,11 +4086,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4099,11 +4099,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4132,11 +4132,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4151,18 +4151,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -4172,25 +4172,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -4200,25 +4200,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -4232,7 +4232,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -4242,11 +4242,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4255,11 +4255,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4283,11 +4283,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4302,18 +4302,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -4323,25 +4323,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -4355,29 +4355,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -4386,7 +4386,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -4401,10 +4401,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -4413,7 +4413,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -4428,10 +4428,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -4440,7 +4440,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -4456,19 +4456,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -4477,38 +4477,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -4522,7 +4522,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -4532,18 +4532,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4558,18 +4558,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4580,11 +4580,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4604,7 +4604,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4621,11 +4621,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4641,7 +4641,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -4668,21 +4668,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -4696,29 +4696,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -4727,7 +4727,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -4741,10 +4741,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -4753,7 +4753,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -4769,15 +4769,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -4786,7 +4786,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -4801,7 +4801,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -4809,25 +4809,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -4841,11 +4841,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4860,7 +4860,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -4873,7 +4873,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -4893,7 +4893,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -4907,18 +4907,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -4930,7 +4930,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -4954,7 +4954,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -4981,21 +4981,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -5009,29 +5009,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -5040,7 +5040,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -5056,15 +5056,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -5073,7 +5073,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -5088,7 +5088,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -5096,25 +5096,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5128,11 +5128,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5145,7 +5145,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -5153,7 +5153,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -5173,7 +5173,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -5206,18 +5206,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -5237,29 +5237,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -5268,7 +5268,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -5284,15 +5284,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -5301,7 +5301,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -5316,7 +5316,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -5324,25 +5324,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5356,11 +5356,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5373,7 +5373,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -5381,7 +5381,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -5407,7 +5407,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -5415,7 +5415,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -5442,11 +5442,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5461,18 +5461,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -5482,25 +5482,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -5521,7 +5521,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5552,18 +5552,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -5583,29 +5583,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -5614,7 +5614,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -5629,10 +5629,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -5641,7 +5641,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -5657,15 +5657,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -5674,7 +5674,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -5689,7 +5689,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -5697,25 +5697,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5730,18 +5730,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5759,7 +5759,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -5767,7 +5767,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -5793,7 +5793,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -5801,7 +5801,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -5828,11 +5828,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5847,18 +5847,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -5868,25 +5868,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -5907,7 +5907,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5927,7 +5927,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5952,29 +5952,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -5983,7 +5983,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -5998,10 +5998,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -6010,7 +6010,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -6026,15 +6026,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -6043,7 +6043,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -6058,7 +6058,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -6066,21 +6066,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -6089,7 +6089,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -6102,17 +6102,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6132,11 +6132,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6151,18 +6151,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -6172,25 +6172,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -6209,15 +6209,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -6226,7 +6226,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -6239,17 +6239,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6269,11 +6269,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6288,18 +6288,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -6309,25 +6309,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -6351,18 +6351,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6376,11 +6376,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6389,11 +6389,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6412,18 +6412,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -6444,29 +6444,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6484,7 +6484,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -6497,11 +6497,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6510,11 +6510,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6533,18 +6533,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -6560,11 +6560,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6583,18 +6583,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -6612,11 +6612,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6637,18 +6637,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -6668,25 +6668,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6703,7 +6703,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -6716,11 +6716,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6735,7 +6735,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -6748,7 +6748,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -6764,11 +6764,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6787,18 +6787,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -6819,11 +6819,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6832,11 +6832,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6855,18 +6855,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -6888,18 +6888,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -6912,18 +6912,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6935,7 +6935,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -6967,7 +6967,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -6977,22 +6977,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -7001,7 +7001,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -7016,10 +7016,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -7028,7 +7028,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -7043,10 +7043,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -7055,7 +7055,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -7070,10 +7070,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -7082,7 +7082,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -7096,10 +7096,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -7108,7 +7108,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -7124,15 +7124,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -7141,7 +7141,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -7156,7 +7156,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -7164,14 +7164,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -7180,10 +7180,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -7192,7 +7192,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -7208,17 +7208,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7238,11 +7238,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7257,18 +7257,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -7278,25 +7278,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -7316,16 +7316,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -7334,7 +7334,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -7347,17 +7347,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7366,11 +7366,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7394,11 +7394,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7413,18 +7413,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -7434,25 +7434,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -7471,15 +7471,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -7488,7 +7488,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -7501,17 +7501,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7531,11 +7531,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7550,18 +7550,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -7571,25 +7571,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -7608,15 +7608,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -7625,7 +7625,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -7638,7 +7638,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7647,11 +7647,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7660,11 +7660,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7683,18 +7683,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -7710,11 +7710,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7733,18 +7733,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -7764,18 +7764,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7790,18 +7790,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7812,11 +7812,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7835,25 +7835,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7870,7 +7870,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -7880,11 +7880,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7893,11 +7893,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7916,18 +7916,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -7945,11 +7945,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7964,18 +7964,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -7988,18 +7988,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8011,7 +8011,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -8043,29 +8043,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -8074,7 +8074,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -8089,10 +8089,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -8101,7 +8101,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -8116,10 +8116,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -8128,7 +8128,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -8143,10 +8143,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -8155,7 +8155,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -8171,15 +8171,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -8188,7 +8188,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -8203,7 +8203,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -8211,25 +8211,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8243,11 +8243,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -8256,11 +8256,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8284,11 +8284,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8303,18 +8303,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -8324,25 +8324,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -8362,29 +8362,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -8393,7 +8393,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -8408,10 +8408,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -8420,7 +8420,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -8434,10 +8434,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -8446,7 +8446,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -8463,15 +8463,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -8480,7 +8480,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -8495,7 +8495,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8503,7 +8503,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -8513,11 +8513,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8526,11 +8526,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8554,11 +8554,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8573,18 +8573,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -8594,25 +8594,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -8626,29 +8626,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -8657,7 +8657,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -8672,10 +8672,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -8684,7 +8684,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -8698,10 +8698,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -8710,7 +8710,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -8727,12 +8727,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8740,7 +8740,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -8750,11 +8750,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8763,11 +8763,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8776,11 +8776,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8808,11 +8808,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8827,18 +8827,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -8848,25 +8848,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -8880,29 +8880,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -8911,7 +8911,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -8926,10 +8926,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -8938,7 +8938,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -8952,10 +8952,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -8964,7 +8964,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -8979,10 +8979,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -8991,7 +8991,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -9007,12 +9007,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9020,7 +9020,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -9030,11 +9030,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9043,11 +9043,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9056,11 +9056,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9088,11 +9088,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9107,18 +9107,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -9128,25 +9128,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -9160,29 +9160,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -9191,7 +9191,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -9206,10 +9206,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -9218,7 +9218,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -9232,10 +9232,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -9244,7 +9244,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -9259,10 +9259,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -9271,7 +9271,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -9287,12 +9287,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9300,7 +9300,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -9310,11 +9310,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9323,11 +9323,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9336,11 +9336,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9368,11 +9368,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9387,18 +9387,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -9408,25 +9408,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -9440,29 +9440,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -9471,7 +9471,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -9486,10 +9486,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -9498,7 +9498,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -9512,10 +9512,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -9524,7 +9524,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -9538,10 +9538,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -9550,7 +9550,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -9566,12 +9566,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9579,21 +9579,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -9602,7 +9602,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -9616,7 +9616,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -9627,11 +9627,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9646,18 +9646,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -9667,25 +9667,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -9704,15 +9704,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -9721,7 +9721,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -9735,17 +9735,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9765,11 +9765,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9784,18 +9784,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -9805,25 +9805,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -9842,15 +9842,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -9859,7 +9859,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -9872,17 +9872,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9902,11 +9902,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9921,18 +9921,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -9942,25 +9942,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -9980,16 +9980,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -9998,7 +9998,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -10011,17 +10011,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10030,11 +10030,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10058,11 +10058,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10077,18 +10077,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -10098,25 +10098,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -10139,11 +10139,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10152,11 +10152,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10168,11 +10168,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10181,11 +10181,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10194,11 +10194,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10207,11 +10207,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10238,18 +10238,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -10279,18 +10279,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -10304,7 +10304,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -10314,11 +10314,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10327,11 +10327,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10340,7 +10340,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -10354,11 +10354,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10373,18 +10373,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -10405,7 +10405,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -10419,11 +10419,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10438,7 +10438,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -10451,7 +10451,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -10490,18 +10490,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -10515,7 +10515,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -10525,11 +10525,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10538,11 +10538,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10554,14 +10554,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10569,11 +10569,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -10586,7 +10586,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -10602,11 +10602,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10633,18 +10633,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -10658,7 +10658,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -10671,14 +10671,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10686,11 +10686,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -10703,7 +10703,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -10719,11 +10719,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10747,11 +10747,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10766,18 +10766,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -10787,25 +10787,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -10819,7 +10819,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -10829,11 +10829,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10858,11 +10858,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10877,18 +10877,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -10898,25 +10898,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -10926,25 +10926,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -10958,29 +10958,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -10989,7 +10989,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -11004,10 +11004,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -11016,7 +11016,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -11031,10 +11031,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -11043,7 +11043,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -11058,10 +11058,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -11070,7 +11070,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -11084,10 +11084,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -11096,7 +11096,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -11112,12 +11112,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -11125,21 +11125,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -11148,7 +11148,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -11162,7 +11162,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -11173,11 +11173,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11192,18 +11192,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -11213,25 +11213,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -11250,15 +11250,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -11267,7 +11267,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -11281,17 +11281,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11311,11 +11311,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11330,18 +11330,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -11351,25 +11351,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -11388,15 +11388,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -11405,7 +11405,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -11418,17 +11418,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11448,11 +11448,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11467,18 +11467,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -11488,25 +11488,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -11526,16 +11526,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -11544,7 +11544,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -11557,17 +11557,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11576,11 +11576,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11604,11 +11604,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11623,18 +11623,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -11644,25 +11644,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -11685,11 +11685,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11698,11 +11698,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11714,11 +11714,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11727,11 +11727,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11740,11 +11740,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11753,11 +11753,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11784,18 +11784,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -11825,18 +11825,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -11850,21 +11850,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -11873,7 +11873,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -11886,17 +11886,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11905,11 +11905,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11928,18 +11928,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -11962,11 +11962,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11975,11 +11975,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11988,7 +11988,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -12002,11 +12002,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12021,18 +12021,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -12053,7 +12053,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -12067,11 +12067,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12086,7 +12086,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -12099,7 +12099,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -12138,18 +12138,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -12163,7 +12163,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -12173,11 +12173,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12186,11 +12186,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12202,14 +12202,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12217,11 +12217,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -12234,7 +12234,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -12250,11 +12250,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12281,18 +12281,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -12306,7 +12306,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -12319,14 +12319,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12334,11 +12334,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -12351,7 +12351,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -12367,11 +12367,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12395,11 +12395,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12414,18 +12414,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -12435,25 +12435,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -12467,29 +12467,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -12498,7 +12498,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -12513,10 +12513,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -12525,7 +12525,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -12540,10 +12540,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -12552,7 +12552,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -12567,10 +12567,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -12579,7 +12579,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -12593,10 +12593,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -12605,7 +12605,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -12621,19 +12621,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -12643,35 +12643,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -12683,9 +12683,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -12697,9 +12697,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -12707,22 +12707,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -12731,7 +12731,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -12746,10 +12746,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -12758,7 +12758,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -12774,12 +12774,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12788,22 +12788,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -12812,7 +12812,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -12827,10 +12827,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -12839,7 +12839,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -12855,12 +12855,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12869,22 +12869,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -12893,7 +12893,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -12908,10 +12908,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -12920,7 +12920,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -12935,10 +12935,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -12947,7 +12947,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -12963,12 +12963,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12977,25 +12977,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -13004,22 +13004,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -13028,7 +13028,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -13044,19 +13044,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -13065,9 +13065,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -13075,22 +13075,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -13099,7 +13099,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -13114,10 +13114,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -13126,7 +13126,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -13140,10 +13140,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -13152,7 +13152,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -13169,15 +13169,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -13186,7 +13186,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -13201,7 +13201,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -13210,22 +13210,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -13234,7 +13234,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -13250,15 +13250,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -13267,7 +13267,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -13282,7 +13282,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -13291,22 +13291,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -13315,7 +13315,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -13331,15 +13331,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -13348,7 +13348,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -13364,7 +13364,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -13373,22 +13373,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -13397,7 +13397,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -13413,15 +13413,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -13430,7 +13430,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -13446,7 +13446,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -13455,28 +13455,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -13485,7 +13485,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -13501,7 +13501,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -13510,22 +13510,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -13534,7 +13534,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -13548,10 +13548,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -13560,7 +13560,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -13577,15 +13577,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -13594,7 +13594,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -13609,7 +13609,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13618,22 +13618,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -13642,7 +13642,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -13656,10 +13656,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -13668,7 +13668,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -13685,12 +13685,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13699,22 +13699,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -13723,7 +13723,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -13737,10 +13737,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -13749,7 +13749,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -13764,10 +13764,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -13776,7 +13776,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -13792,12 +13792,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13806,22 +13806,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -13830,7 +13830,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -13845,10 +13845,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -13857,7 +13857,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -13873,12 +13873,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13887,22 +13887,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -13911,7 +13911,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -13925,10 +13925,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -13937,7 +13937,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -13951,10 +13951,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -13963,7 +13963,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -13979,12 +13979,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13993,22 +13993,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -14017,7 +14017,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -14031,10 +14031,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -14043,7 +14043,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -14058,10 +14058,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -14070,7 +14070,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -14086,12 +14086,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14100,22 +14100,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -14124,7 +14124,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -14138,10 +14138,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -14150,7 +14150,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -14165,10 +14165,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -14177,7 +14177,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -14193,12 +14193,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14207,22 +14207,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -14231,7 +14231,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -14246,10 +14246,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -14258,7 +14258,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -14272,10 +14272,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -14284,7 +14284,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -14299,10 +14299,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -14311,7 +14311,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -14327,12 +14327,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14341,22 +14341,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -14365,7 +14365,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -14379,10 +14379,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -14391,7 +14391,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -14408,12 +14408,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14422,22 +14422,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -14446,7 +14446,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -14461,10 +14461,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -14473,7 +14473,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -14489,12 +14489,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14503,22 +14503,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -14527,7 +14527,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -14541,10 +14541,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -14553,7 +14553,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -14569,19 +14569,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -14590,9 +14590,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -14600,22 +14600,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -14624,7 +14624,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -14639,10 +14639,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -14651,7 +14651,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -14668,15 +14668,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -14685,7 +14685,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -14700,7 +14700,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -14709,22 +14709,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -14733,7 +14733,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -14749,15 +14749,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -14766,7 +14766,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -14780,10 +14780,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -14792,7 +14792,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -14806,10 +14806,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -14818,7 +14818,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -14832,10 +14832,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -14844,7 +14844,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -14858,10 +14858,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -14870,7 +14870,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -14885,7 +14885,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -14894,22 +14894,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -14918,7 +14918,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -14935,15 +14935,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -14952,7 +14952,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -14967,7 +14967,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -14976,22 +14976,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -15000,7 +15000,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -15014,10 +15014,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -15026,7 +15026,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -15043,15 +15043,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -15060,7 +15060,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -15074,10 +15074,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -15086,7 +15086,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -15101,7 +15101,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -15110,22 +15110,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -15134,7 +15134,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -15148,10 +15148,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -15160,7 +15160,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -15175,10 +15175,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -15187,7 +15187,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -15202,10 +15202,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -15214,7 +15214,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -15229,10 +15229,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -15241,7 +15241,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -15255,10 +15255,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -15267,7 +15267,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -15283,12 +15283,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15297,22 +15297,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -15321,7 +15321,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -15338,12 +15338,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15352,22 +15352,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -15376,7 +15376,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -15391,10 +15391,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -15403,7 +15403,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -15418,10 +15418,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -15430,7 +15430,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -15446,19 +15446,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -15467,9 +15467,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -15477,28 +15477,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -15507,7 +15507,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -15522,7 +15522,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15531,44 +15531,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15578,7 +15578,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15587,22 +15587,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -15611,7 +15611,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -15626,10 +15626,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -15638,7 +15638,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -15654,12 +15654,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -15668,22 +15668,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -15692,7 +15692,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -15707,10 +15707,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -15719,7 +15719,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -15735,19 +15735,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -15756,9 +15756,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -15766,44 +15766,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -15813,7 +15813,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15822,44 +15822,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15869,7 +15869,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15878,22 +15878,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -15902,7 +15902,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -15917,10 +15917,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -15929,7 +15929,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -15945,12 +15945,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -15959,22 +15959,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -15983,7 +15983,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -15998,10 +15998,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -16010,7 +16010,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -16026,19 +16026,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -16047,9 +16047,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -16057,22 +16057,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -16081,7 +16081,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -16097,15 +16097,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -16114,7 +16114,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -16129,14 +16129,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -16145,19 +16145,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -16166,7 +16166,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -16181,7 +16181,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -16189,7 +16189,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -16209,7 +16209,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -16234,7 +16234,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -16248,7 +16248,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -16259,18 +16259,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16282,7 +16282,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -16311,7 +16311,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -16322,7 +16322,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -16332,18 +16332,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16358,18 +16358,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16380,11 +16380,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16404,7 +16404,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -16421,11 +16421,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16442,11 +16442,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16468,7 +16468,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -16495,21 +16495,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -16523,29 +16523,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -16554,7 +16554,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -16568,10 +16568,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -16580,7 +16580,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -16596,15 +16596,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -16613,7 +16613,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -16628,7 +16628,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -16636,7 +16636,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -16646,11 +16646,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16659,11 +16659,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16692,11 +16692,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16711,18 +16711,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -16732,25 +16732,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -16760,25 +16760,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -16792,7 +16792,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -16802,11 +16802,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16815,11 +16815,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16843,11 +16843,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16862,18 +16862,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -16883,25 +16883,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -16915,29 +16915,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -16946,7 +16946,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -16961,10 +16961,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -16973,7 +16973,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -16988,10 +16988,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -17000,7 +17000,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -17016,19 +17016,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -17037,38 +17037,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -17082,7 +17082,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -17092,18 +17092,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17118,18 +17118,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17140,11 +17140,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17164,7 +17164,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -17181,11 +17181,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17201,7 +17201,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -17228,21 +17228,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -17256,29 +17256,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -17287,7 +17287,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -17301,10 +17301,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -17313,7 +17313,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -17329,15 +17329,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -17346,7 +17346,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -17361,7 +17361,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -17369,25 +17369,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17401,11 +17401,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17420,7 +17420,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -17433,7 +17433,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -17453,7 +17453,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -17467,18 +17467,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17490,7 +17490,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -17514,7 +17514,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -17541,21 +17541,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -17569,29 +17569,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -17600,7 +17600,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -17616,15 +17616,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -17633,7 +17633,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -17648,7 +17648,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -17656,25 +17656,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17688,11 +17688,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17705,7 +17705,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -17713,7 +17713,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -17733,7 +17733,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -17766,18 +17766,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -17797,29 +17797,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -17828,7 +17828,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -17844,15 +17844,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -17861,7 +17861,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -17876,7 +17876,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -17884,25 +17884,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17916,11 +17916,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17933,7 +17933,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -17941,7 +17941,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -17967,7 +17967,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -17975,7 +17975,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -18002,11 +18002,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18021,18 +18021,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -18042,25 +18042,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -18081,7 +18081,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18112,18 +18112,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -18143,29 +18143,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -18174,7 +18174,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -18189,10 +18189,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -18201,7 +18201,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -18217,15 +18217,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -18234,7 +18234,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -18249,7 +18249,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18257,25 +18257,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18290,18 +18290,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18319,7 +18319,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -18327,7 +18327,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -18353,7 +18353,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -18361,7 +18361,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -18388,11 +18388,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18407,18 +18407,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -18428,25 +18428,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -18467,7 +18467,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18487,7 +18487,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18512,29 +18512,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -18543,7 +18543,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -18558,10 +18558,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -18570,7 +18570,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -18586,15 +18586,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -18603,7 +18603,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -18618,7 +18618,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18626,21 +18626,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -18649,7 +18649,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -18662,17 +18662,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -18692,11 +18692,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18711,18 +18711,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -18732,25 +18732,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -18769,15 +18769,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -18786,7 +18786,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -18799,17 +18799,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18829,11 +18829,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18848,18 +18848,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -18869,25 +18869,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -18911,18 +18911,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18936,11 +18936,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18949,11 +18949,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18972,18 +18972,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -19004,29 +19004,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19044,7 +19044,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -19057,11 +19057,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19070,11 +19070,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19093,18 +19093,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -19120,11 +19120,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19143,18 +19143,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -19172,11 +19172,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19197,18 +19197,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -19228,25 +19228,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19263,7 +19263,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -19276,11 +19276,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19295,7 +19295,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -19308,7 +19308,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -19324,11 +19324,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19347,18 +19347,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -19379,11 +19379,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19392,11 +19392,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19415,18 +19415,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -19448,18 +19448,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -19472,18 +19472,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19495,7 +19495,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -19527,7 +19527,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -19537,22 +19537,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -19561,7 +19561,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -19576,10 +19576,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -19588,7 +19588,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -19603,10 +19603,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -19615,7 +19615,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -19630,10 +19630,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -19642,7 +19642,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -19656,10 +19656,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -19668,7 +19668,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -19684,15 +19684,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -19701,7 +19701,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -19716,7 +19716,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -19724,14 +19724,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -19740,10 +19740,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -19752,7 +19752,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -19768,17 +19768,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -19798,11 +19798,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19817,18 +19817,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -19838,25 +19838,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -19876,16 +19876,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -19894,7 +19894,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -19907,17 +19907,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -19926,11 +19926,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19954,11 +19954,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19973,18 +19973,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -19994,25 +19994,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -20031,15 +20031,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -20048,7 +20048,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -20061,17 +20061,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20091,11 +20091,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20110,18 +20110,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -20131,25 +20131,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -20168,15 +20168,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -20185,7 +20185,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -20198,7 +20198,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -20207,11 +20207,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20220,11 +20220,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20243,18 +20243,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -20270,11 +20270,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20293,18 +20293,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -20324,18 +20324,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20350,18 +20350,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20372,11 +20372,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20395,25 +20395,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20430,7 +20430,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -20440,11 +20440,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20453,11 +20453,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20476,18 +20476,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -20505,11 +20505,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20524,18 +20524,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -20548,18 +20548,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20571,7 +20571,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -20603,29 +20603,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -20634,7 +20634,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -20649,10 +20649,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -20661,7 +20661,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -20676,10 +20676,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -20688,7 +20688,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -20703,10 +20703,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -20715,7 +20715,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -20731,15 +20731,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -20748,7 +20748,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -20763,7 +20763,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -20771,25 +20771,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20803,11 +20803,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -20816,11 +20816,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20844,11 +20844,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20863,18 +20863,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -20884,25 +20884,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -20922,29 +20922,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -20953,7 +20953,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -20968,10 +20968,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -20980,7 +20980,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -20994,10 +20994,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -21006,7 +21006,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -21023,15 +21023,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -21040,7 +21040,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -21055,7 +21055,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21063,7 +21063,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -21073,11 +21073,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21086,11 +21086,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21114,11 +21114,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21133,18 +21133,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -21154,25 +21154,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -21186,29 +21186,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -21217,7 +21217,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -21232,10 +21232,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -21244,7 +21244,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -21258,10 +21258,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -21270,7 +21270,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -21287,12 +21287,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21300,7 +21300,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -21310,11 +21310,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21323,11 +21323,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21336,11 +21336,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21368,11 +21368,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21387,18 +21387,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -21408,25 +21408,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -21440,29 +21440,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -21471,7 +21471,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -21486,10 +21486,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -21498,7 +21498,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -21512,10 +21512,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -21524,7 +21524,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -21539,10 +21539,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -21551,7 +21551,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -21567,12 +21567,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21580,7 +21580,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -21590,11 +21590,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21603,11 +21603,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21616,11 +21616,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21648,11 +21648,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21667,18 +21667,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -21688,25 +21688,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -21720,29 +21720,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -21751,7 +21751,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -21766,10 +21766,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -21778,7 +21778,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -21792,10 +21792,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -21804,7 +21804,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -21819,10 +21819,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -21831,7 +21831,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -21847,12 +21847,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21860,7 +21860,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -21870,11 +21870,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21883,11 +21883,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -21896,11 +21896,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -21928,11 +21928,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21947,18 +21947,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -21968,25 +21968,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -22000,29 +22000,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -22031,7 +22031,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -22046,10 +22046,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -22058,7 +22058,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -22072,10 +22072,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -22084,7 +22084,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -22098,10 +22098,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -22110,7 +22110,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -22126,12 +22126,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -22139,21 +22139,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -22162,7 +22162,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -22176,7 +22176,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -22187,11 +22187,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22206,18 +22206,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -22227,25 +22227,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -22264,15 +22264,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -22281,7 +22281,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -22295,17 +22295,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22325,11 +22325,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22344,18 +22344,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -22365,25 +22365,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -22402,15 +22402,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -22419,7 +22419,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -22432,17 +22432,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22462,11 +22462,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22481,18 +22481,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -22502,25 +22502,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -22540,16 +22540,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -22558,7 +22558,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -22571,17 +22571,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22590,11 +22590,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22618,11 +22618,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22637,18 +22637,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -22658,25 +22658,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -22699,11 +22699,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22712,11 +22712,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22728,11 +22728,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22741,11 +22741,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22754,11 +22754,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22767,11 +22767,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22798,18 +22798,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -22839,18 +22839,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -22864,7 +22864,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -22874,11 +22874,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22887,11 +22887,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22900,7 +22900,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -22914,11 +22914,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22933,18 +22933,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -22965,7 +22965,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -22979,11 +22979,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22998,7 +22998,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -23011,7 +23011,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -23050,18 +23050,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -23075,7 +23075,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -23085,11 +23085,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23098,11 +23098,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23114,14 +23114,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23129,11 +23129,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -23146,7 +23146,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -23162,11 +23162,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23193,18 +23193,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -23218,7 +23218,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -23231,14 +23231,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23246,11 +23246,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -23263,7 +23263,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -23279,11 +23279,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23307,11 +23307,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23326,18 +23326,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -23347,25 +23347,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -23379,7 +23379,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -23389,11 +23389,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23418,11 +23418,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23437,18 +23437,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -23458,25 +23458,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -23486,25 +23486,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -23518,29 +23518,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -23549,7 +23549,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -23564,10 +23564,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -23576,7 +23576,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -23591,10 +23591,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -23603,7 +23603,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -23618,10 +23618,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -23630,7 +23630,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -23644,10 +23644,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -23656,7 +23656,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -23672,12 +23672,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -23685,21 +23685,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -23708,7 +23708,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -23722,7 +23722,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -23733,11 +23733,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23752,18 +23752,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -23773,25 +23773,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -23810,15 +23810,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -23827,7 +23827,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -23841,17 +23841,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23871,11 +23871,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23890,18 +23890,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -23911,25 +23911,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -23948,15 +23948,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -23965,7 +23965,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -23978,17 +23978,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24008,11 +24008,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24027,18 +24027,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -24048,25 +24048,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -24086,16 +24086,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -24104,7 +24104,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -24117,17 +24117,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24136,11 +24136,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24164,11 +24164,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24183,18 +24183,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -24204,25 +24204,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -24245,11 +24245,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24258,11 +24258,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24274,11 +24274,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24287,11 +24287,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24300,11 +24300,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24313,11 +24313,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24344,18 +24344,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -24385,18 +24385,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -24410,21 +24410,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -24433,7 +24433,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -24446,17 +24446,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24465,11 +24465,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24488,18 +24488,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -24522,11 +24522,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24535,11 +24535,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24548,7 +24548,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -24562,11 +24562,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24581,18 +24581,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -24613,7 +24613,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -24627,11 +24627,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24646,7 +24646,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -24659,7 +24659,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -24698,18 +24698,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -24723,7 +24723,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -24733,11 +24733,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24746,11 +24746,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24762,14 +24762,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -24777,11 +24777,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -24794,7 +24794,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -24810,11 +24810,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24841,18 +24841,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -24866,7 +24866,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -24879,14 +24879,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -24894,11 +24894,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -24911,7 +24911,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -24927,11 +24927,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24955,11 +24955,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24974,18 +24974,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -24995,25 +24995,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -25027,29 +25027,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -25058,7 +25058,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -25073,10 +25073,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -25085,7 +25085,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -25100,10 +25100,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -25112,7 +25112,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -25127,10 +25127,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -25139,7 +25139,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -25153,10 +25153,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -25165,7 +25165,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -25181,19 +25181,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -25205,7 +25205,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.540Z", + "updatedAt": "2020-04-08T12:21:13.787Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/DedgeCompoundManager.json b/packages/smart-contracts/artifacts/DedgeCompoundManager.json index 59ef529..204a8bf 100644 --- a/packages/smart-contracts/artifacts/DedgeCompoundManager.json +++ b/packages/smart-contracts/artifacts/DedgeCompoundManager.json @@ -106,6 +106,32 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "cToken", + "type": "address" + }, + { + "internalType": "address", + "name": "owner", + "type": "address" + } + ], + "name": "getBorrowBalanceUnderlying", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, { "constant": false, "inputs": [ @@ -463,6 +489,11 @@ "name": "oldTokenUnderlyingDelta", "type": "uint256" }, + { + "internalType": "address", + "name": "newCTokenAddress", + "type": "address" + }, { "internalType": "bytes", "name": "executeOperationCalldataParams", @@ -471,8 +502,8 @@ ], "name": "swapOperation", "outputs": [], - "payable": false, - "stateMutability": "nonpayable", + "payable": true, + "stateMutability": "payable", "type": "function" }, { @@ -480,34 +511,14 @@ "inputs": [ { "internalType": "address", - "name": "addressRegistryAddress", + "name": "dedgeCompoundManagerAddress", "type": "address" }, { - "internalType": "address", - "name": "oldCTokenAddress", + "internalType": "address payable", + "name": "dacProxyAddress", "type": "address" }, - { - "internalType": "uint256", - "name": "oldTokenUnderlyingDustAmount", - "type": "uint256" - }, - { - "internalType": "address", - "name": "newCTokenAddress", - "type": "address" - } - ], - "name": "clearDebtDust", - "outputs": [], - "payable": true, - "stateMutability": "payable", - "type": "function" - }, - { - "constant": false, - "inputs": [ { "internalType": "address", "name": "addressRegistryAddress", @@ -520,41 +531,46 @@ }, { "internalType": "uint256", - "name": "oldTokenUnderlyingAmount", + "name": "oldTokenUnderlyingDelta", "type": "uint256" }, { "internalType": "address", "name": "newCTokenAddress", "type": "address" + }, + { + "internalType": "bytes", + "name": "executeOperationCalldataParams", + "type": "bytes" } ], - "name": "clearCollateralDust", + "name": "swapOperationAndClearCollateralDust", "outputs": [], - "payable": true, - "stateMutability": "payable", + "payable": false, + "stateMutability": "nonpayable", "type": "function" } ], - "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"approveCToken\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"cTokens\",\"type\":\"address[]\"}],\"name\":\"approveCTokens\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"borrow\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"borrowThroughProxy\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"addressRegistryAddress\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"oldCTokenAddress\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"oldTokenUnderlyingAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"newCTokenAddress\",\"type\":\"address\"}],\"name\":\"clearCollateralDust\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"addressRegistryAddress\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"oldCTokenAddress\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"oldTokenUnderlyingDustAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"newCTokenAddress\",\"type\":\"address\"}],\"name\":\"clearDebtDust\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"cTokens\",\"type\":\"address[]\"}],\"name\":\"enterMarkets\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"cTokens\",\"type\":\"address[]\"}],\"name\":\"enterMarketsAndApproveCTokens\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"redeemTokens\",\"type\":\"uint256\"}],\"name\":\"redeem\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"redeemThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"redeemTokens\",\"type\":\"uint256\"}],\"name\":\"redeemUnderlying\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"redeemUnderlyingThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowBehalf\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowBehalfThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"supply\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"supplyCToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"supplyAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"borrowCToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"supplyAndBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"supplyETH\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"supplyETHAndBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"supplyThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_loanAmount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_aaveFee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_protocolFee\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"swapCollateralPostLoan\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_loanAmount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_aaveFee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_protocolFee\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"swapDebtPostLoan\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"dedgeCompoundManagerAddress\",\"type\":\"address\"},{\"internalType\":\"address payable\",\"name\":\"dacProxyAddress\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"addressRegistryAddress\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"oldCTokenAddress\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"oldTokenUnderlyingDelta\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"executeOperationCalldataParams\",\"type\":\"bytes\"}],\"name\":\"swapOperation\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeCompoundManager.sol\":\"DedgeCompoundManager\"},\"evmVersion\":\"constantinople\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol\":{\"keccak256\":\"0xe3762e63e74657a066e6fe281ec694e366ca86f6378470304c646b4e785e09f3\",\"urls\":[\"bzz-raw://67607850cbce7ffa66356dd28412e64ff58f62fa7c709f5fa28306b8be9050a7\",\"dweb:/ipfs/QmUaFhH5a6rQ8yJG2A6zJJ1ds9txqxr8ytxd2s7bhiNX35\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/ISafeERC20.sol\":{\"keccak256\":\"0xec78efb83d1275fbeb9d431938447eaabbff72deea196deea04b4873ee5a9f54\",\"urls\":[\"bzz-raw://7b50edf0121dc6286c5b93fd7ddc85edfbb719c91faf3ffd22957436c5b4763c\",\"dweb:/ipfs/QmSRUJaEp3QP71SG1V668qzXAzEj7YezhJ6AKdNqunH6dj\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/IFlashLoanReceiver.sol\":{\"keccak256\":\"0xbd9ee17614d720229da04b4d481b2e6669b5fd9217bc278a93b39a62e2383fde\",\"urls\":[\"bzz-raw://4827232c7582d13c0237ae80b47e2f3dd85499372d80a15c0f31599bb99e26a5\",\"dweb:/ipfs/QmX3mCBdQcCvL9WF5FwToZZpj6VBtkaoN9aZ1tszp7oVjt\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol\":{\"keccak256\":\"0xe1a1b1bbf6dc92e86a23b8af9cf04e3e527b766ed1147cce041080d01ede5a24\",\"urls\":[\"bzz-raw://c0a7bf8948392f8f7249a99d39ac0722840faea5767c2f97939657e281d318f5\",\"dweb:/ipfs/QmRmSmKfgegjtAnpQ6t3ucEiq9GUrfYPpi7XucjREHjYFd\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol\":{\"keccak256\":\"0x0b99a26eeba60b8201f6ffd0d9d00bc5562ace9e7998534fd3887d7ba72b7d88\",\"urls\":[\"bzz-raw://9a36c107f3471548d6a13d28e995cb71ef42bafd55bf759b7c1b0ba0fda7170c\",\"dweb:/ipfs/Qme6SJJ3A9MwVwzk6CJC9gN8jAWLkgWQUwzZU4k6eD4BNy\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolParametersProvider.sol\":{\"keccak256\":\"0x90ace0fd5238a92b39b3fad095c046c2707c3027116c7d5f7e80863ca74eb00d\",\"urls\":[\"bzz-raw://068f20bedbbe8f4faff599106162f7c7ede426a689f22c16dc9643bd17268755\",\"dweb:/ipfs/QmVSCkLZ8JD17DvsWtYMBcuZdF3JZpZM9khMbvYFarYGTs\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol\":{\"keccak256\":\"0xa65d6eb1f4bae0350a65a2148fc83c6cab8952d11b19c39e4ab5c27d1d48773e\",\"urls\":[\"bzz-raw://84d98fe4bf18381ad57769601c6b53135c0e5ff5f191a62cd129cb5a815efc79\",\"dweb:/ipfs/QmaoXTSmkuT5u2HkEkggYzEE4mBA1MZp5yDrDKWU6Y8jgm\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol\":{\"keccak256\":\"0xd07da3ef9345ec40b090ea93df6d5a9ff7a03996a3c55f51aabee4d50ccdc201\",\"urls\":[\"bzz-raw://21c88532f770e244133c240d448092d8ea0e5a47dcf951522aa66106e15758e3\",\"dweb:/ipfs/QmXFkrbfpgcCFvoziSR3FnptBPf79og2tSR8deQGmViAkg\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICompoundPriceOracle.sol\":{\"keccak256\":\"0xb19ae717f5b05fbc0ffdf3a4b96cd71811071ab2d3c5f73ee8835541c5bd573b\",\"urls\":[\"bzz-raw://52efc7166851b50b539166f234babc41cf25a4cc2c5997c9bc3f801117b4ea47\",\"dweb:/ipfs/QmXv2P3p6adgTCHUMXdufESTbJEdbQ3DkLKRnsENRC1Dmx\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol\":{\"keccak256\":\"0xc69ade89655263aaffac1183c0e842ea95294171280f2c5ab755286a66de3ff9\",\"urls\":[\"bzz-raw://742ca904eaf238a83270e315410b35e83048ee0c6529190be2ae9f9bc20e6187\",\"dweb:/ipfs/QmPW3WFbHZjsGQ6vMgPRPWHCNJLNxyEbR4w1DAvd466N51\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol\":{\"keccak256\":\"0xde1a310030b2b654b9c1e7782e94d7f00be0172c32dc4e99a7c168dd53d72843\",\"urls\":[\"bzz-raw://6a8b12cff637c3a1b025bd90a3c75524e53207c457b770bf22800df883fff45d\",\"dweb:/ipfs/QmSJXJDH5jiCkU11Xn7KeVTMoS64xg2XQ5hWGqQhMEnrmX\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol\":{\"keccak256\":\"0x0d2a2e2c0811bd1e9e757a1a804366cef39120f7eec3bffbcd8802afbf5d6f4b\",\"urls\":[\"bzz-raw://f5d9e36f7f3c6a0771d3656a1b1088f27d82f1f242579fe71e10b2d49aaac5b9\",\"dweb:/ipfs/QmZTjArdX13p6EGRD7fZuros5Wjs52usvNbxSavbLoRgZn\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/BytesLib.sol\":{\"keccak256\":\"0x2127d94e9d0443c4f0a5a8ebd8fd8746c7ea4e4d3849e3a45c41943019571ea7\",\"urls\":[\"bzz-raw://dbe24f863129a5062658ec1e6bc2695d7427dd8783aec86903125867f6343a4f\",\"dweb:/ipfs/QmfX7eArFhPnTa1bwjpfse3ni6EapoHfzuhdXxMxKU8kNb\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/aave/FlashLoanReceiverBase.sol\":{\"keccak256\":\"0x0a3802a7d1bf99d7ccb8046f2632f0a3fa42ebea5e1033cc13eb843b32cbf4c3\",\"urls\":[\"bzz-raw://68a6bcf9ccfe8d72448c3d3dadd328b14a741ba9d24e5aa20ad82b72c7108a7b\",\"dweb:/ipfs/QmeprLqp3jFqbxmNwuZ8Vm2EdeKp5idQZi4VSCLQZa28qY\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/compound/CompoundBase.sol\":{\"keccak256\":\"0xfe69c2a9adaca0cdcfb06df5a2a2d99b5fd2d507e85379d7e412e218c523583a\",\"urls\":[\"bzz-raw://525284cba89cdd1c6b146ec5774e284b6b0af8639cfad96c059e700a9e727ca2\",\"dweb:/ipfs/QmSBBvdmCWkfFscFKWK6oMYL7F4HQ2aZPxJhEX5p3W4ivp\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol\":{\"keccak256\":\"0x7636abae52593354ed288e67b6c2e5e1df218f753f6c253ae691cb5252274cf1\",\"urls\":[\"bzz-raw://d66e47ce74476c103bb8a1b11d618232276d4b57badfd7d96a45e9c881e83543\",\"dweb:/ipfs/QmXMWVNLRdiBHmnTx1c2DFvidnXpFuiy4CMh2T2avWEQ2h\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol\":{\"keccak256\":\"0xf38f1b725d7568da1b3a210190566e00daa3f241accba9fd6a906ae48e62b151\",\"urls\":[\"bzz-raw://83abf26fe875dd5599abfa2c9b387cb3ce7e70b4fe3ae0b3e2127f807b708ea1\",\"dweb:/ipfs/QmRntwBkLrh8SosWWsM1aC2cP7wMswCPuBKLmJzgQB1xeY\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol\":{\"keccak256\":\"0xc1440658c9e69c115e90b60f1a3b424155d9f0fa495a689bce0a202d8daf1df7\",\"urls\":[\"bzz-raw://dc3c2c615db44839d9353908fa2935cab29e0739ef559f00397724b904e5187f\",\"dweb:/ipfs/Qma5uk2NoqVnZgZF3fCXPRfkZMbxfEKuYo6NABq79We1t1\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol\":{\"keccak256\":\"0x36bff82bc9233b5ee86b50df83efb4915c50d3c5716e9bc463b290ab87a4b6bb\",\"urls\":[\"bzz-raw://486f7dfeaa00779677f8e139c54fb3f7f8043f66fe344ec35bd5d3873205f77e\",\"dweb:/ipfs/QmUVwqSEod9L97Cqz1fPv9jXPescnR4vNXAm4zdf2gZmgv\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapLiteBase.sol\":{\"keccak256\":\"0x1058669a50e9c5b2dce70aae66723a01e68e167deb9c3b89ea371cc0038d5dc4\",\"urls\":[\"bzz-raw://3bfffd813909b4322374f3a1b179b10469669ad71fdb6c37f081784453febe05\",\"dweb:/ipfs/QmUFhAH2JxQGdYHRmjVMALuC9e17bZEGKMK7XwGWQwsqn7\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeCompoundManager.sol\":{\"keccak256\":\"0x40cf0894186b39884631af6e60f13fa4855d63742cc13fd29caaf4c9a5b55264\",\"urls\":[\"bzz-raw://f4549c40d3dcaa3bca353db65d8911b16fa9b27507f1d24b89a0ea61abbce621\",\"dweb:/ipfs/QmWQCPGiTkyZxUv8YYzW3NU5i4kv5wnXZH1xNLmPWgjZwt\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol\":{\"keccak256\":\"0xfcd524540f6e01a5ef58192d42d87d296fad5a0d13dd883c1b5b604435befd97\",\"urls\":[\"bzz-raw://398eb7da5785008a974d476886bf95ed1793b4e5f19b56735dba4f998217ad75\",\"dweb:/ipfs/QmQtViYpthTUNzdgv4AEhSW6wMFneE5AdLerMf4q5eWWzN\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol\":{\"keccak256\":\"0x0f9a1a23e6eabb0a3cd78e2e2a0b23b15f8d175ab02d71aac63eb6e38fb82657\",\"urls\":[\"bzz-raw://6cdf61439a849257726d6fe87cc5455c008763485170f2609ed477a3f3dc0d68\",\"dweb:/ipfs/QmbLvvK3AmCaSKPXSnHNsd5iWMFzCr9HEd4cPmbPLZxZKs\"]},\"@openzeppelin/contracts/math/SafeMath.sol\":{\"keccak256\":\"0x640b6dee7a4b830bdfd52b5031a07fc2b12209f5b2e29e5d364a7d37f69d8076\",\"urls\":[\"bzz-raw://31113152e1ddb78fe7a4197f247591ca894e93f916867beb708d8e747b6cc74f\",\"dweb:/ipfs/QmbZaJyXdpsYGykVhHH9qpVGQg9DGCxE2QufbCUy3daTgq\"]},\"@openzeppelin/contracts/utils/Address.sol\":{\"keccak256\":\"0x1a8e5072509c5ea7365eb1d48030b9be865140c8fb779968da0a459a0e174a11\",\"urls\":[\"bzz-raw://03335b7b07c7c8c8d613cfdd8ec39a0b5ec133ee510bf2fe6cc5a496767bef4b\",\"dweb:/ipfs/Qmebp4nzPja645c9yXSdJkGq96oU3am3LUnG2K3R7XxyKf\"]}},\"version\":1}", - "bytecode": "0x608060405234801561001057600080fd5b50613409806100206000396000f3fe60806040526004361061014b5760003560e01c80637720cc87116100b6578063c04bea9b1161006f578063c04bea9b146102f8578063c29982381461030b578063d13b8c721461032b578063d2f70c401461033e578063d882dc6c1461035e578063f2b9fdb8146103715761014b565b80637720cc871461026c578063962941781461027f5780639a22a1b914610292578063abdb5ea8146102b2578063b14886ee146102c5578063ba59154f146102e55761014b565b806341ec5cc41161010857806341ec5cc4146101f85780634907b8fc1461020b5780634b8a35291461021357806359086a5e1461023357806367600cc21461024657806375d40945146102595761014b565b80630b4e0630146101505780631e9a69501461016557806324d1ea12146101785780632d8af543146101985780632f379b13146101b85780633dc4d99a146101d8575b600080fd5b61016361015e366004612a95565b610384565b005b610163610173366004612a95565b6104da565b34801561018457600080fd5b50610163610193366004612c06565b610582565b3480156101a457600080fd5b506101636101b3366004612b24565b6108b7565b3480156101c457600080fd5b506101636101d3366004612942565b6108cc565b3480156101e457600080fd5b506101636101f3366004612b24565b610c00565b610163610206366004612a95565b610c73565b610163610c85565b34801561021f57600080fd5b5061016361022e366004612a95565b610cef565b6101636102413660046129e7565b610d8a565b610163610254366004612a95565b610ec0565b610163610267366004612acf565b610ed5565b61016361027a3660046129e7565b610ee9565b61016361028d366004612a95565b610f24565b34801561029e57600080fd5b506101636102ad366004612a95565b610fbf565b6101636102c0366004612a95565b610fc9565b3480156102d157600080fd5b506101636102e0366004612c06565b6110ec565b6101636102f3366004612a95565b61138a565b610163610306366004612a34565b6113c4565b34801561031757600080fd5b50610163610326366004612b24565b611712565b610163610339366004612a34565b6117eb565b34801561034a57600080fd5b50610163610359366004612a95565b611ba1565b61016361036c366004612a95565b611cb8565b61016361037f366004612a95565b611cc2565b6040516370a0823160e01b81526000906001600160a01b038416906370a08231906103b39030906004016130fc565b60206040518083038186803b1580156103cb57600080fd5b505afa1580156103df573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104039190810190612bac565b90506001600160a01b038316734ddc2d193948926d02f9b1fe9e1daa0718270ed5146104355761043533308585611ddb565b61043f8383611cc2565b6040516370a0823160e01b81526000906001600160a01b038516906370a082319061046e9030906004016130fc565b60206040518083038186803b15801561048657600080fd5b505afa15801561049a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104be9190810190612bac565b90506104d484336104cf8486611eef565b611f1c565b50505050565b60405163db006a7560e01b81526001600160a01b0383169063db006a75906105069084906004016132a4565b602060405180830381600087803b15801561052057600080fd5b505af1158015610534573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506105589190810190612bac565b1561057e5760405162461bcd60e51b8152600401610575906131e4565b60405180910390fd5b5050565b61058a61272f565b61059682840184612be8565b805160208201516040830151929350909160006105c9886105bd8c8c63ffffffff6120ae16565b9063ffffffff6120ae16565b9050836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561060457600080fd5b505afa158015610618573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061063c9190810190612924565b6001600160a01b0316836001600160a01b031614156106645761065f838b610fc9565b610776565b6000836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561069f57600080fd5b505afa1580156106b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506106d79190810190612924565b905060006106e5828d6120da565b60405163095ea7b360e01b81529091506001600160a01b0383169063095ea7b390610716908890859060040161316c565b602060405180830381600087803b15801561073057600080fd5b505af1158015610744573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107689190810190612b8e565b506107738582610fc9565b50505b836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b1580156107af57600080fd5b505afa1580156107c3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107e79190810190612924565b6001600160a01b0316826001600160a01b0316141561080f5761080a8282610cef565b6108ab565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561084a57600080fd5b505afa15801561085e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506108829190810190612924565b9050600061089082846120e8565b905061089c8482610cef565b6108a782828561216e565b5050505b50505050505050505050565b6108c081611712565b6108c981610c00565b50565b60008590506000816001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561090c57600080fd5b505afa158015610920573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109449190810190612924565b6001600160a01b0316866001600160a01b031614156109645750836109e1565b6109de866001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156109a057600080fd5b505afa1580156109b4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109d89190810190612924565b8661228c565b90505b6060896040516020016109f491906130fc565b60408051601f1981840301815290829052610a1591879087906020016130d8565b60405160208183030381529060405290506000836001600160a01b0316633f6dc33b6040518163ffffffff1660e01b815260040160206040518083038186803b158015610a6157600080fd5b505afa158015610a75573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610a999190810190612924565b6001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b158015610ad157600080fd5b505afa158015610ae5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b099190810190612924565b9050610b158a826122c2565b806001600160a01b0316635cffe9de8b866001600160a01b03166356cc94a26040518163ffffffff1660e01b815260040160206040518083038186803b158015610b5e57600080fd5b505afa158015610b72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b969190810190612924565b86866040518563ffffffff1660e01b8152600401610bb7949392919061310a565b600060405180830381600087803b158015610bd157600080fd5b505af1158015610be5573d6000803e3d6000fd5b50505050610bf38a82612490565b5050505050505050505050565b60005b815181101561057e57734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316828281518110610c3657fe5b60200260200101516001600160a01b031614610c6b57610c6b828281518110610c5b57fe5b6020026020010151600019611ba1565b600101610c03565b610c7b610c85565b61057e8282610cef565b734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b346040518263ffffffff1660e01b81526004016000604051808303818588803b158015610cd457600080fd5b505af1158015610ce8573d6000803e3d6000fd5b5050505050565b60405163317afabb60e21b81526001600160a01b0383169063c5ebeaec90610d1b9084906004016132a4565b602060405180830381600087803b158015610d3557600080fd5b505af1158015610d49573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610d6d9190810190612bac565b1561057e5760405162461bcd60e51b8152600401610575906131d4565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed51415610e145760405163e597461960e01b81526001600160a01b0383169063e5974619908390610ddd9087906004016130fc565b6000604051808303818588803b158015610df657600080fd5b505af1158015610e0a573d6000803e3d6000fd5b5050505050610ebb565b610e1e8282611ba1565b6040516304c11f0360e31b81526001600160a01b03831690632608f81890610e4c908690859060040161316c565b602060405180830381600087803b158015610e6657600080fd5b505af1158015610e7a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610e9e9190810190612bac565b15610ebb5760405162461bcd60e51b815260040161057590613224565b505050565b610eca8282610f24565b61057e823383611f1c565b610edf8484611cc2565b6104d48282610cef565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514610f1957610f1933308484611ddb565b610ebb838383610d8a565b60405163852a12e360e01b81526001600160a01b0383169063852a12e390610f509084906004016132a4565b602060405180830381600087803b158015610f6a57600080fd5b505af1158015610f7e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610fa29190810190612bac565b1561057e5760405162461bcd60e51b8152600401610575906131f4565b610eca8282610cef565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed5141561104757816001600160a01b0316634e4d9fea826040518263ffffffff1660e01b81526004016000604051808303818588803b15801561102957600080fd5b505af115801561103d573d6000803e3d6000fd5b505050505061057e565b6110518282611ba1565b60405163073a938160e11b81526001600160a01b03831690630e7527029061107d9084906004016132a4565b602060405180830381600087803b15801561109757600080fd5b505af11580156110ab573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506110cf9190810190612bac565b1561057e5760405162461bcd60e51b815260040161057590613244565b6110f461272f565b61110082840184612be8565b80516020820151604083015192935090916000611133886111278c8c63ffffffff61256016565b9063ffffffff61256016565b9050836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561116e57600080fd5b505afa158015611182573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506111a69190810190612924565b6001600160a01b0316826001600160a01b031614156111ce576111c98282611cc2565b61125e565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561120957600080fd5b505afa15801561121d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506112419190810190612924565b9050600061124f82846120da565b905061125b8482611cc2565b50505b836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561129757600080fd5b505afa1580156112ab573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506112cf9190810190612924565b6001600160a01b0316836001600160a01b031614156112f25761080a838b610f24565b6000836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561132d57600080fd5b505afa158015611341573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506113659190810190612924565b90506000611373828d6120e8565b905061137f8582610f24565b6108a782828e61216e565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed5146113ba576113ba33308484611ddb565b61057e8282610fc9565b806001600160a01b0316836001600160a01b031614156113f65760405162461bcd60e51b815260040161057590613274565b6000846114038585610f24565b806001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561143c57600080fd5b505afa158015611450573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506114749190810190612924565b6001600160a01b0316856001600160a01b0316141561150e57611507836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156114c957600080fd5b505afa1580156114dd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506115019190810190612924565b856120da565b9150611700565b806001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561154757600080fd5b505afa15801561155b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061157f9190810190612924565b6001600160a01b0316836001600160a01b0316141561161257611507856001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156115d457600080fd5b505afa1580156115e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061160c9190810190612924565b856125a2565b6116fd856001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561164e57600080fd5b505afa158015611662573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506116869190810190612924565b846001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156116bf57600080fd5b505afa1580156116d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506116f79190810190612924565b866125b0565b91505b61170a8383611cc2565b505050505050565b604051631853304760e31b8152606090733d9819210a31b4961b30ef54be2aed79b9c9cd3b9063c29982389061174c908590600401613187565b600060405180830381600087803b15801561176657600080fd5b505af115801561177a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526117a29190810190612b59565b905060005b8151811015610ebb578181815181106117bc57fe5b60200260200101516000146117e35760405162461bcd60e51b815260040161057590613214565b6001016117a7565b806001600160a01b0316836001600160a01b0316141561181d5760405162461bcd60e51b815260040161057590613294565b60008490506000806000836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561186057600080fd5b505afa158015611874573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506118989190810190612924565b6001600160a01b0316876001600160a01b0316141561194b57846001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156118ea57600080fd5b505afa1580156118fe573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506119229190810190612924565b905061192e81876120e8565b925061193a8584610cef565b61194581848861216e565b50611b8d565b836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561198457600080fd5b505afa158015611998573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506119bc9190810190612924565b6001600160a01b0316856001600160a01b03161415611a6957866001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611a0e57600080fd5b505afa158015611a22573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611a469190810190612924565b9150611a52828761228c565b9250611a5e8584610cef565b6119458284886125c7565b866001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611aa257600080fd5b505afa158015611ab6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611ada9190810190612924565b9150846001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611b1557600080fd5b505afa158015611b29573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611b4d9190810190612924565b90506000611b5b838861228c565b9050611b6782826120e8565b9350611b738685610cef565b611b7e82858361216e565b50611b8a8382896125c7565b50505b611b978787610fc9565b5050505050505050565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611bdc57600080fd5b505afa158015611bf0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611c149190810190612924565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b390611c45908690869060040161316c565b602060405180830381600087803b158015611c5f57600080fd5b505af1158015611c73573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611c979190810190612b8e565b1515600114610ebb5760405162461bcd60e51b815260040161057590613264565b610eca82826104da565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed51415611d3657734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b826040518263ffffffff1660e01b81526004016000604051808303818588803b15801561102957600080fd5b611d408282611ba1565b60405163140e25ad60e31b81526001600160a01b0383169063a0712d6890611d6c9084906004016132a4565b602060405180830381600087803b158015611d8657600080fd5b505af1158015611d9a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611dbe9190810190612bac565b1561057e5760405162461bcd60e51b815260040161057590613284565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611e1657600080fd5b505afa158015611e2a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611e4e9190810190612924565b6040516323b872dd60e01b81529091506001600160a01b038216906323b872dd90611e8190889088908790600401613144565b602060405180830381600087803b158015611e9b57600080fd5b505af1158015611eaf573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611ed39190810190612b8e565b610ce85760405162461bcd60e51b815260040161057590613234565b600082821115611f115760405162461bcd60e51b815260040161057590613204565b508082035b92915050565b6001600160a01b038316734ddc2d193948926d02f9b1fe9e1daa0718270ed51415611fa257816001600160a01b031681604051611f58906130f1565b60006040518083038185875af1925050503d8060008114611f95576040519150601f19603f3d011682016040523d82523d6000602084013e611f9a565b606091505b505050610ebb565b826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611fdb57600080fd5b505afa158015611fef573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506120139190810190612924565b6001600160a01b031663a9059cbb83836040518363ffffffff1660e01b815260040161204092919061316c565b602060405180830381600087803b15801561205a57600080fd5b505af115801561206e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506120929190810190612b8e565b610ebb5760405162461bcd60e51b815260040161057590613254565b6000828201838110156120d35760405162461bcd60e51b8152600401610575906131c4565b9392505050565b60006120d3838360016125c7565b60006120f383612655565b6001600160a01b0316632640f62c836040518263ffffffff1660e01b815260040161211e91906132a4565b60206040518083038186803b15801561213657600080fd5b505afa15801561214a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506120d39190810190612bac565b60008061217a85612655565b60405163095ea7b360e01b81529091506001600160a01b0386169063095ea7b3906121ab908490889060040161316c565b602060405180830381600087803b1580156121c557600080fd5b505af11580156121d9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506121fd9190810190612b8e565b506040516395e3c50b60e01b81526001600160a01b038216906395e3c50b906122319087908790603c420190600401613198565b602060405180830381600087803b15801561224b57600080fd5b505af115801561225f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506122839190810190612bac565b95945050505050565b600061229783612655565b6001600160a01b03166359e94862836040518263ffffffff1660e01b815260040161211e91906132a4565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156122fd57600080fd5b505afa158015612311573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506123359190810190612bca565b9050806001600160a01b031663f0217ce58360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561239257600080fd5b505afa1580156123a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506123ca9190810190612bac565b846001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561240357600080fd5b505afa158015612417573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061243b9190810190612bac565b6040518463ffffffff1660e01b815260040161245993929190613198565b600060405180830381600087803b15801561247357600080fd5b505af1158015612487573d6000803e3d6000fd5b50505050505050565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156124cb57600080fd5b505afa1580156124df573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506125039190810190612bca565b9050806001600160a01b03166379d88d878360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561239257600080fd5b60006120d383836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f7700008152506126df565b60006120d38383600161216e565b60006125bf848484600161270b565b949350505050565b60006125d284612655565b6001600160a01b031663f39b5b9b848442603c016040518463ffffffff1660e01b81526004016126039291906132b2565b6020604051808303818588803b15801561261c57600080fd5b505af1158015612630573d6000803e3d6000fd5b50505050506040513d601f19601f820116820180604052506125bf9190810190612bac565b6040516303795fb160e11b815260009073c0a47dfe034b400b47bdad5fecda2621de6c4d95906306f2bf629061268f9085906004016130fc565b60206040518083038186803b1580156126a757600080fd5b505afa1580156126bb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611f169190810190612924565b600081848411156127035760405162461bcd60e51b815260040161057591906131b3565b505050900390565b60008061271886856125a2565b90506127258582856125c7565b9695505050505050565b604080516060810182526000808252602082018190529181019190915290565b8035611f1681613397565b8051611f1681613397565b600082601f83011261277657600080fd5b8135612789612784826132e7565b6132c0565b915081818352602084019350602081019050838560208402820111156127ae57600080fd5b60005b838110156127da57816127c4888261274f565b84525060209283019291909101906001016127b1565b5050505092915050565b600082601f8301126127f557600080fd5b8151612803612784826132e7565b9150818183526020840193506020810190508385602084028201111561282857600080fd5b60005b838110156127da578161283e888261285f565b845250602092830192919091019060010161282b565b8051611f16816133ab565b8051611f16816133b4565b60008083601f84011261287c57600080fd5b50813567ffffffffffffffff81111561289457600080fd5b6020830191508360018202830111156128ac57600080fd5b9250929050565b8051611f16816133bd565b6000606082840312156128d057600080fd5b6128da60606132c0565b905060006128e8848461274f565b82525060206128f98484830161274f565b602083015250604061290d8482850161274f565b60408301525092915050565b8035611f16816133b4565b60006020828403121561293657600080fd5b60006125bf848461275a565b600080600080600080600060c0888a03121561295d57600080fd5b60006129698a8a61274f565b975050602061297a8a828b0161274f565b965050604061298b8a828b0161274f565b955050606061299c8a828b0161274f565b94505060806129ad8a828b01612919565b93505060a088013567ffffffffffffffff8111156129ca57600080fd5b6129d68a828b0161286a565b925092505092959891949750929550565b6000806000606084860312156129fc57600080fd5b6000612a08868661274f565b9350506020612a198682870161274f565b9250506040612a2a86828701612919565b9150509250925092565b60008060008060808587031215612a4a57600080fd5b6000612a56878761274f565b9450506020612a678782880161274f565b9350506040612a7887828801612919565b9250506060612a898782880161274f565b91505092959194509250565b60008060408385031215612aa857600080fd5b6000612ab4858561274f565b9250506020612ac585828601612919565b9150509250929050565b60008060008060808587031215612ae557600080fd5b6000612af1878761274f565b9450506020612b0287828801612919565b9350506040612b138782880161274f565b9250506060612a8987828801612919565b600060208284031215612b3657600080fd5b813567ffffffffffffffff811115612b4d57600080fd5b6125bf84828501612765565b600060208284031215612b6b57600080fd5b815167ffffffffffffffff811115612b8257600080fd5b6125bf848285016127e4565b600060208284031215612ba057600080fd5b60006125bf8484612854565b600060208284031215612bbe57600080fd5b60006125bf848461285f565b600060208284031215612bdc57600080fd5b60006125bf84846128b3565b600060608284031215612bfa57600080fd5b60006125bf84846128be565b600080600080600060808688031215612c1e57600080fd5b6000612c2a8888612919565b9550506020612c3b88828901612919565b9450506040612c4c88828901612919565b935050606086013567ffffffffffffffff811115612c6957600080fd5b612c758882890161286a565b92509250509295509295909350565b6000612c908383612ca7565b505060200190565b612ca18161334a565b82525050565b612ca181613320565b6000612cbb8261330e565b612cc58185613312565b9350612cd083613308565b8060005b83811015612cfe578151612ce88882612c84565b9750612cf383613308565b925050600101612cd4565b509495945050505050565b612ca181613330565b6000612d1e838561331b565b9350612d2b838584613355565b50500190565b6000612d3c8261330e565b612d468185613312565b9350612d56818560208601613361565b612d5f8161338d565b9093019392505050565b6000612d748261330e565b612d7e818561331b565b9350612d8e818560208601613361565b9290920192915050565b6000612da5601b83613312565b7f536166654d6174683a206164646974696f6e206f766572666c6f770000000000815260200192915050565b6000612dde601e83613312565b7f636d706e642d6d67722d63746f6b656e2d626f72726f772d6661696c65640000815260200192915050565b6000612e17601e83613312565b7f636d706e642d6d67722d63746f6b656e2d72656465656d2d6661696c65640000815260200192915050565b6000612e50602983613312565b7f636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79698152681b99cb59985a5b195960ba1b602082015260400192915050565b6000612e9b601483613312565b731cd859994b5b585d1a0b5cdd588b59985a5b195960621b815260200192915050565b6000612ecb601e83613312565b7f636d706e642d6d67722d656e7465722d6d61726b6574732d6661696c65640000815260200192915050565b6000612f04602383613312565b7f636d706e642d6d67722d63746f6b656e2d7265706179626568616c662d6661698152621b195960ea1b602082015260400192915050565b6000612f49601e83613312565b7f636d706e642d6d67722d7472616e736665722d66726f6d2d6661696c65640000815260200192915050565b6000612f82601d83613312565b7f636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564000000815260200192915050565b6000612fbb601983613312565b7f636d706e642d6d67722d7472616e736665722d6661696c656400000000000000815260200192915050565b6000611f1660008361331b565b6000613001602083613312565b7f636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564815260200192915050565b600061303a601d83613312565b7f636c6561722d636f6c6c61746572616c2d73616d652d61646472657373000000815260200192915050565b6000613073601e83613312565b7f636d706e642d6d67722d63746f6b656e2d737570706c792d6661696c65640000815260200192915050565b60006130ac601783613312565b7f636c6561722d646562742d73616d652d61646472657373000000000000000000815260200192915050565b60006130e48286612d69565b9150612283828486612d12565b6000611f1682612fe7565b60208101611f168284612ca7565b608081016131188287612c98565b6131256020830186612ca7565b6131326040830185612d09565b81810360608301526127258184612d31565b606081016131528286612ca7565b61315f6020830185612ca7565b6125bf6040830184612d09565b6040810161317a8285612ca7565b6120d36020830184612d09565b602080825281016120d38184612cb0565b606081016131a68286612d09565b61315f6020830185612d09565b602080825281016120d38184612d31565b60208082528101611f1681612d98565b60208082528101611f1681612dd1565b60208082528101611f1681612e0a565b60208082528101611f1681612e43565b60208082528101611f1681612e8e565b60208082528101611f1681612ebe565b60208082528101611f1681612ef7565b60208082528101611f1681612f3c565b60208082528101611f1681612f75565b60208082528101611f1681612fae565b60208082528101611f1681612ff4565b60208082528101611f168161302d565b60208082528101611f1681613066565b60208082528101611f168161309f565b60208101611f168284612d09565b6040810161317a8285612d09565b60405181810167ffffffffffffffff811182821017156132df57600080fd5b604052919050565b600067ffffffffffffffff8211156132fe57600080fd5b5060209081020190565b60200190565b5190565b90815260200190565b919050565b6000611f168261333e565b151590565b90565b6000611f1682613320565b6001600160a01b031690565b6000611f1682613333565b82818337506000910152565b60005b8381101561337c578181015183820152602001613364565b838111156104d45750506000910152565b601f01601f191690565b6133a081613320565b81146108c957600080fd5b6133a08161332b565b6133a081613330565b6133a08161333356fea365627a7a72315820ce0b52e9b5c82f957a5966bc89c1e5ca746205ba9274035482b2834a0682c1bb6c6578706572696d656e74616cf564736f6c63430005100040", - "deployedBytecode": "0x60806040526004361061014b5760003560e01c80637720cc87116100b6578063c04bea9b1161006f578063c04bea9b146102f8578063c29982381461030b578063d13b8c721461032b578063d2f70c401461033e578063d882dc6c1461035e578063f2b9fdb8146103715761014b565b80637720cc871461026c578063962941781461027f5780639a22a1b914610292578063abdb5ea8146102b2578063b14886ee146102c5578063ba59154f146102e55761014b565b806341ec5cc41161010857806341ec5cc4146101f85780634907b8fc1461020b5780634b8a35291461021357806359086a5e1461023357806367600cc21461024657806375d40945146102595761014b565b80630b4e0630146101505780631e9a69501461016557806324d1ea12146101785780632d8af543146101985780632f379b13146101b85780633dc4d99a146101d8575b600080fd5b61016361015e366004612a95565b610384565b005b610163610173366004612a95565b6104da565b34801561018457600080fd5b50610163610193366004612c06565b610582565b3480156101a457600080fd5b506101636101b3366004612b24565b6108b7565b3480156101c457600080fd5b506101636101d3366004612942565b6108cc565b3480156101e457600080fd5b506101636101f3366004612b24565b610c00565b610163610206366004612a95565b610c73565b610163610c85565b34801561021f57600080fd5b5061016361022e366004612a95565b610cef565b6101636102413660046129e7565b610d8a565b610163610254366004612a95565b610ec0565b610163610267366004612acf565b610ed5565b61016361027a3660046129e7565b610ee9565b61016361028d366004612a95565b610f24565b34801561029e57600080fd5b506101636102ad366004612a95565b610fbf565b6101636102c0366004612a95565b610fc9565b3480156102d157600080fd5b506101636102e0366004612c06565b6110ec565b6101636102f3366004612a95565b61138a565b610163610306366004612a34565b6113c4565b34801561031757600080fd5b50610163610326366004612b24565b611712565b610163610339366004612a34565b6117eb565b34801561034a57600080fd5b50610163610359366004612a95565b611ba1565b61016361036c366004612a95565b611cb8565b61016361037f366004612a95565b611cc2565b6040516370a0823160e01b81526000906001600160a01b038416906370a08231906103b39030906004016130fc565b60206040518083038186803b1580156103cb57600080fd5b505afa1580156103df573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104039190810190612bac565b90506001600160a01b038316734ddc2d193948926d02f9b1fe9e1daa0718270ed5146104355761043533308585611ddb565b61043f8383611cc2565b6040516370a0823160e01b81526000906001600160a01b038516906370a082319061046e9030906004016130fc565b60206040518083038186803b15801561048657600080fd5b505afa15801561049a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104be9190810190612bac565b90506104d484336104cf8486611eef565b611f1c565b50505050565b60405163db006a7560e01b81526001600160a01b0383169063db006a75906105069084906004016132a4565b602060405180830381600087803b15801561052057600080fd5b505af1158015610534573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506105589190810190612bac565b1561057e5760405162461bcd60e51b8152600401610575906131e4565b60405180910390fd5b5050565b61058a61272f565b61059682840184612be8565b805160208201516040830151929350909160006105c9886105bd8c8c63ffffffff6120ae16565b9063ffffffff6120ae16565b9050836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561060457600080fd5b505afa158015610618573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061063c9190810190612924565b6001600160a01b0316836001600160a01b031614156106645761065f838b610fc9565b610776565b6000836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561069f57600080fd5b505afa1580156106b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506106d79190810190612924565b905060006106e5828d6120da565b60405163095ea7b360e01b81529091506001600160a01b0383169063095ea7b390610716908890859060040161316c565b602060405180830381600087803b15801561073057600080fd5b505af1158015610744573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107689190810190612b8e565b506107738582610fc9565b50505b836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b1580156107af57600080fd5b505afa1580156107c3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107e79190810190612924565b6001600160a01b0316826001600160a01b0316141561080f5761080a8282610cef565b6108ab565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561084a57600080fd5b505afa15801561085e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506108829190810190612924565b9050600061089082846120e8565b905061089c8482610cef565b6108a782828561216e565b5050505b50505050505050505050565b6108c081611712565b6108c981610c00565b50565b60008590506000816001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561090c57600080fd5b505afa158015610920573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109449190810190612924565b6001600160a01b0316866001600160a01b031614156109645750836109e1565b6109de866001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156109a057600080fd5b505afa1580156109b4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109d89190810190612924565b8661228c565b90505b6060896040516020016109f491906130fc565b60408051601f1981840301815290829052610a1591879087906020016130d8565b60405160208183030381529060405290506000836001600160a01b0316633f6dc33b6040518163ffffffff1660e01b815260040160206040518083038186803b158015610a6157600080fd5b505afa158015610a75573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610a999190810190612924565b6001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b158015610ad157600080fd5b505afa158015610ae5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b099190810190612924565b9050610b158a826122c2565b806001600160a01b0316635cffe9de8b866001600160a01b03166356cc94a26040518163ffffffff1660e01b815260040160206040518083038186803b158015610b5e57600080fd5b505afa158015610b72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b969190810190612924565b86866040518563ffffffff1660e01b8152600401610bb7949392919061310a565b600060405180830381600087803b158015610bd157600080fd5b505af1158015610be5573d6000803e3d6000fd5b50505050610bf38a82612490565b5050505050505050505050565b60005b815181101561057e57734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316828281518110610c3657fe5b60200260200101516001600160a01b031614610c6b57610c6b828281518110610c5b57fe5b6020026020010151600019611ba1565b600101610c03565b610c7b610c85565b61057e8282610cef565b734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b346040518263ffffffff1660e01b81526004016000604051808303818588803b158015610cd457600080fd5b505af1158015610ce8573d6000803e3d6000fd5b5050505050565b60405163317afabb60e21b81526001600160a01b0383169063c5ebeaec90610d1b9084906004016132a4565b602060405180830381600087803b158015610d3557600080fd5b505af1158015610d49573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610d6d9190810190612bac565b1561057e5760405162461bcd60e51b8152600401610575906131d4565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed51415610e145760405163e597461960e01b81526001600160a01b0383169063e5974619908390610ddd9087906004016130fc565b6000604051808303818588803b158015610df657600080fd5b505af1158015610e0a573d6000803e3d6000fd5b5050505050610ebb565b610e1e8282611ba1565b6040516304c11f0360e31b81526001600160a01b03831690632608f81890610e4c908690859060040161316c565b602060405180830381600087803b158015610e6657600080fd5b505af1158015610e7a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610e9e9190810190612bac565b15610ebb5760405162461bcd60e51b815260040161057590613224565b505050565b610eca8282610f24565b61057e823383611f1c565b610edf8484611cc2565b6104d48282610cef565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514610f1957610f1933308484611ddb565b610ebb838383610d8a565b60405163852a12e360e01b81526001600160a01b0383169063852a12e390610f509084906004016132a4565b602060405180830381600087803b158015610f6a57600080fd5b505af1158015610f7e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610fa29190810190612bac565b1561057e5760405162461bcd60e51b8152600401610575906131f4565b610eca8282610cef565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed5141561104757816001600160a01b0316634e4d9fea826040518263ffffffff1660e01b81526004016000604051808303818588803b15801561102957600080fd5b505af115801561103d573d6000803e3d6000fd5b505050505061057e565b6110518282611ba1565b60405163073a938160e11b81526001600160a01b03831690630e7527029061107d9084906004016132a4565b602060405180830381600087803b15801561109757600080fd5b505af11580156110ab573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506110cf9190810190612bac565b1561057e5760405162461bcd60e51b815260040161057590613244565b6110f461272f565b61110082840184612be8565b80516020820151604083015192935090916000611133886111278c8c63ffffffff61256016565b9063ffffffff61256016565b9050836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561116e57600080fd5b505afa158015611182573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506111a69190810190612924565b6001600160a01b0316826001600160a01b031614156111ce576111c98282611cc2565b61125e565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561120957600080fd5b505afa15801561121d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506112419190810190612924565b9050600061124f82846120da565b905061125b8482611cc2565b50505b836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561129757600080fd5b505afa1580156112ab573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506112cf9190810190612924565b6001600160a01b0316836001600160a01b031614156112f25761080a838b610f24565b6000836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561132d57600080fd5b505afa158015611341573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506113659190810190612924565b90506000611373828d6120e8565b905061137f8582610f24565b6108a782828e61216e565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed5146113ba576113ba33308484611ddb565b61057e8282610fc9565b806001600160a01b0316836001600160a01b031614156113f65760405162461bcd60e51b815260040161057590613274565b6000846114038585610f24565b806001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561143c57600080fd5b505afa158015611450573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506114749190810190612924565b6001600160a01b0316856001600160a01b0316141561150e57611507836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156114c957600080fd5b505afa1580156114dd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506115019190810190612924565b856120da565b9150611700565b806001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561154757600080fd5b505afa15801561155b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061157f9190810190612924565b6001600160a01b0316836001600160a01b0316141561161257611507856001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156115d457600080fd5b505afa1580156115e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061160c9190810190612924565b856125a2565b6116fd856001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561164e57600080fd5b505afa158015611662573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506116869190810190612924565b846001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156116bf57600080fd5b505afa1580156116d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506116f79190810190612924565b866125b0565b91505b61170a8383611cc2565b505050505050565b604051631853304760e31b8152606090733d9819210a31b4961b30ef54be2aed79b9c9cd3b9063c29982389061174c908590600401613187565b600060405180830381600087803b15801561176657600080fd5b505af115801561177a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526117a29190810190612b59565b905060005b8151811015610ebb578181815181106117bc57fe5b60200260200101516000146117e35760405162461bcd60e51b815260040161057590613214565b6001016117a7565b806001600160a01b0316836001600160a01b0316141561181d5760405162461bcd60e51b815260040161057590613294565b60008490506000806000836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561186057600080fd5b505afa158015611874573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506118989190810190612924565b6001600160a01b0316876001600160a01b0316141561194b57846001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156118ea57600080fd5b505afa1580156118fe573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506119229190810190612924565b905061192e81876120e8565b925061193a8584610cef565b61194581848861216e565b50611b8d565b836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561198457600080fd5b505afa158015611998573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506119bc9190810190612924565b6001600160a01b0316856001600160a01b03161415611a6957866001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611a0e57600080fd5b505afa158015611a22573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611a469190810190612924565b9150611a52828761228c565b9250611a5e8584610cef565b6119458284886125c7565b866001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611aa257600080fd5b505afa158015611ab6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611ada9190810190612924565b9150846001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611b1557600080fd5b505afa158015611b29573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611b4d9190810190612924565b90506000611b5b838861228c565b9050611b6782826120e8565b9350611b738685610cef565b611b7e82858361216e565b50611b8a8382896125c7565b50505b611b978787610fc9565b5050505050505050565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611bdc57600080fd5b505afa158015611bf0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611c149190810190612924565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b390611c45908690869060040161316c565b602060405180830381600087803b158015611c5f57600080fd5b505af1158015611c73573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611c979190810190612b8e565b1515600114610ebb5760405162461bcd60e51b815260040161057590613264565b610eca82826104da565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed51415611d3657734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b826040518263ffffffff1660e01b81526004016000604051808303818588803b15801561102957600080fd5b611d408282611ba1565b60405163140e25ad60e31b81526001600160a01b0383169063a0712d6890611d6c9084906004016132a4565b602060405180830381600087803b158015611d8657600080fd5b505af1158015611d9a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611dbe9190810190612bac565b1561057e5760405162461bcd60e51b815260040161057590613284565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611e1657600080fd5b505afa158015611e2a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611e4e9190810190612924565b6040516323b872dd60e01b81529091506001600160a01b038216906323b872dd90611e8190889088908790600401613144565b602060405180830381600087803b158015611e9b57600080fd5b505af1158015611eaf573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611ed39190810190612b8e565b610ce85760405162461bcd60e51b815260040161057590613234565b600082821115611f115760405162461bcd60e51b815260040161057590613204565b508082035b92915050565b6001600160a01b038316734ddc2d193948926d02f9b1fe9e1daa0718270ed51415611fa257816001600160a01b031681604051611f58906130f1565b60006040518083038185875af1925050503d8060008114611f95576040519150601f19603f3d011682016040523d82523d6000602084013e611f9a565b606091505b505050610ebb565b826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611fdb57600080fd5b505afa158015611fef573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506120139190810190612924565b6001600160a01b031663a9059cbb83836040518363ffffffff1660e01b815260040161204092919061316c565b602060405180830381600087803b15801561205a57600080fd5b505af115801561206e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506120929190810190612b8e565b610ebb5760405162461bcd60e51b815260040161057590613254565b6000828201838110156120d35760405162461bcd60e51b8152600401610575906131c4565b9392505050565b60006120d3838360016125c7565b60006120f383612655565b6001600160a01b0316632640f62c836040518263ffffffff1660e01b815260040161211e91906132a4565b60206040518083038186803b15801561213657600080fd5b505afa15801561214a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506120d39190810190612bac565b60008061217a85612655565b60405163095ea7b360e01b81529091506001600160a01b0386169063095ea7b3906121ab908490889060040161316c565b602060405180830381600087803b1580156121c557600080fd5b505af11580156121d9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506121fd9190810190612b8e565b506040516395e3c50b60e01b81526001600160a01b038216906395e3c50b906122319087908790603c420190600401613198565b602060405180830381600087803b15801561224b57600080fd5b505af115801561225f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506122839190810190612bac565b95945050505050565b600061229783612655565b6001600160a01b03166359e94862836040518263ffffffff1660e01b815260040161211e91906132a4565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156122fd57600080fd5b505afa158015612311573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506123359190810190612bca565b9050806001600160a01b031663f0217ce58360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561239257600080fd5b505afa1580156123a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506123ca9190810190612bac565b846001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561240357600080fd5b505afa158015612417573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061243b9190810190612bac565b6040518463ffffffff1660e01b815260040161245993929190613198565b600060405180830381600087803b15801561247357600080fd5b505af1158015612487573d6000803e3d6000fd5b50505050505050565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156124cb57600080fd5b505afa1580156124df573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506125039190810190612bca565b9050806001600160a01b03166379d88d878360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561239257600080fd5b60006120d383836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f7700008152506126df565b60006120d38383600161216e565b60006125bf848484600161270b565b949350505050565b60006125d284612655565b6001600160a01b031663f39b5b9b848442603c016040518463ffffffff1660e01b81526004016126039291906132b2565b6020604051808303818588803b15801561261c57600080fd5b505af1158015612630573d6000803e3d6000fd5b50505050506040513d601f19601f820116820180604052506125bf9190810190612bac565b6040516303795fb160e11b815260009073c0a47dfe034b400b47bdad5fecda2621de6c4d95906306f2bf629061268f9085906004016130fc565b60206040518083038186803b1580156126a757600080fd5b505afa1580156126bb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611f169190810190612924565b600081848411156127035760405162461bcd60e51b815260040161057591906131b3565b505050900390565b60008061271886856125a2565b90506127258582856125c7565b9695505050505050565b604080516060810182526000808252602082018190529181019190915290565b8035611f1681613397565b8051611f1681613397565b600082601f83011261277657600080fd5b8135612789612784826132e7565b6132c0565b915081818352602084019350602081019050838560208402820111156127ae57600080fd5b60005b838110156127da57816127c4888261274f565b84525060209283019291909101906001016127b1565b5050505092915050565b600082601f8301126127f557600080fd5b8151612803612784826132e7565b9150818183526020840193506020810190508385602084028201111561282857600080fd5b60005b838110156127da578161283e888261285f565b845250602092830192919091019060010161282b565b8051611f16816133ab565b8051611f16816133b4565b60008083601f84011261287c57600080fd5b50813567ffffffffffffffff81111561289457600080fd5b6020830191508360018202830111156128ac57600080fd5b9250929050565b8051611f16816133bd565b6000606082840312156128d057600080fd5b6128da60606132c0565b905060006128e8848461274f565b82525060206128f98484830161274f565b602083015250604061290d8482850161274f565b60408301525092915050565b8035611f16816133b4565b60006020828403121561293657600080fd5b60006125bf848461275a565b600080600080600080600060c0888a03121561295d57600080fd5b60006129698a8a61274f565b975050602061297a8a828b0161274f565b965050604061298b8a828b0161274f565b955050606061299c8a828b0161274f565b94505060806129ad8a828b01612919565b93505060a088013567ffffffffffffffff8111156129ca57600080fd5b6129d68a828b0161286a565b925092505092959891949750929550565b6000806000606084860312156129fc57600080fd5b6000612a08868661274f565b9350506020612a198682870161274f565b9250506040612a2a86828701612919565b9150509250925092565b60008060008060808587031215612a4a57600080fd5b6000612a56878761274f565b9450506020612a678782880161274f565b9350506040612a7887828801612919565b9250506060612a898782880161274f565b91505092959194509250565b60008060408385031215612aa857600080fd5b6000612ab4858561274f565b9250506020612ac585828601612919565b9150509250929050565b60008060008060808587031215612ae557600080fd5b6000612af1878761274f565b9450506020612b0287828801612919565b9350506040612b138782880161274f565b9250506060612a8987828801612919565b600060208284031215612b3657600080fd5b813567ffffffffffffffff811115612b4d57600080fd5b6125bf84828501612765565b600060208284031215612b6b57600080fd5b815167ffffffffffffffff811115612b8257600080fd5b6125bf848285016127e4565b600060208284031215612ba057600080fd5b60006125bf8484612854565b600060208284031215612bbe57600080fd5b60006125bf848461285f565b600060208284031215612bdc57600080fd5b60006125bf84846128b3565b600060608284031215612bfa57600080fd5b60006125bf84846128be565b600080600080600060808688031215612c1e57600080fd5b6000612c2a8888612919565b9550506020612c3b88828901612919565b9450506040612c4c88828901612919565b935050606086013567ffffffffffffffff811115612c6957600080fd5b612c758882890161286a565b92509250509295509295909350565b6000612c908383612ca7565b505060200190565b612ca18161334a565b82525050565b612ca181613320565b6000612cbb8261330e565b612cc58185613312565b9350612cd083613308565b8060005b83811015612cfe578151612ce88882612c84565b9750612cf383613308565b925050600101612cd4565b509495945050505050565b612ca181613330565b6000612d1e838561331b565b9350612d2b838584613355565b50500190565b6000612d3c8261330e565b612d468185613312565b9350612d56818560208601613361565b612d5f8161338d565b9093019392505050565b6000612d748261330e565b612d7e818561331b565b9350612d8e818560208601613361565b9290920192915050565b6000612da5601b83613312565b7f536166654d6174683a206164646974696f6e206f766572666c6f770000000000815260200192915050565b6000612dde601e83613312565b7f636d706e642d6d67722d63746f6b656e2d626f72726f772d6661696c65640000815260200192915050565b6000612e17601e83613312565b7f636d706e642d6d67722d63746f6b656e2d72656465656d2d6661696c65640000815260200192915050565b6000612e50602983613312565b7f636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79698152681b99cb59985a5b195960ba1b602082015260400192915050565b6000612e9b601483613312565b731cd859994b5b585d1a0b5cdd588b59985a5b195960621b815260200192915050565b6000612ecb601e83613312565b7f636d706e642d6d67722d656e7465722d6d61726b6574732d6661696c65640000815260200192915050565b6000612f04602383613312565b7f636d706e642d6d67722d63746f6b656e2d7265706179626568616c662d6661698152621b195960ea1b602082015260400192915050565b6000612f49601e83613312565b7f636d706e642d6d67722d7472616e736665722d66726f6d2d6661696c65640000815260200192915050565b6000612f82601d83613312565b7f636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564000000815260200192915050565b6000612fbb601983613312565b7f636d706e642d6d67722d7472616e736665722d6661696c656400000000000000815260200192915050565b6000611f1660008361331b565b6000613001602083613312565b7f636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564815260200192915050565b600061303a601d83613312565b7f636c6561722d636f6c6c61746572616c2d73616d652d61646472657373000000815260200192915050565b6000613073601e83613312565b7f636d706e642d6d67722d63746f6b656e2d737570706c792d6661696c65640000815260200192915050565b60006130ac601783613312565b7f636c6561722d646562742d73616d652d61646472657373000000000000000000815260200192915050565b60006130e48286612d69565b9150612283828486612d12565b6000611f1682612fe7565b60208101611f168284612ca7565b608081016131188287612c98565b6131256020830186612ca7565b6131326040830185612d09565b81810360608301526127258184612d31565b606081016131528286612ca7565b61315f6020830185612ca7565b6125bf6040830184612d09565b6040810161317a8285612ca7565b6120d36020830184612d09565b602080825281016120d38184612cb0565b606081016131a68286612d09565b61315f6020830185612d09565b602080825281016120d38184612d31565b60208082528101611f1681612d98565b60208082528101611f1681612dd1565b60208082528101611f1681612e0a565b60208082528101611f1681612e43565b60208082528101611f1681612e8e565b60208082528101611f1681612ebe565b60208082528101611f1681612ef7565b60208082528101611f1681612f3c565b60208082528101611f1681612f75565b60208082528101611f1681612fae565b60208082528101611f1681612ff4565b60208082528101611f168161302d565b60208082528101611f1681613066565b60208082528101611f168161309f565b60208101611f168284612d09565b6040810161317a8285612d09565b60405181810167ffffffffffffffff811182821017156132df57600080fd5b604052919050565b600067ffffffffffffffff8211156132fe57600080fd5b5060209081020190565b60200190565b5190565b90815260200190565b919050565b6000611f168261333e565b151590565b90565b6000611f1682613320565b6001600160a01b031690565b6000611f1682613333565b82818337506000910152565b60005b8381101561337c578181015183820152602001613364565b838111156104d45750506000910152565b601f01601f191690565b6133a081613320565b81146108c957600080fd5b6133a08161332b565b6133a081613330565b6133a08161333356fea365627a7a72315820ce0b52e9b5c82f957a5966bc89c1e5ca746205ba9274035482b2834a0682c1bb6c6578706572696d656e74616cf564736f6c63430005100040", - "sourceMap": "773:13659:25:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;773:13659:25;;;;;;;", - "deployedSourceMap": "773:13659:25:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5264:690:16;;;;;;;;;:::i;:::-;;4686:167;;;;;;;;;:::i;1620:2685:25:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1620:2685:25;;;;;;;;:::i;2581:157:16:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2581:157:16;;;;;;;;:::i;7718:2211:25:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;7718:2211:25;;;;;;;;:::i;2252:323:16:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2252:323:16;;;;;;;;:::i;3710:227::-;;;;;;;;;:::i;2744:99::-;;;:::i;3284:159::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3284:159:16;;;;;;;;:::i;4283:397::-;;;;;;;;;:::i;6836:200::-;;;;;;;;;:::i;3449:255::-;;;;;;;;;:::i;6206:282::-;;;;;;;;;:::i;4859:198::-;;;;;;;;;:::i;6494:150::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6494:150:16;;;;;;;;:::i;3943:334::-;;;;;;;;;:::i;4311:2218:25:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4311:2218:25;;;;;;;;:::i;5960:240:16:-;;;;;;;;;:::i;12741:1689:25:-;;;;;;;;;:::i;1466:429:16:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1466:429:16;;;;;;;;:::i;9994:2741:25:-;;;;;;;;;:::i;1901:345:16:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1901:345:16;;;;;;;;:::i;6650:180::-;;;;;;;;;:::i;2849:429::-;;;;;;;;;:::i;5264:690::-;5425:40;;-1:-1:-1;;;5425:40:16;;5407:15;;-1:-1:-1;;;;;5425:25:16;;;;;:40;;5459:4;;5425:40;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5425:40:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5425:40:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5425:40:16;;;;;;;;;5407:58;-1:-1:-1;;;;;;5639:23:16;;498:42;5639:23;5635:110;;5678:56;5692:10;5712:4;5719:6;5727;5678:13;:56::i;:::-;5754:22;5761:6;5769;5754;:22::i;:::-;5840:40;;-1:-1:-1;;;5840:40:16;;5824:13;;-1:-1:-1;;;;;5840:25:16;;;;;:40;;5874:4;;5840:40;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5840:40:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5840:40:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5840:40:16;;;;;;;;;5824:56;;5891;5901:6;5909:10;5921:25;5925:8;5935:10;5921:3;:25::i;:::-;5891:9;:56::i;:::-;5264:690;;;;:::o;4686:167::-;4770:36;;-1:-1:-1;;;4770:36:16;;-1:-1:-1;;;;;4770:22:16;;;;;:36;;4793:12;;4770:36;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4770:36:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4770:36:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4770:36:16;;;;;;;;;:41;4762:84;;;;-1:-1:-1;;;4762:84:16;;;;;;;;;;;;;;;;;4686:167;;:::o;1620:2685:25:-;1777:39;;:::i;:::-;1819:42;;;;1830:5;1819:42;;;1922:33;;1994:27;;;;2058;;;;1777:84;;-1:-1:-1;1922:33:25;;1872:31;2114:43;2144:12;2114:25;:11;2130:8;2114:25;:15;:25;:::i;:::-;:29;:43;:29;:43;:::i;:::-;2096:61;;2671:15;-1:-1:-1;;;;;2671:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2671:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2671:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2671:31:25;;;;;;;;;-1:-1:-1;;;;;2651:51:25;:16;-1:-1:-1;;;;;2651:51:25;;2647:673;;;2718:42;2730:16;2748:11;2718;:42::i;:::-;2647:673;;;2843:26;2880:16;-1:-1:-1;;;;;2872:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2872:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2872:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2872:38:25;;;;;;;;;2843:67;;2925:29;2957:90;2986:18;3022:11;2957;:90::i;:::-;3115:95;;-1:-1:-1;;;3115:95:25;;2925:122;;-1:-1:-1;;;;;;3115:51:25;;;;;:95;;3167:16;;2925:122;;3115:95;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3115:95:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3115:95:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3115:95:25;;;;;;;;;;3254:55;3266:16;3284:24;3254:11;:55::i;:::-;2647:673;;;3484:15;-1:-1:-1;;;;;3484:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3484:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3484:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3484:31:25;;;;;;;;;-1:-1:-1;;;;;3464:51:25;:16;-1:-1:-1;;;;;3464:51:25;;3460:839;;;3531:36;3538:16;3556:10;3531:6;:36::i;:::-;3460:839;;;3639:26;3676:16;-1:-1:-1;;;;;3668:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3668:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3668:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3668:38:25;;;;;;;;;3639:67;;3834:29;3866:98;3904:18;3940:10;3866:20;:98::i;:::-;3834:130;;4011:50;4018:16;4036:24;4011:6;:50::i;:::-;4219:69;4231:18;4251:24;4277:10;4219:11;:69::i;:::-;;3460:839;;;1620:2685;;;;;;;;;;:::o;2581:157:16:-;2677:21;2690:7;2677:12;:21::i;:::-;2708:23;2723:7;2708:14;:23::i;:::-;2581:157;:::o;7718:2211:25:-;8332:31;8382:22;8332:73;;8534:18;8587:15;-1:-1:-1;;;;;8587:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8587:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8587:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;8587:31:25;;;;;;;;;-1:-1:-1;;;;;8567:51:25;:16;-1:-1:-1;;;;;8567:51:25;;8563:355;;;-1:-1:-1;8650:23:25;8563:355;;;8776:131;8822:16;-1:-1:-1;;;;;8814:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8814:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8814:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;8814:38:25;;;;;;;;;8870:23;8776:20;:131::i;:::-;8760:147;;8563:355;9067:53;9164:27;9153:39;;;;;;;;;;;;;-1:-1:-1;;26:21;;;22:32;6:49;;9153:39:25;;;;9123:123;;9206:30;;;;49:4:-1;9123:123:25;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;9123:123:25;;;9067:179;;9257:24;9357:15;-1:-1:-1;;;;;9357:53:25;;:55;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9357:55:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9357:55:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;9357:55:25;;;;;;;;;-1:-1:-1;;;;;9310:131:25;;:133;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9310:133:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9310:133:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;9310:133:25;;;;;;;;;9257:196;;9509:56;9527:15;9552:11;9509:17;:56::i;:::-;9623:11;-1:-1:-1;;;;;9623:21:25;;9658:15;9687;-1:-1:-1;;;;;9687:30:25;;:32;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9687:32:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9687:32:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;9687:32:25;;;;;;;;;9733:13;9760:40;9623:187;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9623:187:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9623:187:25;;;;9866:56;9884:15;9909:11;9866:17;:56::i;:::-;7718:2211;;;;;;;;;;;:::o;2252:323:16:-;2362:6;2357:212;2378:7;:14;2374:1;:18;2357:212;;;498:42;-1:-1:-1;;;;;2462:27:16;:7;2470:1;2462:10;;;;;;;;;;;;;;-1:-1:-1;;;;;2462:27:16;;2458:101;;2509:35;2523:7;2531:1;2523:10;;;;;;;;;;;;;;-1:-1:-1;;2509:13:16;:35::i;:::-;2394:3;;2357:212;;3710:227;3849:11;:9;:11::i;:::-;3902:28;3909:6;3917:12;3902:6;:28::i;2744:99::-;498:42;-1:-1:-1;;;;;2790:27:16;;2824:9;2790:46;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2790:46:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2790:46:16;;;;;2744:99::o;3284:159::-;3360:36;;-1:-1:-1;;;3360:36:16;;-1:-1:-1;;;;;3360:22:16;;;;;:36;;3383:12;;3360:36;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3360:36:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3360:36:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3360:36:16;;;;;;;;;:41;3352:84;;;;-1:-1:-1;;;3352:84:16;;;;;;;;4283:397;-1:-1:-1;;;;;4387:23:16;;498:42;4387:23;4383:291;;;4426:58;;-1:-1:-1;;;4426:58:16;;-1:-1:-1;;;;;4426:33:16;;;;;4466:6;;4426:58;;4474:9;;4426:58;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4426:58:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4426:58:16;;;;;4383:291;;;4515:29;4529:6;4537;4515:13;:29::i;:::-;4566:52;;-1:-1:-1;;;4566:52:16;;-1:-1:-1;;;;;4566:33:16;;;;;:52;;4600:9;;4611:6;;4566:52;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4566:52:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4566:52:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4566:52:16;;;;;;;;;:57;4558:105;;;;-1:-1:-1;;;4558:105:16;;;;;;;;;4283:397;;;:::o;6836:200::-;6950:32;6967:6;6975;6950:16;:32::i;:::-;6992:37;7002:6;7010:10;7022:6;6992:9;:37::i;3449:255::-;3619:34;3626:12;3640;3619:6;:34::i;:::-;3663;3670:12;3684;3663:6;:34::i;6206:282::-;-1:-1:-1;;;;;6322:23:16;;498:42;6322:23;6318:110;;6361:56;6375:10;6395:4;6402:6;6410;6361:13;:56::i;:::-;6437:44;6455:9;6466:6;6474;6437:17;:44::i;4859:198::-;4953:46;;-1:-1:-1;;;4953:46:16;;-1:-1:-1;;;;;4953:32:16;;;;;:46;;4986:12;;4953:46;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4953:46:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4953:46:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4953:46:16;;;;;;;;;:51;4945:105;;;;-1:-1:-1;;;4945:105:16;;;;;;;;6494:150;6568:22;6575:6;6583;6568;:22::i;3943:334::-;-1:-1:-1;;;;;4022:23:16;;498:42;4022:23;4018:253;;;4069:6;-1:-1:-1;;;;;4061:27:16;;4095:6;4061:43;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4061:43:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4061:43:16;;;;;4018:253;;;4135:29;4149:6;4157;4135:13;:29::i;:::-;4186:35;;-1:-1:-1;;;4186:35:16;;-1:-1:-1;;;;;4186:27:16;;;;;:35;;4214:6;;4186:35;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4186:35:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4186:35:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4186:35:16;;;;;;;;;:40;4178:82;;;;-1:-1:-1;;;4178:82:16;;;;;;;;4311:2218:25;4474:39;;:::i;:::-;4516:42;;;;4527:5;4516:42;;;4619:33;;4691:27;;;;4755;;;;4474:84;;-1:-1:-1;4619:33:25;;4569:31;5230:43;5260:12;5230:25;:11;5246:8;5230:25;:15;:25;:::i;:::-;:29;:43;:29;:43;:::i;:::-;5211:62;;5308:15;-1:-1:-1;;;;;5308:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5308:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5308:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5308:31:25;;;;;;;;;-1:-1:-1;;;;;5288:51:25;:16;-1:-1:-1;;;;;5288:51:25;;5284:538;;;5355:37;5362:16;5380:11;5355:6;:37::i;:::-;5284:538;;;5507:26;5544:16;-1:-1:-1;;;;;5536:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5536:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5536:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5536:38:25;;;;;;;;;5507:67;;5588:29;5620:90;5649:18;5685:11;5620;:90::i;:::-;5588:122;;5761:50;5768:16;5786:24;5761:6;:50::i;:::-;5284:538;;;5914:15;-1:-1:-1;;;;;5914:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5914:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5914:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5914:31:25;;;;;;;;;-1:-1:-1;;;;;5894:51:25;:16;-1:-1:-1;;;;;5894:51:25;;5890:633;;;5961:47;5978:16;5996:11;5961:16;:47::i;5890:633::-;6120:26;6157:16;-1:-1:-1;;;;;6149:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6149:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6149:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6149:38:25;;;;;;;;;6120:67;;6201:29;6233:53;6254:18;6274:11;6233:20;:53::i;:::-;6201:85;;6329:60;6346:16;6364:24;6329:16;:60::i;:::-;6442:70;6454:18;6474:24;6500:11;6442;:70::i;5960:240:16:-;-1:-1:-1;;;;;6051:23:16;;498:42;6051:23;6047:110;;6090:56;6104:10;6124:4;6131:6;6139;6090:13;:56::i;:::-;6166:27;6178:6;6186;6166:11;:27::i;12741:1689:25:-;13312:16;-1:-1:-1;;;;;13292:36:25;:16;-1:-1:-1;;;;;13292:36:25;;;13284:78;;;;-1:-1:-1;;;13284:78:25;;;;;;;;;13373:17;13450:22;13514:60;13531:16;13549:24;13514:16;:60::i;:::-;13609:15;-1:-1:-1;;;;;13609:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13609:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13609:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;13609:31:25;;;;;;;;;-1:-1:-1;;;;;13589:51:25;:16;-1:-1:-1;;;;;13589:51:25;;13585:759;;;13699:123;13736:16;-1:-1:-1;;;;;13728:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13728:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13728:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;13728:38:25;;;;;;;;;13784:24;13699:11;:123::i;:::-;13684:138;;13585:759;;;13863:15;-1:-1:-1;;;;;13863:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13863:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13863:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;13863:31:25;;;;;;;;;-1:-1:-1;;;;;13843:51:25;:16;-1:-1:-1;;;;;13843:51:25;;13839:505;;;13953:123;13990:16;-1:-1:-1;;;;;13982:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;13982:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;13982:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;13982:38:25;;;;;;;;;14038:24;13953:11;:123::i;13839:505::-;14152:181;14191:16;-1:-1:-1;;;;;14183:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14183:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14183:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;14183:38:25;;;;;;;;;14247:16;-1:-1:-1;;;;;14239:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;14239:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;14239:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;14239:38:25;;;;;;;;;14295:24;14152:13;:181::i;:::-;14137:196;;13839:505;14385:38;14392:16;14410:12;14385:6;:38::i;:::-;12741:1689;;;;;;:::o;1466:429:16:-;1693:62;;-1:-1:-1;;;1693:62:16;;1670:20;;417:42;;1693:53;;:62;;1747:7;;1693:62;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1693:62:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1693:62:16;;;;;;39:16:-1;36:1;17:17;2:54;101:4;1693:62:16;80:15:-1;;;-1:-1;;76:31;65:43;;120:4;113:20;1693:62:16;;;;;;;;;1670:85;-1:-1:-1;1771:6:16;1766:123;1787:6;:13;1783:1;:17;1766:123;;;1829:6;1836:1;1829:9;;;;;;;;;;;;;;1842:1;1829:14;1821:57;;;;-1:-1:-1;;;1821:57:16;;;;;;;;;1802:3;;1766:123;;9994:2741:25;10533:16;-1:-1:-1;;;;;10513:36:25;:16;-1:-1:-1;;;;;10513:36:25;;;10505:72;;;;-1:-1:-1;;;10505:72:25;;;;;;;;;10588:31;10638:22;10588:73;;10672:17;10699:26;10735;10796:15;-1:-1:-1;;;;;10796:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10796:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;10796:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;10796:31:25;;;;;;;;;-1:-1:-1;;;;;10776:51:25;:16;-1:-1:-1;;;;;10776:51:25;;10772:1860;;;10900:16;-1:-1:-1;;;;;10892:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10892:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;10892:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;10892:38:25;;;;;;;;;10871:59;;11010:70;11031:18;11051:28;11010:20;:70::i;:::-;10995:85;;11139:38;11146:16;11164:12;11139:6;:38::i;:::-;11229:75;11241:18;11261:12;11275:28;11229:11;:75::i;:::-;;10772:1860;;;11345:15;-1:-1:-1;;;;;11345:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11345:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11345:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;11345:31:25;;;;;;;;;-1:-1:-1;;;;;11325:51:25;:16;-1:-1:-1;;;;;11325:51:25;;11321:1311;;;11449:16;-1:-1:-1;;;;;11441:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11441:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11441:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;11441:38:25;;;;;;;;;11420:59;;11559:70;11580:18;11600:28;11559:20;:70::i;:::-;11544:85;;11686:38;11693:16;11711:12;11686:6;:38::i;:::-;11776:75;11788:18;11808:12;11822:28;11776:11;:75::i;11321:1311::-;11941:16;-1:-1:-1;;;;;11933:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11933:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11933:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;11933:38:25;;;;;;;;;11912:59;;12014:16;-1:-1:-1;;;;;12006:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12006:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;12006:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;12006:38:25;;;;;;;;;11985:59;;12103:14;12120:70;12141:18;12161:28;12120:20;:70::i;:::-;12103:87;;12266:51;12287:18;12307:9;12266:20;:51::i;:::-;12251:66;;12376:38;12383:16;12401:12;12376:6;:38::i;:::-;12479:56;12491:18;12511:12;12525:9;12479:11;:56::i;:::-;;12549:72;12561:18;12581:9;12592:28;12549:11;:72::i;:::-;;11321:1311;;12669:59;12681:16;12699:28;12669:11;:59::i;:::-;9994:2741;;;;;;;;:::o;1901:345:16:-;2051:18;2080:6;-1:-1:-1;;;;;2072:26:16;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2072:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2072:28:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2072:28:16;;;;;;;;;2131:42;;-1:-1:-1;;;2131:42:16;;2051:49;;-1:-1:-1;;;;;;2131:26:16;;;;;:42;;2158:6;;2166;;2131:42;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2131:42:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2131:42:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2131:42:16;;;;;;;;;:50;;2177:4;2131:50;2110:129;;;;-1:-1:-1;;;2110:129:16;;;;;;;;6650:180;6754:22;6761:6;6769;6754;:22::i;2849:429::-;-1:-1:-1;;;;;2923:23:16;;498:42;2923:23;2919:353;;;498:42;-1:-1:-1;;;;;2962:27:16;;2996:6;2962:43;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;2919:353:16;3099:29;3113:6;3121;3099:13;:29::i;:::-;3166:28;;-1:-1:-1;;;3166:28:16;;-1:-1:-1;;;;;3166:20:16;;;;;:28;;3187:6;;3166:28;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3166:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3166:28:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3166:28:16;;;;;;;;;:33;3143:118;;;;-1:-1:-1;;;3143:118:16;;;;;;;;722:345;866:18;895:6;-1:-1:-1;;;;;887:26:16;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;887:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;887:28:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;887:28:16;;;;;;;;;946:58;;-1:-1:-1;;;946:58:16;;866:49;;-1:-1:-1;;;;;;946:31:16;;;;;:58;;978:6;;986:9;;997:6;;946:58;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;946:58:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;946:58:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;946:58:16;;;;;;;;;925:135;;;;-1:-1:-1;;;925:135:16;;;;;;;;547:169;605:7;637:1;632;:6;;624:39;;;;-1:-1:-1;;;624:39:16;;;;;;;;;-1:-1:-1;685:5:16;;;547:169;;;;;:::o;1073:387::-;-1:-1:-1;;;;;1193:23:16;;498:42;1193:23;1189:265;;;1232:9;-1:-1:-1;;;;;1232:14:16;1253:6;1232:32;;;;;;;;;;;;;;;;;;;;;;;14:1:-1;21;16:31;;;;75:4;69:11;64:16;;144:4;140:9;133:4;115:16;111:27;107:43;104:1;100:51;94:4;87:65;169:16;166:1;159:27;225:16;222:1;215:4;212:1;208:12;193:49;7:242;;16:31;36:4;31:9;;7:242;;1232:32:16;;1189:265;;;1335:6;-1:-1:-1;;;;;1327:26:16;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1327:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1327:28:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1327:28:16;;;;;;;;;-1:-1:-1;;;;;1320:45:16;;1366:9;1377:6;1320:64;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1320:64:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1320:64:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1320:64:16;;;;;;;;;1295:148;;;;-1:-1:-1;;;1295:148:16;;;;;;;;834:176:32;892:7;923:5;;;946:6;;;;938:46;;;;-1:-1:-1;;;938:46:32;;;;;;;;;1002:1;834:176;-1:-1:-1;;;834:176:32:o;514:160:24:-;599:4;622:45;634:12;648:9;664:1;622:11;:45::i;2311:208::-;2402:4;2442:33;2462:12;2442:19;:33::i;:::-;-1:-1:-1;;;;;2425:76:24;;2502:9;2425:87;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2425:87:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2425:87:24;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2425:87:24;;;;;;;;1117:355;1215:4;1231:16;1250:33;1270:12;1250:19;:33::i;:::-;1294:51;;-1:-1:-1;;;1294:51:24;;1231:52;;-1:-1:-1;;;;;;1294:28:24;;;;;:51;;1231:52;;1333:11;;1294:51;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1294:51:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1294:51:24;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1294:51:24;;;;;;;;;-1:-1:-1;1363:102:24;;-1:-1:-1;;;1363:102:24;;-1:-1:-1;;;;;1363:59:24;;;;;:102;;1423:11;;1436:12;;1461:2;1455:3;:8;;1363:102;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1363:102:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1363:102:24;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1363:102:24;;;;;;;;;1356:109;1117:355;-1:-1:-1;;;;;1117:355:24:o;2525:212::-;2618:4;2658:33;2678:12;2658:19;:33::i;:::-;-1:-1:-1;;;;;2641:76:24;;2718:11;2641:89;;;;;;;;;;;;;;;;1022:293:25;1111:9;1140:12;-1:-1:-1;;;;;1131:32:25;;:34;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1131:34:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1131:34:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1131:34:25;;;;;;;;;1111:55;;1185:1;-1:-1:-1;;;;;1177:17:25;;1232:3;1216:21;;1208:30;;;1260:1;-1:-1:-1;;;;;1252:14:25;;:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1252:16:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1252:16:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1252:16:25;;;;;;;;;1290:1;-1:-1:-1;;;;;1282:14:25;;:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1282:16:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1282:16:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1282:16:25;;;;;;;;;1177:131;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1177:131:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1177:131:25;;;;1022:293;;;:::o;1321:::-;1410:9;1439:12;-1:-1:-1;;;;;1430:32:25;;:34;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1430:34:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1430:34:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1430:34:25;;;;;;;;;1410:55;;1484:1;-1:-1:-1;;;;;1476:17:25;;1531:3;1515:21;;1507:30;;;1559:1;-1:-1:-1;;;;;1551:14:25;;:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;1274:134:32;1332:7;1358:43;1362:1;1365;1358:43;;;;;;;;;;;;;;;;;:3;:43::i;955:156:24:-;1034:4;1057:47;1069:12;1083:11;1101:1;1057:11;:47::i;1717:160::-;1802:4;1825:45;1839:4;1845:2;1849:11;1867:1;1825:13;:45::i;:::-;1818:52;1717:160;-1:-1:-1;;;;1717:160:24:o;680:269::-;786:4;826:33;846:12;826:19;:33::i;:::-;-1:-1:-1;;;;;809:84:24;;900:9;911:14;932:3;938:2;932:8;809:133;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;809:133:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;809:133:24;;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;809:133:24;;;;;;;;337:171;437:64;;-1:-1:-1;;;437:64:24;;411:7;;288:42;;437:50;;:64;;488:12;;437:64;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;437:64:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;437:64:24;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;437:64:24;;;;;;;;1732:187:32;1818:7;1853:12;1845:6;;;;1837:29;;;;-1:-1:-1;;;1837:29:32;;;;;;;;;;-1:-1:-1;;;1888:5:32;;;1732:187::o;1478:233:24:-;1583:4;1599:14;1616:32;1628:4;1634:13;1616:11;:32::i;:::-;1599:49;;1665:39;1677:2;1681:9;1692:11;1665;:39::i;:::-;1658:46;1478:233;-1:-1:-1;;;;;;1478:233:24:o;773:13659:25:-;;;;;;;;;-1:-1:-1;773:13659:25;;;;;;;;;;;;;;;;;:::o;5:130:-1:-;72:20;;97:33;72:20;97:33;;142:134;220:13;;238:33;220:13;238:33;;454:707;;571:3;564:4;556:6;552:17;548:27;538:2;;589:1;586;579:12;538:2;626:6;613:20;648:80;663:64;720:6;663:64;;;648:80;;;639:89;;745:5;770:6;763:5;756:21;800:4;792:6;788:17;778:27;;822:4;817:3;813:14;806:21;;875:6;922:3;914:4;906:6;902:17;897:3;893:27;890:36;887:2;;;939:1;936;929:12;887:2;964:1;949:206;974:6;971:1;968:13;949:206;;;1032:3;1054:37;1087:3;1075:10;1054:37;;;1042:50;;-1:-1;1115:4;1106:14;;;;1134;;;;;996:1;989:9;949:206;;;953:14;531:630;;;;;;;;1187:722;;1315:3;1308:4;1300:6;1296:17;1292:27;1282:2;;1333:1;1330;1323:12;1282:2;1363:6;1357:13;1385:80;1400:64;1457:6;1400:64;;1385:80;1376:89;;1482:5;1507:6;1500:5;1493:21;1537:4;1529:6;1525:17;1515:27;;1559:4;1554:3;1550:14;1543:21;;1612:6;1659:3;1651:4;1643:6;1639:17;1634:3;1630:27;1627:36;1624:2;;;1676:1;1673;1666:12;1624:2;1701:1;1686:217;1711:6;1708:1;1705:13;1686:217;;;1769:3;1791:48;1835:3;1823:10;1791:48;;;1779:61;;-1:-1;1863:4;1854:14;;;;1882;;;;;1733:1;1726:9;1686:217;;1917:128;1992:13;;2010:30;1992:13;2010:30;;2052:134;2130:13;;2148:33;2130:13;2148:33;;2207:336;;;2321:3;2314:4;2306:6;2302:17;2298:27;2288:2;;2339:1;2336;2329:12;2288:2;-1:-1;2359:20;;2399:18;2388:30;;2385:2;;;2431:1;2428;2421:12;2385:2;2465:4;2457:6;2453:17;2441:29;;2516:3;2508:4;2500:6;2496:17;2486:8;2482:32;2479:41;2476:2;;;2533:1;2530;2523:12;2476:2;2281:262;;;;;;2551:174;2649:13;;2667:53;2649:13;2667:53;;2788:663;;2912:4;2900:9;2895:3;2891:19;2887:30;2884:2;;;2930:1;2927;2920:12;2884:2;2948:20;2963:4;2948:20;;;2939:29;-1:-1;3036:1;3068:49;3113:3;3093:9;3068:49;;;3043:75;;-1:-1;3191:2;3224:49;3269:3;3245:22;;;3224:49;;;3217:4;3210:5;3206:16;3199:75;3139:146;3347:2;3380:49;3425:3;3416:6;3405:9;3401:22;3380:49;;;3373:4;3366:5;3362:16;3355:75;3295:146;2878:573;;;;;3458:130;3525:20;;3550:33;3525:20;3550:33;;3736:263;;3851:2;3839:9;3830:7;3826:23;3822:32;3819:2;;;3867:1;3864;3857:12;3819:2;3902:1;3919:64;3975:7;3955:9;3919:64;;4006:1009;;;;;;;;4222:3;4210:9;4201:7;4197:23;4193:33;4190:2;;;4239:1;4236;4229:12;4190:2;4274:1;4291:53;4336:7;4316:9;4291:53;;;4281:63;;4253:97;4381:2;4399:61;4452:7;4443:6;4432:9;4428:22;4399:61;;;4389:71;;4360:106;4497:2;4515:53;4560:7;4551:6;4540:9;4536:22;4515:53;;;4505:63;;4476:98;4605:2;4623:53;4668:7;4659:6;4648:9;4644:22;4623:53;;;4613:63;;4584:98;4713:3;4732:53;4777:7;4768:6;4757:9;4753:22;4732:53;;;4722:63;;4692:99;4850:3;4839:9;4835:19;4822:33;4875:18;4867:6;4864:30;4861:2;;;4907:1;4904;4897:12;4861:2;4935:64;4991:7;4982:6;4971:9;4967:22;4935:64;;;4925:74;;;;4801:204;4184:831;;;;;;;;;;;5022:491;;;;5160:2;5148:9;5139:7;5135:23;5131:32;5128:2;;;5176:1;5173;5166:12;5128:2;5211:1;5228:53;5273:7;5253:9;5228:53;;;5218:63;;5190:97;5318:2;5336:53;5381:7;5372:6;5361:9;5357:22;5336:53;;;5326:63;;5297:98;5426:2;5444:53;5489:7;5480:6;5469:9;5465:22;5444:53;;;5434:63;;5405:98;5122:391;;;;;;5520:617;;;;;5675:3;5663:9;5654:7;5650:23;5646:33;5643:2;;;5692:1;5689;5682:12;5643:2;5727:1;5744:53;5789:7;5769:9;5744:53;;;5734:63;;5706:97;5834:2;5852:53;5897:7;5888:6;5877:9;5873:22;5852:53;;;5842:63;;5813:98;5942:2;5960:53;6005:7;5996:6;5985:9;5981:22;5960:53;;;5950:63;;5921:98;6050:2;6068:53;6113:7;6104:6;6093:9;6089:22;6068:53;;;6058:63;;6029:98;5637:500;;;;;;;;6144:366;;;6265:2;6253:9;6244:7;6240:23;6236:32;6233:2;;;6281:1;6278;6271:12;6233:2;6316:1;6333:53;6378:7;6358:9;6333:53;;;6323:63;;6295:97;6423:2;6441:53;6486:7;6477:6;6466:9;6462:22;6441:53;;;6431:63;;6402:98;6227:283;;;;;;6517:617;;;;;6672:3;6660:9;6651:7;6647:23;6643:33;6640:2;;;6689:1;6686;6679:12;6640:2;6724:1;6741:53;6786:7;6766:9;6741:53;;;6731:63;;6703:97;6831:2;6849:53;6894:7;6885:6;6874:9;6870:22;6849:53;;;6839:63;;6810:98;6939:2;6957:53;7002:7;6993:6;6982:9;6978:22;6957:53;;;6947:63;;6918:98;7047:2;7065:53;7110:7;7101:6;7090:9;7086:22;7065:53;;7141:377;;7270:2;7258:9;7249:7;7245:23;7241:32;7238:2;;;7286:1;7283;7276:12;7238:2;7321:31;;7372:18;7361:30;;7358:2;;;7404:1;7401;7394:12;7358:2;7424:78;7494:7;7485:6;7474:9;7470:22;7424:78;;7525:392;;7665:2;7653:9;7644:7;7640:23;7636:32;7633:2;;;7681:1;7678;7671:12;7633:2;7716:24;;7760:18;7749:30;;7746:2;;;7792:1;7789;7782:12;7746:2;7812:89;7893:7;7884:6;7873:9;7869:22;7812:89;;7924:257;;8036:2;8024:9;8015:7;8011:23;8007:32;8004:2;;;8052:1;8049;8042:12;8004:2;8087:1;8104:61;8157:7;8137:9;8104:61;;8188:263;;8303:2;8291:9;8282:7;8278:23;8274:32;8271:2;;;8319:1;8316;8309:12;8271:2;8354:1;8371:64;8427:7;8407:9;8371:64;;8458:303;;8593:2;8581:9;8572:7;8568:23;8564:32;8561:2;;;8609:1;8606;8599:12;8561:2;8644:1;8661:84;8737:7;8717:9;8661:84;;8768:311;;8907:2;8895:9;8886:7;8882:23;8878:32;8875:2;;;8923:1;8920;8913:12;8875:2;8958:1;8975:88;9055:7;9035:9;8975:88;;9356:741;;;;;;9530:3;9518:9;9509:7;9505:23;9501:33;9498:2;;;9547:1;9544;9537:12;9498:2;9582:1;9599:53;9644:7;9624:9;9599:53;;;9589:63;;9561:97;9689:2;9707:53;9752:7;9743:6;9732:9;9728:22;9707:53;;;9697:63;;9668:98;9797:2;9815:53;9860:7;9851:6;9840:9;9836:22;9815:53;;;9805:63;;9776:98;9933:2;9922:9;9918:18;9905:32;9957:18;9949:6;9946:30;9943:2;;;9989:1;9986;9979:12;9943:2;10017:64;10073:7;10064:6;10053:9;10049:22;10017:64;;;10007:74;;;;9884:203;9492:605;;;;;;;;;10105:173;;10192:46;10234:3;10226:6;10192:46;;;-1:-1;;10267:4;10258:14;;10185:93;10286:142;10377:45;10416:5;10377:45;;;10372:3;10365:58;10359:69;;;10435:103;10508:24;10526:5;10508:24;;10696:690;;10841:54;10889:5;10841:54;;;10908:86;10987:6;10982:3;10908:86;;;10901:93;;11015:56;11065:5;11015:56;;;11091:7;11119:1;11104:260;11129:6;11126:1;11123:13;11104:260;;;11196:6;11190:13;11217:63;11276:3;11261:13;11217:63;;;11210:70;;11297:60;11350:6;11297:60;;;11287:70;-1:-1;;11151:1;11144:9;11104:260;;;-1:-1;11377:3;;10820:566;-1:-1;;;;;10820:566;11394:113;11477:24;11495:5;11477:24;;11537:310;;11669:88;11750:6;11745:3;11669:88;;;11662:95;;11769:43;11805:6;11800:3;11793:5;11769:43;;;-1:-1;;11825:16;;11655:192;11855:343;;11965:38;11997:5;11965:38;;;12015:70;12078:6;12073:3;12015:70;;;12008:77;;12090:52;12135:6;12130:3;12123:4;12116:5;12112:16;12090:52;;;12163:29;12185:6;12163:29;;;12154:39;;;;11945:253;-1:-1;;;11945:253;12205:356;;12333:38;12365:5;12333:38;;;12383:88;12464:6;12459:3;12383:88;;;12376:95;;12476:52;12521:6;12516:3;12509:4;12502:5;12498:16;12476:52;;;12540:16;;;;;12313:248;-1:-1;;12313:248;12923:327;;13083:67;13147:2;13142:3;13083:67;;;13183:29;13163:50;;13241:2;13232:12;;13069:181;-1:-1;;13069:181;13259:330;;13419:67;13483:2;13478:3;13419:67;;;13519:32;13499:53;;13580:2;13571:12;;13405:184;-1:-1;;13405:184;13598:330;;13758:67;13822:2;13817:3;13758:67;;;13858:32;13838:53;;13919:2;13910:12;;13744:184;-1:-1;;13744:184;13937:378;;14097:67;14161:2;14156:3;14097:67;;;14197:34;14177:55;;-1:-1;;;14261:2;14252:12;;14245:33;14306:2;14297:12;;14083:232;-1:-1;;14083:232;14324:320;;14484:67;14548:2;14543:3;14484:67;;;-1:-1;;;14564:43;;14635:2;14626:12;;14470:174;-1:-1;;14470:174;14653:330;;14813:67;14877:2;14872:3;14813:67;;;14913:32;14893:53;;14974:2;14965:12;;14799:184;-1:-1;;14799:184;14992:372;;15152:67;15216:2;15211:3;15152:67;;;15252:34;15232:55;;-1:-1;;;15316:2;15307:12;;15300:27;15355:2;15346:12;;15138:226;-1:-1;;15138:226;15373:330;;15533:67;15597:2;15592:3;15533:67;;;15633:32;15613:53;;15694:2;15685:12;;15519:184;-1:-1;;15519:184;15712:329;;15872:67;15936:2;15931:3;15872:67;;;15972:31;15952:52;;16032:2;16023:12;;15858:183;-1:-1;;15858:183;16050:325;;16210:67;16274:2;16269:3;16210:67;;;16310:27;16290:48;;16366:2;16357:12;;16196:179;-1:-1;;16196:179;16384:296;;16561:83;16642:1;16637:3;16561:83;;16689:332;;16849:67;16913:2;16908:3;16849:67;;;16949:34;16929:55;;17012:2;17003:12;;16835:186;-1:-1;;16835:186;17030:329;;17190:67;17254:2;17249:3;17190:67;;;17290:31;17270:52;;17350:2;17341:12;;17176:183;-1:-1;;17176:183;17368:330;;17528:67;17592:2;17587:3;17528:67;;;17628:32;17608:53;;17689:2;17680:12;;17514:184;-1:-1;;17514:184;17707:323;;17867:67;17931:2;17926:3;17867:67;;;17967:25;17947:46;;18021:2;18012:12;;17853:177;-1:-1;;17853:177;18158:439;;18358:93;18447:3;18438:6;18358:93;;;18351:100;;18469:103;18568:3;18559:6;18551;18469:103;;18604:370;;18802:147;18945:3;18802:147;;18981:213;19099:2;19084:18;;19113:71;19088:9;19157:6;19113:71;;19201:647;19429:3;19414:19;;19444:79;19418:9;19496:6;19444:79;;;19534:72;19602:2;19591:9;19587:18;19578:6;19534:72;;;19617;19685:2;19674:9;19670:18;19661:6;19617:72;;;19737:9;19731:4;19727:20;19722:2;19711:9;19707:18;19700:48;19762:76;19833:4;19824:6;19762:76;;19855:435;20029:2;20014:18;;20043:71;20018:9;20087:6;20043:71;;;20125:72;20193:2;20182:9;20178:18;20169:6;20125:72;;;20208;20276:2;20265:9;20261:18;20252:6;20208:72;;20297:324;20443:2;20428:18;;20457:71;20432:9;20501:6;20457:71;;;20539:72;20607:2;20596:9;20592:18;20583:6;20539:72;;20628:361;20796:2;20810:47;;;20781:18;;20871:108;20781:18;20965:6;20871:108;;20996:435;21170:2;21155:18;;21184:71;21159:9;21228:6;21184:71;;;21266:72;21334:2;21323:9;21319:18;21310:6;21266:72;;21438:301;21576:2;21590:47;;;21561:18;;21651:78;21561:18;21715:6;21651:78;;21746:407;21937:2;21951:47;;;21922:18;;22012:131;21922:18;22012:131;;22160:407;22351:2;22365:47;;;22336:18;;22426:131;22336:18;22426:131;;22574:407;22765:2;22779:47;;;22750:18;;22840:131;22750:18;22840:131;;22988:407;23179:2;23193:47;;;23164:18;;23254:131;23164:18;23254:131;;23402:407;23593:2;23607:47;;;23578:18;;23668:131;23578:18;23668:131;;23816:407;24007:2;24021:47;;;23992:18;;24082:131;23992:18;24082:131;;24230:407;24421:2;24435:47;;;24406:18;;24496:131;24406:18;24496:131;;24644:407;24835:2;24849:47;;;24820:18;;24910:131;24820:18;24910:131;;25058:407;25249:2;25263:47;;;25234:18;;25324:131;25234:18;25324:131;;25472:407;25663:2;25677:47;;;25648:18;;25738:131;25648:18;25738:131;;25886:407;26077:2;26091:47;;;26062:18;;26152:131;26062:18;26152:131;;26300:407;26491:2;26505:47;;;26476:18;;26566:131;26476:18;26566:131;;26714:407;26905:2;26919:47;;;26890:18;;26980:131;26890:18;26980:131;;27128:407;27319:2;27333:47;;;27304:18;;27394:131;27304:18;27394:131;;27542:213;27660:2;27645:18;;27674:71;27649:9;27718:6;27674:71;;27762:324;27908:2;27893:18;;27922:71;27897:9;27966:6;27922:71;;28535:256;28597:2;28591:9;28623:17;;;28698:18;28683:34;;28719:22;;;28680:62;28677:2;;;28755:1;28752;28745:12;28677:2;28771;28764:22;28575:216;;-1:-1;28575:216;28798:304;;28957:18;28949:6;28946:30;28943:2;;;28989:1;28986;28979:12;28943:2;-1:-1;29024:4;29012:17;;;29077:15;;28880:222;29420:151;29544:4;29535:14;;29492:79;29578:137;29681:12;;29652:63;30095:178;30213:19;;;30262:4;30253:14;;30206:67;30453:144;30588:3;30566:31;-1:-1;30566:31;30777:91;;30839:24;30857:5;30839:24;;30981:85;31047:13;31040:21;;31023:43;31073:72;31135:5;31118:27;31152:111;;31234:24;31252:5;31234:24;;31270:121;-1:-1;;;;;31332:54;;31315:76;31477:129;;31564:37;31595:5;31564:37;;31857:145;31938:6;31933:3;31928;31915:30;-1:-1;31994:1;31976:16;;31969:27;31908:94;32011:268;32076:1;32083:101;32097:6;32094:1;32091:13;32083:101;;;32164:11;;;32158:18;32145:11;;;32138:39;32119:2;32112:10;32083:101;;;32199:6;32196:1;32193:13;32190:2;;;-1:-1;;32264:1;32246:16;;32239:27;32060:219;32287:97;32375:2;32355:14;-1:-1;;32351:28;;32335:49;32392:117;32461:24;32479:5;32461:24;;;32454:5;32451:35;32441:2;;32500:1;32497;32490:12;32656:111;32722:21;32737:5;32722:21;;32774:117;32843:24;32861:5;32843:24;;32898:157;32987:44;33025:5;32987:44;", - "source": "/*\n Dedge's Aave and Compound manager\n*/\n\npragma solidity 0.5.16;\npragma experimental ABIEncoderV2;\n\n\nimport \"../lib/compound/CompoundBase.sol\";\n\nimport \"../lib/dapphub/Guard.sol\";\n\nimport \"../lib/uniswap/UniswapLiteBase.sol\";\n\nimport \"../interfaces/aave/ILendingPoolAddressesProvider.sol\";\nimport \"../interfaces/aave/ILendingPool.sol\";\nimport \"../interfaces/aave/ILendingPoolParametersProvider.sol\";\n\nimport \"../interfaces/compound/ICompoundPriceOracle.sol\";\nimport \"../interfaces/compound/IComptroller.sol\";\nimport \"../interfaces/compound/ICEther.sol\";\nimport \"../interfaces/compound/ICToken.sol\";\n\nimport \"../interfaces/IERC20.sol\";\n\nimport \"../registries/AddressRegistry.sol\";\n\nimport \"../proxies/DACProxy.sol\";\n\nimport \"@openzeppelin/contracts/math/SafeMath.sol\";\n\ncontract DedgeCompoundManager is UniswapLiteBase, CompoundBase {\n using SafeMath for uint;\n\n struct SwapOperationCalldata {\n address addressRegistryAddress;\n address oldCTokenAddress;\n address newCTokenAddress;\n }\n\n function _proxyGuardPermit(address payable proxyAddress, address src) internal {\n address g = address(DACProxy(proxyAddress).authority());\n\n DSGuard(g).permit(\n bytes32(bytes20(address(src))),\n DSGuard(g).ANY(),\n DSGuard(g).ANY()\n );\n }\n\n function _proxyGuardForbid(address payable proxyAddress, address src) internal {\n address g = address(DACProxy(proxyAddress).authority());\n\n DSGuard(g).forbid(\n bytes32(bytes20(address(src))),\n DSGuard(g).ANY(),\n DSGuard(g).ANY()\n );\n }\n\n function swapDebtPostLoan(\n uint _loanAmount,\n uint _aaveFee,\n uint _protocolFee,\n bytes calldata _data\n ) external {\n SwapOperationCalldata memory soCalldata = abi.decode(_data, (SwapOperationCalldata));\n\n AddressRegistry addressRegistry = AddressRegistry(soCalldata.addressRegistryAddress);\n\n address oldCTokenAddress = soCalldata.oldCTokenAddress;\n address newCTokenAddress = soCalldata.newCTokenAddress;\n\n uint debtAmount = _loanAmount.add(_aaveFee).add(_protocolFee);\n\n // Note: debtAmount = loanAmount + fees\n // 1. Has ETH from Aave flashloan\n // 2. Converts ETH to oldCToken underlying\n // 3. Repays oldCToken underlying\n // 4. Calculates new amount to borrow from new token to repay debtAmount\n // 5. Borrows from new token\n // 6. Convert new token to ETH\n\n // Steps 2 + 3\n // Converts ETH to oldCToken underlying and repay\n // Unless old target underlying is already ether\n if (oldCTokenAddress == addressRegistry.CEtherAddress()) {\n repayBorrow(oldCTokenAddress, _loanAmount);\n } else {\n // Gets old token underlying and amount\n address oldTokenUnderlying = ICToken(oldCTokenAddress).underlying();\n\n uint oldTokenUnderlyingAmount = _ethToToken(\n oldTokenUnderlying,\n _loanAmount\n );\n\n // Approves CToken proxy and repays them\n IERC20(oldTokenUnderlying)\n .approve(oldCTokenAddress, oldTokenUnderlyingAmount);\n\n // Repays CToken\n repayBorrow(oldCTokenAddress, oldTokenUnderlyingAmount);\n }\n\n // Steps 4, 5, 6\n // Calculates new debt amount to borrow\n // Unless new target underlying is already ether\n if (newCTokenAddress == addressRegistry.CEtherAddress()) {\n borrow(newCTokenAddress, debtAmount);\n } else {\n // Gets new token underlying\n address newTokenUnderlying = ICToken(newCTokenAddress).underlying();\n\n // Calculates amount of old token underlying that needs to be borrowed\n // to repay debts\n uint newTokenUnderlyingAmount = _getTokenToEthOutput(\n newTokenUnderlying,\n debtAmount\n );\n\n // Borrows new debt\n borrow(newCTokenAddress, newTokenUnderlyingAmount);\n\n // Converts to ether\n // Note this part is a bit more strict as we need to have\n // enough ETH to repay Aave\n _tokenToEth(newTokenUnderlying, newTokenUnderlyingAmount, debtAmount);\n }\n }\n\n function swapCollateralPostLoan(\n uint _loanAmount,\n uint _aaveFee,\n uint _protocolFee,\n bytes calldata _data\n ) external {\n SwapOperationCalldata memory soCalldata = abi.decode(_data, (SwapOperationCalldata));\n\n AddressRegistry addressRegistry = AddressRegistry(soCalldata.addressRegistryAddress);\n\n address oldCTokenAddress = soCalldata.oldCTokenAddress;\n address newCTokenAddress = soCalldata.newCTokenAddress;\n\n // 1. Has ETH from Aave flashloan\n // 2. Converts ETH into newCToken underlying\n // 3. Supplies newCToken underlying\n // 4. Redeems oldCToken underlying\n // 5. Converts outCToken underlying to ETH\n // 6. Borrow ETH to repay aave\n\n // Steps 2 + 3\n // Converts ETH to newCToken underlying and supply\n // Unless old target underlying is already ether\n uint repayAmount = _loanAmount.sub(_aaveFee).sub(_protocolFee);\n\n if (newCTokenAddress == addressRegistry.CEtherAddress()) {\n supply(newCTokenAddress, repayAmount);\n } else {\n // Gets new token underlying and converts ETH into newCToken underlying\n address newTokenUnderlying = ICToken(newCTokenAddress).underlying();\n uint newTokenUnderlyingAmount = _ethToToken(\n newTokenUnderlying,\n repayAmount\n );\n\n // Supplies new CTokens\n supply(newCTokenAddress, newTokenUnderlyingAmount);\n }\n\n // Steps 4, 5\n // Redeem CToken underlying\n if (oldCTokenAddress == addressRegistry.CEtherAddress()) {\n redeemUnderlying(oldCTokenAddress, _loanAmount);\n } else {\n // Gets old token underlying and amount to redeem (based on uniswap)\n address oldTokenUnderlying = ICToken(oldCTokenAddress).underlying();\n uint oldTokenUnderlyingAmount = _getTokenToEthOutput(oldTokenUnderlying, _loanAmount);\n\n // Redeems them\n redeemUnderlying(oldCTokenAddress, oldTokenUnderlyingAmount);\n\n // Converts them into ETH\n _tokenToEth(oldTokenUnderlying, oldTokenUnderlyingAmount, _loanAmount);\n }\n }\n\n /*\n Main entry point for swapping collateral / debt\n\n @params:\n\n dedgeCompoundManagerAddress: Dedge Compound Manager address\n dacProxyAddress: User's proxy address\n addressRegistryAddress: AddressRegistry's Address\n oldCTokenAddress: oldCToken address\n oldTokenUnderlyingDelta: Amount of tokens to swap from old c token's underlying\n executeOperationCalldataParams:\n Abi-encoded `data` used by User's proxy's `execute(address, )` function.\n Used to delegatecall to another contract (i.e. this contract) in the context\n of the proxy. This allows us to decouple the logic of handling flashloans\n from the proxy contract. In this specific case, it is expecting the results\n from: (from JS)\n\n ```\n const IDedgeCompoundManager = ethers.utils.Interface(DedgeCompoundManager.abi)\n\n const executeOperationCalldataParams = IDedgeCompoundManager\n .functions\n .swapDebt OR .swapCollateral\n .encode([\n \n ])\n ```\n */\n function swapOperation(\n address dedgeCompoundManagerAddress,\n address payable dacProxyAddress,\n address addressRegistryAddress,\n address oldCTokenAddress, // Old CToken address for [debt|collateral]\n uint oldTokenUnderlyingDelta, // Amount of old tokens to swap to new tokens\n bytes calldata executeOperationCalldataParams\n ) external {\n // Calling from dacProxy context (msg.sender is dacProxy)\n // 1. Get amount of ETH obtained by selling that from Uniswap\n // 2. Flashloans ETH to dacProxy\n\n // Gets registries\n AddressRegistry addressRegistry = AddressRegistry(addressRegistryAddress);\n\n // 1. Get amount of ETH needed\n // If the old target is ether than the ethDebtAmount is just the delta\n uint ethDebtAmount;\n\n if (oldCTokenAddress == addressRegistry.CEtherAddress()) {\n ethDebtAmount = oldTokenUnderlyingDelta;\n } else {\n // Otherwise calculate it from the exchange\n ethDebtAmount = _getEthToTokenOutput(\n ICToken(oldCTokenAddress).underlying(),\n oldTokenUnderlyingDelta\n );\n }\n\n // Injects the target address into calldataParams\n // so user proxy know which address it'll be calling `calldataParams` on\n bytes memory addressAndExecuteOperationCalldataParams = abi.encodePacked(\n abi.encode(dedgeCompoundManagerAddress),\n executeOperationCalldataParams\n );\n\n ILendingPool lendingPool = ILendingPool(\n ILendingPoolAddressesProvider(\n addressRegistry.AaveLendingPoolAddressProviderAddress()\n ).getLendingPool()\n );\n\n // Approve lendingPool to call proxy\n _proxyGuardPermit(dacProxyAddress, address(lendingPool));\n\n // 3. Flashloan ETH with relevant data\n lendingPool.flashLoan(\n dacProxyAddress,\n addressRegistry.AaveEthAddress(),\n ethDebtAmount,\n addressAndExecuteOperationCalldataParams\n );\n\n // Forbids lendingPool to call proxy\n _proxyGuardForbid(dacProxyAddress, address(lendingPool));\n }\n\n // Clears dust debt by swapping old debt into new debt\n function clearDebtDust(\n address addressRegistryAddress,\n address oldCTokenAddress,\n uint oldTokenUnderlyingDustAmount,\n address newCTokenAddress\n ) public payable {\n // i.e. Has 0.1 ETH (oldCToken) debt 900 DAI (newCToken)\n // wants to have it all in DAI\n\n // 0. Calculates 0.1 ETH equilavent in DAI\n // 1. Borrows out 0.1 ETH equilavent in DAI (~10 DAI as of march 2020)\n // 2. Convert 10 DAI into 0.1 ETH\n // 3. Repay 0.1 ETH\n\n require(oldCTokenAddress != newCTokenAddress, \"clear-debt-same-address\");\n\n AddressRegistry addressRegistry = AddressRegistry(addressRegistryAddress);\n\n uint borrowAmount;\n address oldTokenUnderlying;\n address newTokenUnderlying;\n\n if (oldCTokenAddress == addressRegistry.CEtherAddress()) {\n // ETH -> Token\n newTokenUnderlying = ICToken(newCTokenAddress).underlying();\n\n // Calculates ETH equilavent in token\n borrowAmount = _getTokenToEthOutput(newTokenUnderlying, oldTokenUnderlyingDustAmount);\n\n // Borrows out equilavent token\n borrow(newCTokenAddress, borrowAmount);\n\n // Converts token to ETH\n _tokenToEth(newTokenUnderlying, borrowAmount, oldTokenUnderlyingDustAmount);\n } else if (newCTokenAddress == addressRegistry.CEtherAddress()) {\n // Token -> ETH\n oldTokenUnderlying = ICToken(oldCTokenAddress).underlying();\n\n // Calculates token equilavent in ETH\n borrowAmount = _getEthToTokenOutput(oldTokenUnderlying, oldTokenUnderlyingDustAmount);\n\n // Borrows out equilavent ETH\n borrow(newCTokenAddress, borrowAmount);\n\n // Converts ETH to token\n _ethToToken(oldTokenUnderlying, borrowAmount, oldTokenUnderlyingDustAmount);\n } else {\n // token -> token\n oldTokenUnderlying = ICToken(oldCTokenAddress).underlying();\n newTokenUnderlying = ICToken(newCTokenAddress).underlying();\n\n // Calculates eth borrow amount\n uint ethAmount = _getEthToTokenOutput(oldTokenUnderlying, oldTokenUnderlyingDustAmount);\n\n // Calculates token borrow amount\n borrowAmount = _getTokenToEthOutput(newTokenUnderlying, ethAmount);\n\n // Borrows out equilavent token\n borrow(newCTokenAddress, borrowAmount);\n\n // Converts old token to target token\n _tokenToEth(newTokenUnderlying, borrowAmount, ethAmount);\n _ethToToken(oldTokenUnderlying, ethAmount, oldTokenUnderlyingDustAmount);\n }\n\n // Repays borrowed\n repayBorrow(oldCTokenAddress, oldTokenUnderlyingDustAmount);\n }\n\n function clearCollateralDust(\n address addressRegistryAddress,\n address oldCTokenAddress,\n uint oldTokenUnderlyingAmount,\n address newCTokenAddress\n ) public payable {\n // i.e. Has 10 ETH collateral and 10 DAI collateral\n // wants to have it all in ETH\n\n // 1. Redeems 10 DAI collateral\n // 2. Converts it to ETH\n // 3. Puts it into ETH\n\n // More abstractly,\n // 1. Redeems tokens\n // 2. Convert it to other token\n // 3. Put other token in\n\n require(oldCTokenAddress != newCTokenAddress, \"clear-collateral-same-address\");\n\n uint supplyAmount;\n AddressRegistry addressRegistry = AddressRegistry(addressRegistryAddress);\n\n // Redeems collateral\n redeemUnderlying(oldCTokenAddress, oldTokenUnderlyingAmount);\n\n if (oldCTokenAddress == addressRegistry.CEtherAddress()) {\n // ETH -> Token\n supplyAmount = _ethToToken(\n ICToken(newCTokenAddress).underlying(),\n oldTokenUnderlyingAmount\n );\n } else if (newCTokenAddress == addressRegistry.CEtherAddress()) {\n // Token -> ETH\n supplyAmount = _tokenToEth(\n ICToken(oldCTokenAddress).underlying(),\n oldTokenUnderlyingAmount\n );\n } else {\n // Token -> Token\n supplyAmount = _tokenToToken(\n ICToken(oldCTokenAddress).underlying(),\n ICToken(newCTokenAddress).underlying(),\n oldTokenUnderlyingAmount\n );\n }\n\n // Supplies collateral\n supply(newCTokenAddress, supplyAmount);\n }\n}\n", + "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"approveCToken\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"cTokens\",\"type\":\"address[]\"}],\"name\":\"approveCTokens\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"borrow\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"borrowThroughProxy\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"cTokens\",\"type\":\"address[]\"}],\"name\":\"enterMarkets\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"cTokens\",\"type\":\"address[]\"}],\"name\":\"enterMarketsAndApproveCTokens\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"}],\"name\":\"getBorrowBalanceUnderlying\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"redeemTokens\",\"type\":\"uint256\"}],\"name\":\"redeem\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"redeemThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"redeemTokens\",\"type\":\"uint256\"}],\"name\":\"redeemUnderlying\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"redeemUnderlyingThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowBehalf\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowBehalfThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"supply\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"supplyCToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"supplyAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"borrowCToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"supplyAndBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"supplyETH\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"supplyETHAndBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"supplyThroughProxy\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_loanAmount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_aaveFee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_protocolFee\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"swapCollateralPostLoan\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_loanAmount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_aaveFee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_protocolFee\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"swapDebtPostLoan\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"dedgeCompoundManagerAddress\",\"type\":\"address\"},{\"internalType\":\"address payable\",\"name\":\"dacProxyAddress\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"addressRegistryAddress\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"oldCTokenAddress\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"oldTokenUnderlyingDelta\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"newCTokenAddress\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"executeOperationCalldataParams\",\"type\":\"bytes\"}],\"name\":\"swapOperation\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"dedgeCompoundManagerAddress\",\"type\":\"address\"},{\"internalType\":\"address payable\",\"name\":\"dacProxyAddress\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"addressRegistryAddress\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"oldCTokenAddress\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"oldTokenUnderlyingDelta\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"newCTokenAddress\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"executeOperationCalldataParams\",\"type\":\"bytes\"}],\"name\":\"swapOperationAndClearCollateralDust\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeCompoundManager.sol\":\"DedgeCompoundManager\"},\"evmVersion\":\"constantinople\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol\":{\"keccak256\":\"0xe3762e63e74657a066e6fe281ec694e366ca86f6378470304c646b4e785e09f3\",\"urls\":[\"bzz-raw://67607850cbce7ffa66356dd28412e64ff58f62fa7c709f5fa28306b8be9050a7\",\"dweb:/ipfs/QmUaFhH5a6rQ8yJG2A6zJJ1ds9txqxr8ytxd2s7bhiNX35\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/ISafeERC20.sol\":{\"keccak256\":\"0xec78efb83d1275fbeb9d431938447eaabbff72deea196deea04b4873ee5a9f54\",\"urls\":[\"bzz-raw://7b50edf0121dc6286c5b93fd7ddc85edfbb719c91faf3ffd22957436c5b4763c\",\"dweb:/ipfs/QmSRUJaEp3QP71SG1V668qzXAzEj7YezhJ6AKdNqunH6dj\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/IFlashLoanReceiver.sol\":{\"keccak256\":\"0xbd9ee17614d720229da04b4d481b2e6669b5fd9217bc278a93b39a62e2383fde\",\"urls\":[\"bzz-raw://4827232c7582d13c0237ae80b47e2f3dd85499372d80a15c0f31599bb99e26a5\",\"dweb:/ipfs/QmX3mCBdQcCvL9WF5FwToZZpj6VBtkaoN9aZ1tszp7oVjt\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol\":{\"keccak256\":\"0xe1a1b1bbf6dc92e86a23b8af9cf04e3e527b766ed1147cce041080d01ede5a24\",\"urls\":[\"bzz-raw://c0a7bf8948392f8f7249a99d39ac0722840faea5767c2f97939657e281d318f5\",\"dweb:/ipfs/QmRmSmKfgegjtAnpQ6t3ucEiq9GUrfYPpi7XucjREHjYFd\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol\":{\"keccak256\":\"0x0b99a26eeba60b8201f6ffd0d9d00bc5562ace9e7998534fd3887d7ba72b7d88\",\"urls\":[\"bzz-raw://9a36c107f3471548d6a13d28e995cb71ef42bafd55bf759b7c1b0ba0fda7170c\",\"dweb:/ipfs/Qme6SJJ3A9MwVwzk6CJC9gN8jAWLkgWQUwzZU4k6eD4BNy\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolParametersProvider.sol\":{\"keccak256\":\"0x90ace0fd5238a92b39b3fad095c046c2707c3027116c7d5f7e80863ca74eb00d\",\"urls\":[\"bzz-raw://068f20bedbbe8f4faff599106162f7c7ede426a689f22c16dc9643bd17268755\",\"dweb:/ipfs/QmVSCkLZ8JD17DvsWtYMBcuZdF3JZpZM9khMbvYFarYGTs\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol\":{\"keccak256\":\"0x309afa791633faf166083968588cc12d10b511fea04522d9645cbd6469a6bcbe\",\"urls\":[\"bzz-raw://6ae438b67af64e89c742848ede981932ebc2b7238e2f147c8620d4048fd75885\",\"dweb:/ipfs/QmYZmAKfjvY3hS27hn1qcPBtegrQPELgc5YMXwybm5vBra\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol\":{\"keccak256\":\"0xf2fc635f3c28b641fa8dc95be41b6d7ab7f7d2bacfe9c2c37c1c0d22aac0afad\",\"urls\":[\"bzz-raw://767766022c3d3e172a71bd781eff9d92e938efc3e2d5708a90929491f2e0af15\",\"dweb:/ipfs/QmSkT4Jy2X54hYvDJG6PrX2tzdPvbK6WYtpBSJF7PDyVdp\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICompoundPriceOracle.sol\":{\"keccak256\":\"0xb19ae717f5b05fbc0ffdf3a4b96cd71811071ab2d3c5f73ee8835541c5bd573b\",\"urls\":[\"bzz-raw://52efc7166851b50b539166f234babc41cf25a4cc2c5997c9bc3f801117b4ea47\",\"dweb:/ipfs/QmXv2P3p6adgTCHUMXdufESTbJEdbQ3DkLKRnsENRC1Dmx\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol\":{\"keccak256\":\"0xc69ade89655263aaffac1183c0e842ea95294171280f2c5ab755286a66de3ff9\",\"urls\":[\"bzz-raw://742ca904eaf238a83270e315410b35e83048ee0c6529190be2ae9f9bc20e6187\",\"dweb:/ipfs/QmPW3WFbHZjsGQ6vMgPRPWHCNJLNxyEbR4w1DAvd466N51\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol\":{\"keccak256\":\"0xde1a310030b2b654b9c1e7782e94d7f00be0172c32dc4e99a7c168dd53d72843\",\"urls\":[\"bzz-raw://6a8b12cff637c3a1b025bd90a3c75524e53207c457b770bf22800df883fff45d\",\"dweb:/ipfs/QmSJXJDH5jiCkU11Xn7KeVTMoS64xg2XQ5hWGqQhMEnrmX\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol\":{\"keccak256\":\"0x0d2a2e2c0811bd1e9e757a1a804366cef39120f7eec3bffbcd8802afbf5d6f4b\",\"urls\":[\"bzz-raw://f5d9e36f7f3c6a0771d3656a1b1088f27d82f1f242579fe71e10b2d49aaac5b9\",\"dweb:/ipfs/QmZTjArdX13p6EGRD7fZuros5Wjs52usvNbxSavbLoRgZn\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/BytesLib.sol\":{\"keccak256\":\"0x2127d94e9d0443c4f0a5a8ebd8fd8746c7ea4e4d3849e3a45c41943019571ea7\",\"urls\":[\"bzz-raw://dbe24f863129a5062658ec1e6bc2695d7427dd8783aec86903125867f6343a4f\",\"dweb:/ipfs/QmfX7eArFhPnTa1bwjpfse3ni6EapoHfzuhdXxMxKU8kNb\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/aave/FlashLoanReceiverBase.sol\":{\"keccak256\":\"0x0a3802a7d1bf99d7ccb8046f2632f0a3fa42ebea5e1033cc13eb843b32cbf4c3\",\"urls\":[\"bzz-raw://68a6bcf9ccfe8d72448c3d3dadd328b14a741ba9d24e5aa20ad82b72c7108a7b\",\"dweb:/ipfs/QmeprLqp3jFqbxmNwuZ8Vm2EdeKp5idQZi4VSCLQZa28qY\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/compound/CompoundBase.sol\":{\"keccak256\":\"0x162469a515591e97cc23fc40f18d3fa339e0c7e6fa0eb58f23795280047f54d6\",\"urls\":[\"bzz-raw://d7ce11b588c634ca71e0bdbd142394a2ffc7563dfd438e7d5402f4907ea8a845\",\"dweb:/ipfs/QmYkYqBFbNx8H8p4CUmeTHj8ehBb5oEaec2trR4HZyb3RK\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol\":{\"keccak256\":\"0x7636abae52593354ed288e67b6c2e5e1df218f753f6c253ae691cb5252274cf1\",\"urls\":[\"bzz-raw://d66e47ce74476c103bb8a1b11d618232276d4b57badfd7d96a45e9c881e83543\",\"dweb:/ipfs/QmXMWVNLRdiBHmnTx1c2DFvidnXpFuiy4CMh2T2avWEQ2h\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol\":{\"keccak256\":\"0xf38f1b725d7568da1b3a210190566e00daa3f241accba9fd6a906ae48e62b151\",\"urls\":[\"bzz-raw://83abf26fe875dd5599abfa2c9b387cb3ce7e70b4fe3ae0b3e2127f807b708ea1\",\"dweb:/ipfs/QmRntwBkLrh8SosWWsM1aC2cP7wMswCPuBKLmJzgQB1xeY\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol\":{\"keccak256\":\"0xc1440658c9e69c115e90b60f1a3b424155d9f0fa495a689bce0a202d8daf1df7\",\"urls\":[\"bzz-raw://dc3c2c615db44839d9353908fa2935cab29e0739ef559f00397724b904e5187f\",\"dweb:/ipfs/Qma5uk2NoqVnZgZF3fCXPRfkZMbxfEKuYo6NABq79We1t1\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol\":{\"keccak256\":\"0x36bff82bc9233b5ee86b50df83efb4915c50d3c5716e9bc463b290ab87a4b6bb\",\"urls\":[\"bzz-raw://486f7dfeaa00779677f8e139c54fb3f7f8043f66fe344ec35bd5d3873205f77e\",\"dweb:/ipfs/QmUVwqSEod9L97Cqz1fPv9jXPescnR4vNXAm4zdf2gZmgv\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapLiteBase.sol\":{\"keccak256\":\"0x1058669a50e9c5b2dce70aae66723a01e68e167deb9c3b89ea371cc0038d5dc4\",\"urls\":[\"bzz-raw://3bfffd813909b4322374f3a1b179b10469669ad71fdb6c37f081784453febe05\",\"dweb:/ipfs/QmUFhAH2JxQGdYHRmjVMALuC9e17bZEGKMK7XwGWQwsqn7\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeCompoundManager.sol\":{\"keccak256\":\"0x5b89b3a668de7664f307d5209c3f3d2dc867a8b69b952427e699ac3fcbaeffbd\",\"urls\":[\"bzz-raw://4a1e0c5ce8afb12131bfdf962f8f1f8a7feca7a78a8756cf87e7c3351ee3fb7f\",\"dweb:/ipfs/QmV4AJoF5otkXgaYh7JvAYifJcfKc3ZxZi97au3LoWkPjZ\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol\":{\"keccak256\":\"0xfcd524540f6e01a5ef58192d42d87d296fad5a0d13dd883c1b5b604435befd97\",\"urls\":[\"bzz-raw://398eb7da5785008a974d476886bf95ed1793b4e5f19b56735dba4f998217ad75\",\"dweb:/ipfs/QmQtViYpthTUNzdgv4AEhSW6wMFneE5AdLerMf4q5eWWzN\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol\":{\"keccak256\":\"0x0f9a1a23e6eabb0a3cd78e2e2a0b23b15f8d175ab02d71aac63eb6e38fb82657\",\"urls\":[\"bzz-raw://6cdf61439a849257726d6fe87cc5455c008763485170f2609ed477a3f3dc0d68\",\"dweb:/ipfs/QmbLvvK3AmCaSKPXSnHNsd5iWMFzCr9HEd4cPmbPLZxZKs\"]},\"@openzeppelin/contracts/math/SafeMath.sol\":{\"keccak256\":\"0x640b6dee7a4b830bdfd52b5031a07fc2b12209f5b2e29e5d364a7d37f69d8076\",\"urls\":[\"bzz-raw://31113152e1ddb78fe7a4197f247591ca894e93f916867beb708d8e747b6cc74f\",\"dweb:/ipfs/QmbZaJyXdpsYGykVhHH9qpVGQg9DGCxE2QufbCUy3daTgq\"]},\"@openzeppelin/contracts/utils/Address.sol\":{\"keccak256\":\"0x1a8e5072509c5ea7365eb1d48030b9be865140c8fb779968da0a459a0e174a11\",\"urls\":[\"bzz-raw://03335b7b07c7c8c8d613cfdd8ec39a0b5ec133ee510bf2fe6cc5a496767bef4b\",\"dweb:/ipfs/Qmebp4nzPja645c9yXSdJkGq96oU3am3LUnG2K3R7XxyKf\"]}},\"version\":1}", + "bytecode": "0x608060405234801561001057600080fd5b50613312806100206000396000f3fe60806040526004361061014b5760003560e01c806396294178116100b6578063c29982381161006f578063c2998238146102eb578063c8b88e481461030b578063d2f70c401461032b578063d882dc6c1461034b578063dc08fa9d1461035e578063f2b9fdb8146103945761014b565b8063962941781461025f5780639a22a1b914610272578063abdb5ea814610292578063b14886ee146102a5578063b16f18d0146102c5578063ba59154f146102d85761014b565b80634907b8fc116101085780634907b8fc146101eb5780634b8a3529146101f357806359086a5e1461021357806367600cc21461022657806375d40945146102395780637720cc871461024c5761014b565b80630b4e0630146101505780631e9a69501461016557806324d1ea12146101785780632d8af543146101985780633dc4d99a146101b857806341ec5cc4146101d8575b600080fd5b61016361015e36600461290e565b6103a7565b005b61016361017336600461290e565b6103e5565b34801561018457600080fd5b50610163610193366004612a81565b610489565b3480156101a457600080fd5b506101636101b336600461299f565b6107be565b3480156101c457600080fd5b506101636101d336600461299f565b6107d3565b6101636101e636600461290e565b610846565b610163610858565b3480156101ff57600080fd5b5061016361020e36600461290e565b6108c2565b6101636102213660046128c1565b61095d565b61016361023436600461290e565b610a93565b61016361024736600461293e565b610aa8565b61016361025a3660046128c1565b610ac2565b61016361026d36600461290e565b610afd565b34801561027e57600080fd5b5061016361028d36600461290e565b610b98565b6101636102a036600461290e565b610ba2565b3480156102b157600080fd5b506101636102c0366004612a81565b610cc5565b6101636102d336600461280d565b610f63565b6101636102e636600461290e565b6112c7565b3480156102f757600080fd5b5061016361030636600461299f565b611301565b34801561031757600080fd5b50610163610326366004612755565b6113da565b34801561033757600080fd5b5061016361034636600461290e565b6114a5565b61016361035936600461290e565b6115bc565b34801561036a57600080fd5b5061037e61037936600461271b565b6115c6565b60405161038b9190613185565b60405180910390f35b6101636103a236600461290e565b61167d565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed5146103d7576103d733308484611796565b6103e1828261167d565b5050565b60405163db006a7560e01b81526001600160a01b0383169063db006a7590610411908490600401613185565b602060405180830381600087803b15801561042b57600080fd5b505af115801561043f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104639190810190612a27565b156103e15760405162461bcd60e51b8152600401610480906130c5565b60405180910390fd5b6104916124b9565b61049d82840184612a63565b805160208201516040830151929350909160006104d0886104c48c8c63ffffffff6118aa16565b9063ffffffff6118aa16565b9050836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561050b57600080fd5b505afa15801561051f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061054391908101906126fd565b6001600160a01b0316836001600160a01b0316141561056b57610566838b610ba2565b61067d565b6000836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156105a657600080fd5b505afa1580156105ba573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506105de91908101906126fd565b905060006105ec828d6118d6565b60405163095ea7b360e01b81529091506001600160a01b0383169063095ea7b39061061d908890859060040161304d565b602060405180830381600087803b15801561063757600080fd5b505af115801561064b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061066f9190810190612a09565b5061067a8582610ba2565b50505b836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b1580156106b657600080fd5b505afa1580156106ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506106ee91908101906126fd565b6001600160a01b0316826001600160a01b031614156107165761071182826108c2565b6107b2565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561075157600080fd5b505afa158015610765573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061078991908101906126fd565b9050600061079782846118e4565b90506107a384826108c2565b6107ae82828561196a565b5050505b50505050505050505050565b6107c781611301565b6107d0816107d3565b50565b60005b81518110156103e157734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b031682828151811061080957fe5b60200260200101516001600160a01b03161461083e5761083e82828151811061082e57fe5b60200260200101516000196114a5565b6001016107d6565b61084e610858565b6103e182826108c2565b734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b346040518263ffffffff1660e01b81526004016000604051808303818588803b1580156108a757600080fd5b505af11580156108bb573d6000803e3d6000fd5b5050505050565b60405163317afabb60e21b81526001600160a01b0383169063c5ebeaec906108ee908490600401613185565b602060405180830381600087803b15801561090857600080fd5b505af115801561091c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109409190810190612a27565b156103e15760405162461bcd60e51b8152600401610480906130b5565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514156109e75760405163e597461960e01b81526001600160a01b0383169063e59746199083906109b0908790600401612fdd565b6000604051808303818588803b1580156109c957600080fd5b505af11580156109dd573d6000803e3d6000fd5b5050505050610a8e565b6109f182826114a5565b6040516304c11f0360e31b81526001600160a01b03831690632608f81890610a1f908690859060040161304d565b602060405180830381600087803b158015610a3957600080fd5b505af1158015610a4d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610a719190810190612a27565b15610a8e5760405162461bcd60e51b815260040161048090613115565b505050565b610a9d8282610afd565b6103e1823383611a88565b610ab2848461167d565b610abc82826108c2565b50505050565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514610af257610af233308484611796565b610a8e83838361095d565b60405163852a12e360e01b81526001600160a01b0383169063852a12e390610b29908490600401613185565b602060405180830381600087803b158015610b4357600080fd5b505af1158015610b57573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b7b9190810190612a27565b156103e15760405162461bcd60e51b8152600401610480906130d5565b610a9d82826108c2565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed51415610c2057816001600160a01b0316634e4d9fea826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610c0257600080fd5b505af1158015610c16573d6000803e3d6000fd5b50505050506103e1565b610c2a82826114a5565b60405163073a938160e11b81526001600160a01b03831690630e75270290610c56908490600401613185565b602060405180830381600087803b158015610c7057600080fd5b505af1158015610c84573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610ca89190810190612a27565b156103e15760405162461bcd60e51b815260040161048090613125565b610ccd6124b9565b610cd982840184612a63565b80516020820151604083015192935090916000610d0c88610d008c8c63ffffffff611c1a16565b9063ffffffff611c1a16565b9050836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b158015610d4757600080fd5b505afa158015610d5b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610d7f91908101906126fd565b6001600160a01b0316826001600160a01b03161415610da757610da2828261167d565b610e37565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015610de257600080fd5b505afa158015610df6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610e1a91908101906126fd565b90506000610e2882846118d6565b9050610e34848261167d565b50505b836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b158015610e7057600080fd5b505afa158015610e84573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610ea891908101906126fd565b6001600160a01b0316836001600160a01b03161415610ecb57610711838b610afd565b6000836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015610f0657600080fd5b505afa158015610f1a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610f3e91908101906126fd565b90506000610f4c828d6118e4565b9050610f588582610afd565b6107ae82828e61196a565b816001600160a01b0316846001600160a01b03161415610f955760405162461bcd60e51b815260040161048090613145565b60008590506000816001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b158015610fd557600080fd5b505afa158015610fe9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061100d91908101906126fd565b6001600160a01b0316866001600160a01b0316141561102d5750836110aa565b6110a7866001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561106957600080fd5b505afa15801561107d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506110a191908101906126fd565b86611c5c565b90505b6060896040516020016110bd9190612fdd565b60408051601f19818403018152908290526110dc918690602001612fba565b60405160208183030381529060405290506000836001600160a01b0316633f6dc33b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561112857600080fd5b505afa15801561113c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061116091908101906126fd565b6001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561119857600080fd5b505afa1580156111ac573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506111d091908101906126fd565b90506111dc8a82611c92565b806001600160a01b0316635cffe9de8b866001600160a01b03166356cc94a26040518163ffffffff1660e01b815260040160206040518083038186803b15801561122557600080fd5b505afa158015611239573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061125d91908101906126fd565b86866040518563ffffffff1660e01b815260040161127e9493929190612feb565b600060405180830381600087803b15801561129857600080fd5b505af11580156112ac573d6000803e3d6000fd5b505050506112ba8a82611e60565b5050505050505050505050565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed5146112f7576112f733308484611796565b6103e18282610ba2565b604051631853304760e31b8152606090733d9819210a31b4961b30ef54be2aed79b9c9cd3b9063c29982389061133b908590600401613068565b600060405180830381600087803b15801561135557600080fd5b505af1158015611369573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261139191908101906129d4565b905060005b8151811015610a8e578181815181106113ab57fe5b60200260200101516000146113d25760405162461bcd60e51b8152600401610480906130f5565b600101611396565b60006113e686896115c6565b905084600061140d606461140185605f63ffffffff611f3016565b9063ffffffff611f6a16565b90508087111561141b578091505b6114608b8b8b8b868b8b8b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250610f6392505050565b600061146c898c6115c6565b90506000611480858363ffffffff611c1a16565b9050888110156107ae576107ae8b8b61149f8c8563ffffffff611c1a16565b8b611fac565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156114e057600080fd5b505afa1580156114f4573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061151891908101906126fd565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b390611549908690869060040161304d565b602060405180830381600087803b15801561156357600080fd5b505af1158015611577573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061159b9190810190612a09565b1515600114610a8e5760405162461bcd60e51b815260040161048090613135565b610a9d82826103e5565b6000806000806000866001600160a01b031663c37f68e2876040518263ffffffff1660e01b81526004016115fa9190612fdd565b60806040518083038186803b15801561161257600080fd5b505afa158015611626573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061164a9190810190612aff565b92965090945092509050611670670de0b6b3a7640000611401858463ffffffff611f3016565b9450505050505b92915050565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514156116f157734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610c0257600080fd5b6116fb82826114a5565b60405163140e25ad60e31b81526001600160a01b0383169063a0712d6890611727908490600401613185565b602060405180830381600087803b15801561174157600080fd5b505af1158015611755573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506117799190810190612a27565b156103e15760405162461bcd60e51b815260040161048090613175565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156117d157600080fd5b505afa1580156117e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061180991908101906126fd565b6040516323b872dd60e01b81529091506001600160a01b038216906323b872dd9061183c90889088908790600401613025565b602060405180830381600087803b15801561185657600080fd5b505af115801561186a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061188e9190810190612a09565b6108bb5760405162461bcd60e51b8152600401610480906130e5565b6000828201838110156118cf5760405162461bcd60e51b8152600401610480906130a5565b9392505050565b60006118cf838360016122fa565b60006118ef83612390565b6001600160a01b0316632640f62c836040518263ffffffff1660e01b815260040161191a9190613185565b60206040518083038186803b15801561193257600080fd5b505afa158015611946573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506118cf9190810190612a27565b60008061197685612390565b60405163095ea7b360e01b81529091506001600160a01b0386169063095ea7b3906119a7908490889060040161304d565b602060405180830381600087803b1580156119c157600080fd5b505af11580156119d5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506119f99190810190612a09565b506040516395e3c50b60e01b81526001600160a01b038216906395e3c50b90611a2d9087908790603c420190600401613079565b602060405180830381600087803b158015611a4757600080fd5b505af1158015611a5b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611a7f9190810190612a27565b95945050505050565b6001600160a01b038316734ddc2d193948926d02f9b1fe9e1daa0718270ed51415611b0e57816001600160a01b031681604051611ac490612fd2565b60006040518083038185875af1925050503d8060008114611b01576040519150601f19603f3d011682016040523d82523d6000602084013e611b06565b606091505b505050610a8e565b826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611b4757600080fd5b505afa158015611b5b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611b7f91908101906126fd565b6001600160a01b031663a9059cbb83836040518363ffffffff1660e01b8152600401611bac92919061304d565b602060405180830381600087803b158015611bc657600080fd5b505af1158015611bda573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611bfe9190810190612a09565b610a8e5760405162461bcd60e51b815260040161048090613155565b60006118cf83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f77000081525061241a565b6000611c6783612390565b6001600160a01b03166359e94862836040518263ffffffff1660e01b815260040161191a9190613185565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b158015611ccd57600080fd5b505afa158015611ce1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611d059190810190612a45565b9050806001600160a01b031663f0217ce58360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d6257600080fd5b505afa158015611d76573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611d9a9190810190612a27565b846001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611dd357600080fd5b505afa158015611de7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611e0b9190810190612a27565b6040518463ffffffff1660e01b8152600401611e2993929190613079565b600060405180830381600087803b158015611e4357600080fd5b505af1158015611e57573d6000803e3d6000fd5b50505050505050565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b158015611e9b57600080fd5b505afa158015611eaf573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611ed39190810190612a45565b9050806001600160a01b03166379d88d878360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d6257600080fd5b600082611f3f57506000611677565b82820282848281611f4c57fe5b04146118cf5760405162461bcd60e51b815260040161048090613105565b60006118cf83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250612446565b806001600160a01b0316836001600160a01b03161415611fde5760405162461bcd60e51b815260040161048090613165565b600084611feb8585610afd565b806001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561202457600080fd5b505afa158015612038573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061205c91908101906126fd565b6001600160a01b0316856001600160a01b031614156120f6576120ef836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156120b157600080fd5b505afa1580156120c5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506120e991908101906126fd565b856118d6565b91506122e8565b806001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561212f57600080fd5b505afa158015612143573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061216791908101906126fd565b6001600160a01b0316836001600160a01b031614156121fa576120ef856001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156121bc57600080fd5b505afa1580156121d0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506121f491908101906126fd565b8561247d565b6122e5856001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561223657600080fd5b505afa15801561224a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061226e91908101906126fd565b846001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156122a757600080fd5b505afa1580156122bb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506122df91908101906126fd565b8661248b565b91505b6122f2838361167d565b505050505050565b600061230584612390565b6001600160a01b031663f39b5b9b848442603c016040518463ffffffff1660e01b8152600401612336929190613193565b6020604051808303818588803b15801561234f57600080fd5b505af1158015612363573d6000803e3d6000fd5b50505050506040513d601f19601f820116820180604052506123889190810190612a27565b949350505050565b6040516303795fb160e11b815260009073c0a47dfe034b400b47bdad5fecda2621de6c4d95906306f2bf62906123ca908590600401612fdd565b60206040518083038186803b1580156123e257600080fd5b505afa1580156123f6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061167791908101906126fd565b6000818484111561243e5760405162461bcd60e51b81526004016104809190613094565b505050900390565b600081836124675760405162461bcd60e51b81526004016104809190613094565b50600083858161247357fe5b0495945050505050565b60006118cf8383600161196a565b600061238884848460016000806124a2868561247d565b90506124af8582856122fa565b9695505050505050565b604080516060810182526000808252602082018190529181019190915290565b8035611677816132a0565b8051611677816132a0565b600082601f83011261250057600080fd5b813561251361250e826131c8565b6131a1565b9150818183526020840193506020810190508385602084028201111561253857600080fd5b60005b83811015612564578161254e88826124d9565b845250602092830192919091019060010161253b565b5050505092915050565b600082601f83011261257f57600080fd5b815161258d61250e826131c8565b915081818352602084019350602081019050838560208402820111156125b257600080fd5b60005b8381101561256457816125c888826125e9565b84525060209283019291909101906001016125b5565b8051611677816132b4565b8051611677816132bd565b60008083601f84011261260657600080fd5b50813567ffffffffffffffff81111561261e57600080fd5b60208301915083600182028301111561263657600080fd5b9250929050565b600082601f83011261264e57600080fd5b813561265c61250e826131e9565b9150808252602083016020830185838301111561267857600080fd5b61268383828461325e565b50505092915050565b8051611677816132c6565b6000606082840312156126a957600080fd5b6126b360606131a1565b905060006126c184846124d9565b82525060206126d2848483016124d9565b60208301525060406126e6848285016124d9565b60408301525092915050565b8035611677816132bd565b60006020828403121561270f57600080fd5b600061238884846124e4565b6000806040838503121561272e57600080fd5b600061273a85856124d9565b925050602061274b858286016124d9565b9150509250929050565b60008060008060008060008060e0898b03121561277157600080fd5b600061277d8b8b6124d9565b985050602061278e8b828c016124d9565b975050604061279f8b828c016124d9565b96505060606127b08b828c016124d9565b95505060806127c18b828c016126f2565b94505060a06127d28b828c016124d9565b93505060c089013567ffffffffffffffff8111156127ef57600080fd5b6127fb8b828c016125f4565b92509250509295985092959890939650565b600080600080600080600060e0888a03121561282857600080fd5b60006128348a8a6124d9565b97505060206128458a828b016124d9565b96505060406128568a828b016124d9565b95505060606128678a828b016124d9565b94505060806128788a828b016126f2565b93505060a06128898a828b016124d9565b92505060c088013567ffffffffffffffff8111156128a657600080fd5b6128b28a828b0161263d565b91505092959891949750929550565b6000806000606084860312156128d657600080fd5b60006128e286866124d9565b93505060206128f3868287016124d9565b9250506040612904868287016126f2565b9150509250925092565b6000806040838503121561292157600080fd5b600061292d85856124d9565b925050602061274b858286016126f2565b6000806000806080858703121561295457600080fd5b600061296087876124d9565b9450506020612971878288016126f2565b9350506040612982878288016124d9565b9250506060612993878288016126f2565b91505092959194509250565b6000602082840312156129b157600080fd5b813567ffffffffffffffff8111156129c857600080fd5b612388848285016124ef565b6000602082840312156129e657600080fd5b815167ffffffffffffffff8111156129fd57600080fd5b6123888482850161256e565b600060208284031215612a1b57600080fd5b600061238884846125de565b600060208284031215612a3957600080fd5b600061238884846125e9565b600060208284031215612a5757600080fd5b6000612388848461268c565b600060608284031215612a7557600080fd5b60006123888484612697565b600080600080600060808688031215612a9957600080fd5b6000612aa588886126f2565b9550506020612ab6888289016126f2565b9450506040612ac7888289016126f2565b935050606086013567ffffffffffffffff811115612ae457600080fd5b612af0888289016125f4565b92509250509295509295909350565b60008060008060808587031215612b1557600080fd5b6000612b2187876125e9565b9450506020612b32878288016125e9565b9350506040612b43878288016125e9565b9250506060612993878288016125e9565b6000612b608383612b77565b505060200190565b612b7181613253565b82525050565b612b7181613229565b6000612b8b82613217565b612b95818561321b565b9350612ba083613211565b8060005b83811015612bce578151612bb88882612b54565b9750612bc383613211565b925050600101612ba4565b509495945050505050565b612b7181613239565b6000612bed82613217565b612bf7818561321b565b9350612c0781856020860161326a565b612c1081613296565b9093019392505050565b6000612c2582613217565b612c2f8185613224565b9350612c3f81856020860161326a565b9290920192915050565b6000612c56601b8361321b565b7f536166654d6174683a206164646974696f6e206f766572666c6f770000000000815260200192915050565b6000612c8f601e8361321b565b7f636d706e642d6d67722d63746f6b656e2d626f72726f772d6661696c65640000815260200192915050565b6000612cc8601e8361321b565b7f636d706e642d6d67722d63746f6b656e2d72656465656d2d6661696c65640000815260200192915050565b6000612d0160298361321b565b7f636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79698152681b99cb59985a5b195960ba1b602082015260400192915050565b6000612d4c60288361321b565b7f636d706e642d6d67722d7472616e7366657246726f6d2d756e6465726c79696e81526719cb59985a5b195960c21b602082015260400192915050565b6000612d96601e8361321b565b7f636d706e642d6d67722d656e7465722d6d61726b6574732d6661696c65640000815260200192915050565b6000612dcf60218361321b565b7f536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f8152607760f81b602082015260400192915050565b6000612e1260238361321b565b7f636d706e642d6d67722d63746f6b656e2d7265706179626568616c662d6661698152621b195960ea1b602082015260400192915050565b6000612e57601d8361321b565b7f636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564000000815260200192915050565b6000611677600083613224565b6000612e9d60208361321b565b7f636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564815260200192915050565b6000612ed6601b8361321b565b7f737761702d6f7065726174696f6e2d73616d652d616464726573730000000000815260200192915050565b6000612f0f60248361321b565b7f636d706e642d6d67722d7472616e736665722d756e6465726c79696e672d66618152631a5b195960e21b602082015260400192915050565b6000612f55601d8361321b565b7f636c6561722d636f6c6c61746572616c2d73616d652d61646472657373000000815260200192915050565b6000612f8e601e8361321b565b7f636d706e642d6d67722d63746f6b656e2d737570706c792d6661696c65640000815260200192915050565b6000612fc68285612c1a565b91506123888284612c1a565b600061167782612e83565b602081016116778284612b77565b60808101612ff98287612b68565b6130066020830186612b77565b6130136040830185612bd9565b81810360608301526124af8184612be2565b606081016130338286612b77565b6130406020830185612b77565b6123886040830184612bd9565b6040810161305b8285612b77565b6118cf6020830184612bd9565b602080825281016118cf8184612b80565b606081016130878286612bd9565b6130406020830185612bd9565b602080825281016118cf8184612be2565b6020808252810161167781612c49565b6020808252810161167781612c82565b6020808252810161167781612cbb565b6020808252810161167781612cf4565b6020808252810161167781612d3f565b6020808252810161167781612d89565b6020808252810161167781612dc2565b6020808252810161167781612e05565b6020808252810161167781612e4a565b6020808252810161167781612e90565b6020808252810161167781612ec9565b6020808252810161167781612f02565b6020808252810161167781612f48565b6020808252810161167781612f81565b602081016116778284612bd9565b6040810161305b8285612bd9565b60405181810167ffffffffffffffff811182821017156131c057600080fd5b604052919050565b600067ffffffffffffffff8211156131df57600080fd5b5060209081020190565b600067ffffffffffffffff82111561320057600080fd5b506020601f91909101601f19160190565b60200190565b5190565b90815260200190565b919050565b600061167782613247565b151590565b90565b600061167782613229565b6001600160a01b031690565b60006116778261323c565b82818337506000910152565b60005b8381101561328557818101518382015260200161326d565b83811115610abc5750506000910152565b601f01601f191690565b6132a981613229565b81146107d057600080fd5b6132a981613234565b6132a981613239565b6132a98161323c56fea365627a7a72315820046f418c5835b445507978fc3229c2c728bc535e8545558a6d76f6ac2884cd866c6578706572696d656e74616cf564736f6c63430005100040", + "deployedBytecode": "0x60806040526004361061014b5760003560e01c806396294178116100b6578063c29982381161006f578063c2998238146102eb578063c8b88e481461030b578063d2f70c401461032b578063d882dc6c1461034b578063dc08fa9d1461035e578063f2b9fdb8146103945761014b565b8063962941781461025f5780639a22a1b914610272578063abdb5ea814610292578063b14886ee146102a5578063b16f18d0146102c5578063ba59154f146102d85761014b565b80634907b8fc116101085780634907b8fc146101eb5780634b8a3529146101f357806359086a5e1461021357806367600cc21461022657806375d40945146102395780637720cc871461024c5761014b565b80630b4e0630146101505780631e9a69501461016557806324d1ea12146101785780632d8af543146101985780633dc4d99a146101b857806341ec5cc4146101d8575b600080fd5b61016361015e36600461290e565b6103a7565b005b61016361017336600461290e565b6103e5565b34801561018457600080fd5b50610163610193366004612a81565b610489565b3480156101a457600080fd5b506101636101b336600461299f565b6107be565b3480156101c457600080fd5b506101636101d336600461299f565b6107d3565b6101636101e636600461290e565b610846565b610163610858565b3480156101ff57600080fd5b5061016361020e36600461290e565b6108c2565b6101636102213660046128c1565b61095d565b61016361023436600461290e565b610a93565b61016361024736600461293e565b610aa8565b61016361025a3660046128c1565b610ac2565b61016361026d36600461290e565b610afd565b34801561027e57600080fd5b5061016361028d36600461290e565b610b98565b6101636102a036600461290e565b610ba2565b3480156102b157600080fd5b506101636102c0366004612a81565b610cc5565b6101636102d336600461280d565b610f63565b6101636102e636600461290e565b6112c7565b3480156102f757600080fd5b5061016361030636600461299f565b611301565b34801561031757600080fd5b50610163610326366004612755565b6113da565b34801561033757600080fd5b5061016361034636600461290e565b6114a5565b61016361035936600461290e565b6115bc565b34801561036a57600080fd5b5061037e61037936600461271b565b6115c6565b60405161038b9190613185565b60405180910390f35b6101636103a236600461290e565b61167d565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed5146103d7576103d733308484611796565b6103e1828261167d565b5050565b60405163db006a7560e01b81526001600160a01b0383169063db006a7590610411908490600401613185565b602060405180830381600087803b15801561042b57600080fd5b505af115801561043f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104639190810190612a27565b156103e15760405162461bcd60e51b8152600401610480906130c5565b60405180910390fd5b6104916124b9565b61049d82840184612a63565b805160208201516040830151929350909160006104d0886104c48c8c63ffffffff6118aa16565b9063ffffffff6118aa16565b9050836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561050b57600080fd5b505afa15801561051f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061054391908101906126fd565b6001600160a01b0316836001600160a01b0316141561056b57610566838b610ba2565b61067d565b6000836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156105a657600080fd5b505afa1580156105ba573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506105de91908101906126fd565b905060006105ec828d6118d6565b60405163095ea7b360e01b81529091506001600160a01b0383169063095ea7b39061061d908890859060040161304d565b602060405180830381600087803b15801561063757600080fd5b505af115801561064b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061066f9190810190612a09565b5061067a8582610ba2565b50505b836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b1580156106b657600080fd5b505afa1580156106ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506106ee91908101906126fd565b6001600160a01b0316826001600160a01b031614156107165761071182826108c2565b6107b2565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561075157600080fd5b505afa158015610765573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061078991908101906126fd565b9050600061079782846118e4565b90506107a384826108c2565b6107ae82828561196a565b5050505b50505050505050505050565b6107c781611301565b6107d0816107d3565b50565b60005b81518110156103e157734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b031682828151811061080957fe5b60200260200101516001600160a01b03161461083e5761083e82828151811061082e57fe5b60200260200101516000196114a5565b6001016107d6565b61084e610858565b6103e182826108c2565b734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b346040518263ffffffff1660e01b81526004016000604051808303818588803b1580156108a757600080fd5b505af11580156108bb573d6000803e3d6000fd5b5050505050565b60405163317afabb60e21b81526001600160a01b0383169063c5ebeaec906108ee908490600401613185565b602060405180830381600087803b15801561090857600080fd5b505af115801561091c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109409190810190612a27565b156103e15760405162461bcd60e51b8152600401610480906130b5565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514156109e75760405163e597461960e01b81526001600160a01b0383169063e59746199083906109b0908790600401612fdd565b6000604051808303818588803b1580156109c957600080fd5b505af11580156109dd573d6000803e3d6000fd5b5050505050610a8e565b6109f182826114a5565b6040516304c11f0360e31b81526001600160a01b03831690632608f81890610a1f908690859060040161304d565b602060405180830381600087803b158015610a3957600080fd5b505af1158015610a4d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610a719190810190612a27565b15610a8e5760405162461bcd60e51b815260040161048090613115565b505050565b610a9d8282610afd565b6103e1823383611a88565b610ab2848461167d565b610abc82826108c2565b50505050565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514610af257610af233308484611796565b610a8e83838361095d565b60405163852a12e360e01b81526001600160a01b0383169063852a12e390610b29908490600401613185565b602060405180830381600087803b158015610b4357600080fd5b505af1158015610b57573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b7b9190810190612a27565b156103e15760405162461bcd60e51b8152600401610480906130d5565b610a9d82826108c2565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed51415610c2057816001600160a01b0316634e4d9fea826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610c0257600080fd5b505af1158015610c16573d6000803e3d6000fd5b50505050506103e1565b610c2a82826114a5565b60405163073a938160e11b81526001600160a01b03831690630e75270290610c56908490600401613185565b602060405180830381600087803b158015610c7057600080fd5b505af1158015610c84573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610ca89190810190612a27565b156103e15760405162461bcd60e51b815260040161048090613125565b610ccd6124b9565b610cd982840184612a63565b80516020820151604083015192935090916000610d0c88610d008c8c63ffffffff611c1a16565b9063ffffffff611c1a16565b9050836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b158015610d4757600080fd5b505afa158015610d5b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610d7f91908101906126fd565b6001600160a01b0316826001600160a01b03161415610da757610da2828261167d565b610e37565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015610de257600080fd5b505afa158015610df6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610e1a91908101906126fd565b90506000610e2882846118d6565b9050610e34848261167d565b50505b836001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b158015610e7057600080fd5b505afa158015610e84573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610ea891908101906126fd565b6001600160a01b0316836001600160a01b03161415610ecb57610711838b610afd565b6000836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015610f0657600080fd5b505afa158015610f1a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610f3e91908101906126fd565b90506000610f4c828d6118e4565b9050610f588582610afd565b6107ae82828e61196a565b816001600160a01b0316846001600160a01b03161415610f955760405162461bcd60e51b815260040161048090613145565b60008590506000816001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b158015610fd557600080fd5b505afa158015610fe9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061100d91908101906126fd565b6001600160a01b0316866001600160a01b0316141561102d5750836110aa565b6110a7866001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561106957600080fd5b505afa15801561107d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506110a191908101906126fd565b86611c5c565b90505b6060896040516020016110bd9190612fdd565b60408051601f19818403018152908290526110dc918690602001612fba565b60405160208183030381529060405290506000836001600160a01b0316633f6dc33b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561112857600080fd5b505afa15801561113c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061116091908101906126fd565b6001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561119857600080fd5b505afa1580156111ac573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506111d091908101906126fd565b90506111dc8a82611c92565b806001600160a01b0316635cffe9de8b866001600160a01b03166356cc94a26040518163ffffffff1660e01b815260040160206040518083038186803b15801561122557600080fd5b505afa158015611239573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061125d91908101906126fd565b86866040518563ffffffff1660e01b815260040161127e9493929190612feb565b600060405180830381600087803b15801561129857600080fd5b505af11580156112ac573d6000803e3d6000fd5b505050506112ba8a82611e60565b5050505050505050505050565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed5146112f7576112f733308484611796565b6103e18282610ba2565b604051631853304760e31b8152606090733d9819210a31b4961b30ef54be2aed79b9c9cd3b9063c29982389061133b908590600401613068565b600060405180830381600087803b15801561135557600080fd5b505af1158015611369573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261139191908101906129d4565b905060005b8151811015610a8e578181815181106113ab57fe5b60200260200101516000146113d25760405162461bcd60e51b8152600401610480906130f5565b600101611396565b60006113e686896115c6565b905084600061140d606461140185605f63ffffffff611f3016565b9063ffffffff611f6a16565b90508087111561141b578091505b6114608b8b8b8b868b8b8b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250610f6392505050565b600061146c898c6115c6565b90506000611480858363ffffffff611c1a16565b9050888110156107ae576107ae8b8b61149f8c8563ffffffff611c1a16565b8b611fac565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156114e057600080fd5b505afa1580156114f4573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061151891908101906126fd565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b390611549908690869060040161304d565b602060405180830381600087803b15801561156357600080fd5b505af1158015611577573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061159b9190810190612a09565b1515600114610a8e5760405162461bcd60e51b815260040161048090613135565b610a9d82826103e5565b6000806000806000866001600160a01b031663c37f68e2876040518263ffffffff1660e01b81526004016115fa9190612fdd565b60806040518083038186803b15801561161257600080fd5b505afa158015611626573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061164a9190810190612aff565b92965090945092509050611670670de0b6b3a7640000611401858463ffffffff611f3016565b9450505050505b92915050565b6001600160a01b038216734ddc2d193948926d02f9b1fe9e1daa0718270ed514156116f157734ddc2d193948926d02f9b1fe9e1daa0718270ed56001600160a01b0316631249c58b826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610c0257600080fd5b6116fb82826114a5565b60405163140e25ad60e31b81526001600160a01b0383169063a0712d6890611727908490600401613185565b602060405180830381600087803b15801561174157600080fd5b505af1158015611755573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506117799190810190612a27565b156103e15760405162461bcd60e51b815260040161048090613175565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156117d157600080fd5b505afa1580156117e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061180991908101906126fd565b6040516323b872dd60e01b81529091506001600160a01b038216906323b872dd9061183c90889088908790600401613025565b602060405180830381600087803b15801561185657600080fd5b505af115801561186a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061188e9190810190612a09565b6108bb5760405162461bcd60e51b8152600401610480906130e5565b6000828201838110156118cf5760405162461bcd60e51b8152600401610480906130a5565b9392505050565b60006118cf838360016122fa565b60006118ef83612390565b6001600160a01b0316632640f62c836040518263ffffffff1660e01b815260040161191a9190613185565b60206040518083038186803b15801561193257600080fd5b505afa158015611946573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506118cf9190810190612a27565b60008061197685612390565b60405163095ea7b360e01b81529091506001600160a01b0386169063095ea7b3906119a7908490889060040161304d565b602060405180830381600087803b1580156119c157600080fd5b505af11580156119d5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506119f99190810190612a09565b506040516395e3c50b60e01b81526001600160a01b038216906395e3c50b90611a2d9087908790603c420190600401613079565b602060405180830381600087803b158015611a4757600080fd5b505af1158015611a5b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611a7f9190810190612a27565b95945050505050565b6001600160a01b038316734ddc2d193948926d02f9b1fe9e1daa0718270ed51415611b0e57816001600160a01b031681604051611ac490612fd2565b60006040518083038185875af1925050503d8060008114611b01576040519150601f19603f3d011682016040523d82523d6000602084013e611b06565b606091505b505050610a8e565b826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b158015611b4757600080fd5b505afa158015611b5b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611b7f91908101906126fd565b6001600160a01b031663a9059cbb83836040518363ffffffff1660e01b8152600401611bac92919061304d565b602060405180830381600087803b158015611bc657600080fd5b505af1158015611bda573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611bfe9190810190612a09565b610a8e5760405162461bcd60e51b815260040161048090613155565b60006118cf83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f77000081525061241a565b6000611c6783612390565b6001600160a01b03166359e94862836040518263ffffffff1660e01b815260040161191a9190613185565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b158015611ccd57600080fd5b505afa158015611ce1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611d059190810190612a45565b9050806001600160a01b031663f0217ce58360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d6257600080fd5b505afa158015611d76573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611d9a9190810190612a27565b846001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611dd357600080fd5b505afa158015611de7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611e0b9190810190612a27565b6040518463ffffffff1660e01b8152600401611e2993929190613079565b600060405180830381600087803b158015611e4357600080fd5b505af1158015611e57573d6000803e3d6000fd5b50505050505050565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b158015611e9b57600080fd5b505afa158015611eaf573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611ed39190810190612a45565b9050806001600160a01b03166379d88d878360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d6257600080fd5b600082611f3f57506000611677565b82820282848281611f4c57fe5b04146118cf5760405162461bcd60e51b815260040161048090613105565b60006118cf83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250612446565b806001600160a01b0316836001600160a01b03161415611fde5760405162461bcd60e51b815260040161048090613165565b600084611feb8585610afd565b806001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561202457600080fd5b505afa158015612038573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061205c91908101906126fd565b6001600160a01b0316856001600160a01b031614156120f6576120ef836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156120b157600080fd5b505afa1580156120c5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506120e991908101906126fd565b856118d6565b91506122e8565b806001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561212f57600080fd5b505afa158015612143573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061216791908101906126fd565b6001600160a01b0316836001600160a01b031614156121fa576120ef856001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156121bc57600080fd5b505afa1580156121d0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506121f491908101906126fd565b8561247d565b6122e5856001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561223657600080fd5b505afa15801561224a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061226e91908101906126fd565b846001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156122a757600080fd5b505afa1580156122bb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506122df91908101906126fd565b8661248b565b91505b6122f2838361167d565b505050505050565b600061230584612390565b6001600160a01b031663f39b5b9b848442603c016040518463ffffffff1660e01b8152600401612336929190613193565b6020604051808303818588803b15801561234f57600080fd5b505af1158015612363573d6000803e3d6000fd5b50505050506040513d601f19601f820116820180604052506123889190810190612a27565b949350505050565b6040516303795fb160e11b815260009073c0a47dfe034b400b47bdad5fecda2621de6c4d95906306f2bf62906123ca908590600401612fdd565b60206040518083038186803b1580156123e257600080fd5b505afa1580156123f6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061167791908101906126fd565b6000818484111561243e5760405162461bcd60e51b81526004016104809190613094565b505050900390565b600081836124675760405162461bcd60e51b81526004016104809190613094565b50600083858161247357fe5b0495945050505050565b60006118cf8383600161196a565b600061238884848460016000806124a2868561247d565b90506124af8582856122fa565b9695505050505050565b604080516060810182526000808252602082018190529181019190915290565b8035611677816132a0565b8051611677816132a0565b600082601f83011261250057600080fd5b813561251361250e826131c8565b6131a1565b9150818183526020840193506020810190508385602084028201111561253857600080fd5b60005b83811015612564578161254e88826124d9565b845250602092830192919091019060010161253b565b5050505092915050565b600082601f83011261257f57600080fd5b815161258d61250e826131c8565b915081818352602084019350602081019050838560208402820111156125b257600080fd5b60005b8381101561256457816125c888826125e9565b84525060209283019291909101906001016125b5565b8051611677816132b4565b8051611677816132bd565b60008083601f84011261260657600080fd5b50813567ffffffffffffffff81111561261e57600080fd5b60208301915083600182028301111561263657600080fd5b9250929050565b600082601f83011261264e57600080fd5b813561265c61250e826131e9565b9150808252602083016020830185838301111561267857600080fd5b61268383828461325e565b50505092915050565b8051611677816132c6565b6000606082840312156126a957600080fd5b6126b360606131a1565b905060006126c184846124d9565b82525060206126d2848483016124d9565b60208301525060406126e6848285016124d9565b60408301525092915050565b8035611677816132bd565b60006020828403121561270f57600080fd5b600061238884846124e4565b6000806040838503121561272e57600080fd5b600061273a85856124d9565b925050602061274b858286016124d9565b9150509250929050565b60008060008060008060008060e0898b03121561277157600080fd5b600061277d8b8b6124d9565b985050602061278e8b828c016124d9565b975050604061279f8b828c016124d9565b96505060606127b08b828c016124d9565b95505060806127c18b828c016126f2565b94505060a06127d28b828c016124d9565b93505060c089013567ffffffffffffffff8111156127ef57600080fd5b6127fb8b828c016125f4565b92509250509295985092959890939650565b600080600080600080600060e0888a03121561282857600080fd5b60006128348a8a6124d9565b97505060206128458a828b016124d9565b96505060406128568a828b016124d9565b95505060606128678a828b016124d9565b94505060806128788a828b016126f2565b93505060a06128898a828b016124d9565b92505060c088013567ffffffffffffffff8111156128a657600080fd5b6128b28a828b0161263d565b91505092959891949750929550565b6000806000606084860312156128d657600080fd5b60006128e286866124d9565b93505060206128f3868287016124d9565b9250506040612904868287016126f2565b9150509250925092565b6000806040838503121561292157600080fd5b600061292d85856124d9565b925050602061274b858286016126f2565b6000806000806080858703121561295457600080fd5b600061296087876124d9565b9450506020612971878288016126f2565b9350506040612982878288016124d9565b9250506060612993878288016126f2565b91505092959194509250565b6000602082840312156129b157600080fd5b813567ffffffffffffffff8111156129c857600080fd5b612388848285016124ef565b6000602082840312156129e657600080fd5b815167ffffffffffffffff8111156129fd57600080fd5b6123888482850161256e565b600060208284031215612a1b57600080fd5b600061238884846125de565b600060208284031215612a3957600080fd5b600061238884846125e9565b600060208284031215612a5757600080fd5b6000612388848461268c565b600060608284031215612a7557600080fd5b60006123888484612697565b600080600080600060808688031215612a9957600080fd5b6000612aa588886126f2565b9550506020612ab6888289016126f2565b9450506040612ac7888289016126f2565b935050606086013567ffffffffffffffff811115612ae457600080fd5b612af0888289016125f4565b92509250509295509295909350565b60008060008060808587031215612b1557600080fd5b6000612b2187876125e9565b9450506020612b32878288016125e9565b9350506040612b43878288016125e9565b9250506060612993878288016125e9565b6000612b608383612b77565b505060200190565b612b7181613253565b82525050565b612b7181613229565b6000612b8b82613217565b612b95818561321b565b9350612ba083613211565b8060005b83811015612bce578151612bb88882612b54565b9750612bc383613211565b925050600101612ba4565b509495945050505050565b612b7181613239565b6000612bed82613217565b612bf7818561321b565b9350612c0781856020860161326a565b612c1081613296565b9093019392505050565b6000612c2582613217565b612c2f8185613224565b9350612c3f81856020860161326a565b9290920192915050565b6000612c56601b8361321b565b7f536166654d6174683a206164646974696f6e206f766572666c6f770000000000815260200192915050565b6000612c8f601e8361321b565b7f636d706e642d6d67722d63746f6b656e2d626f72726f772d6661696c65640000815260200192915050565b6000612cc8601e8361321b565b7f636d706e642d6d67722d63746f6b656e2d72656465656d2d6661696c65640000815260200192915050565b6000612d0160298361321b565b7f636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79698152681b99cb59985a5b195960ba1b602082015260400192915050565b6000612d4c60288361321b565b7f636d706e642d6d67722d7472616e7366657246726f6d2d756e6465726c79696e81526719cb59985a5b195960c21b602082015260400192915050565b6000612d96601e8361321b565b7f636d706e642d6d67722d656e7465722d6d61726b6574732d6661696c65640000815260200192915050565b6000612dcf60218361321b565b7f536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f8152607760f81b602082015260400192915050565b6000612e1260238361321b565b7f636d706e642d6d67722d63746f6b656e2d7265706179626568616c662d6661698152621b195960ea1b602082015260400192915050565b6000612e57601d8361321b565b7f636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564000000815260200192915050565b6000611677600083613224565b6000612e9d60208361321b565b7f636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564815260200192915050565b6000612ed6601b8361321b565b7f737761702d6f7065726174696f6e2d73616d652d616464726573730000000000815260200192915050565b6000612f0f60248361321b565b7f636d706e642d6d67722d7472616e736665722d756e6465726c79696e672d66618152631a5b195960e21b602082015260400192915050565b6000612f55601d8361321b565b7f636c6561722d636f6c6c61746572616c2d73616d652d61646472657373000000815260200192915050565b6000612f8e601e8361321b565b7f636d706e642d6d67722d63746f6b656e2d737570706c792d6661696c65640000815260200192915050565b6000612fc68285612c1a565b91506123888284612c1a565b600061167782612e83565b602081016116778284612b77565b60808101612ff98287612b68565b6130066020830186612b77565b6130136040830185612bd9565b81810360608301526124af8184612be2565b606081016130338286612b77565b6130406020830185612b77565b6123886040830184612bd9565b6040810161305b8285612b77565b6118cf6020830184612bd9565b602080825281016118cf8184612b80565b606081016130878286612bd9565b6130406020830185612bd9565b602080825281016118cf8184612be2565b6020808252810161167781612c49565b6020808252810161167781612c82565b6020808252810161167781612cbb565b6020808252810161167781612cf4565b6020808252810161167781612d3f565b6020808252810161167781612d89565b6020808252810161167781612dc2565b6020808252810161167781612e05565b6020808252810161167781612e4a565b6020808252810161167781612e90565b6020808252810161167781612ec9565b6020808252810161167781612f02565b6020808252810161167781612f48565b6020808252810161167781612f81565b602081016116778284612bd9565b6040810161305b8285612bd9565b60405181810167ffffffffffffffff811182821017156131c057600080fd5b604052919050565b600067ffffffffffffffff8211156131df57600080fd5b5060209081020190565b600067ffffffffffffffff82111561320057600080fd5b506020601f91909101601f19160190565b60200190565b5190565b90815260200190565b919050565b600061167782613247565b151590565b90565b600061167782613229565b6001600160a01b031690565b60006116778261323c565b82818337506000910152565b60005b8381101561328557818101518382015260200161326d565b83811115610abc5750506000910152565b601f01601f191690565b6132a981613229565b81146107d057600080fd5b6132a981613234565b6132a981613239565b6132a98161323c56fea365627a7a72315820046f418c5835b445507978fc3229c2c728bc535e8545558a6d76f6ac2884cd866c6578706572696d656e74616cf564736f6c63430005100040", + "sourceMap": "720:14230:25:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;720:14230:25;;;;;;;", + "deployedSourceMap": "720:14230:25:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6424:243:16;;;;;;;;;:::i;:::-;;5752:204;;;;;;;;;:::i;1561:2850:25:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1561:2850:25;;;;;;;;:::i;3482:143:16:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3482:143:16;;;;;;;;:::i;3150:326::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3150:326:16;;;;;;;;:::i;4647:228::-;;;;;;;;;:::i;3631:99::-;;;:::i;4178:196::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4178:196:16;;;;;;;;:::i;5270:476::-;;;;;;;;;:::i;7629:211::-;;;;;;;;;:::i;4380:261::-;;;;;;;;;:::i;6952:325::-;;;;;;;;;:::i;5962:255::-;;;;;;;;;:::i;7283:163::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;7283:163:16;;;;;;;;:::i;4881:383::-;;;;;;;;;:::i;4417:2400:25:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4417:2400:25;;;;;;;;:::i;8006:2410::-;;;;;;;;;:::i;6673:273:16:-;;;;;;;;;:::i;2366:446::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2366:446:16;;;;;;;;:::i;12584:2364:25:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;12584:2364:25;;;;;;;;:::i;2818:326:16:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2818:326:16;;;;;;;;:::i;7452:171::-;;;;;;;;;:::i;808:477::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;808:477:16;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;3736:436;;;;;;;;;:::i;6424:243::-;-1:-1:-1;;;;;6513:23:16;;584:42;6513:23;6509:120;;6552:66;6576:10;6596:4;6603:6;6611;6552:23;:66::i;:::-;6638:22;6645:6;6653;6638;:22::i;:::-;6424:243;;:::o;5752:204::-;5852:36;;-1:-1:-1;;;5852:36:16;;-1:-1:-1;;;;;5852:22:16;;;;;:36;;5875:12;;5852:36;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5852:36:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5852:36:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5852:36:16;;;;;;;;;:41;5831:118;;;;-1:-1:-1;;;5831:118:16;;;;;;;;;;;;;;;;1561:2850:25;1727:39;;:::i;:::-;1769:76;;;;1793:5;1769:76;;;1919:33;;2000:27;;;;2064;;;;1727:118;;-1:-1:-1;1919:33:25;;1856:31;2123:43;2153:12;2123:25;:11;2139:8;2123:25;:15;:25;:::i;:::-;:29;:43;:29;:43;:::i;:::-;2102:64;;2680:15;-1:-1:-1;;;;;2680:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2680:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2680:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2680:31:25;;;;;;;;;-1:-1:-1;;;;;2660:51:25;:16;-1:-1:-1;;;;;2660:51:25;;2656:705;;;2727:42;2739:16;2757:11;2727;:42::i;:::-;2656:705;;;2852:26;2889:16;-1:-1:-1;;;;;2881:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2881:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2881:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2881:38:25;;;;;;;;;2852:67;;2934:32;2969:90;2998:18;3034:11;2969;:90::i;:::-;3127:124;;-1:-1:-1;;;3127:124:25;;2934:125;;-1:-1:-1;;;;;;3127:34:25;;;;;:124;;3179:16;;2934:125;;3127:124;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3127:124:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3127:124:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3127:124:25;;;;;;;;;;3295:55;3307:16;3325:24;3295:11;:55::i;:::-;2656:705;;;3525:15;-1:-1:-1;;;;;3525:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3525:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3525:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3525:31:25;;;;;;;;;-1:-1:-1;;;;;3505:51:25;:16;-1:-1:-1;;;;;3505:51:25;;3501:904;;;3572:36;3579:16;3597:10;3572:6;:36::i;:::-;3501:904;;;3680:26;3717:16;-1:-1:-1;;;;;3709:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3709:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3709:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3709:38:25;;;;;;;;;3680:67;;3875:32;3910:98;3948:18;3984:10;3910:20;:98::i;:::-;3875:133;;4055:50;4062:16;4080:24;4055:6;:50::i;:::-;4263:131;4292:18;4328:24;4370:10;4263:11;:131::i;:::-;;3501:904;;;1561:2850;;;;;;;;;;:::o;3482:143:16:-;3564:21;3577:7;3564:12;:21::i;:::-;3595:23;3610:7;3595:14;:23::i;:::-;3482:143;:::o;3150:326::-;3257:9;3252:218;3276:7;:14;3272:1;:18;3252:218;;;584:42;-1:-1:-1;;;;;3360:27:16;:7;3368:1;3360:10;;;;;;;;;;;;;;-1:-1:-1;;;;;3360:27:16;;3356:104;;3407:38;3421:7;3429:1;3421:10;;;;;;;;;;;;;;-1:-1:-1;;3407:13:16;:38::i;:::-;3292:3;;3252:218;;4647:228;4787:11;:9;:11::i;:::-;4840:28;4847:6;4855:12;4840:6;:28::i;3631:99::-;584:42;-1:-1:-1;;;;;3677:27:16;;3711:9;3677:46;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3677:46:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3677:46:16;;;;;3631:99::o;4178:196::-;4270:36;;-1:-1:-1;;;4270:36:16;;-1:-1:-1;;;;;4270:22:16;;;;;:36;;4293:12;;4270:36;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4270:36:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4270:36:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4270:36:16;;;;;;;;;:41;4249:118;;;;-1:-1:-1;;;4249:118:16;;;;;;;;5270:476;-1:-1:-1;;;;;5407:23:16;;584:42;5407:23;5403:337;;;5446:58;;-1:-1:-1;;;5446:58:16;;-1:-1:-1;;;;;5446:33:16;;;;;5486:6;;5446:58;;5494:9;;5446:58;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5446:58:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5446:58:16;;;;;5403:337;;;5535:29;5549:6;5557;5535:13;:29::i;:::-;5603:52;;-1:-1:-1;;;5603:52:16;;-1:-1:-1;;;;;5603:33:16;;;;;:52;;5637:9;;5648:6;;5603:52;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5603:52:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5603:52:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5603:52:16;;;;;;;;;:57;5578:151;;;;-1:-1:-1;;;5578:151:16;;;;;;;;;5270:476;;;:::o;7629:211::-;7744:32;7761:6;7769;7744:16;:32::i;:::-;7786:47;7806:6;7814:10;7826:6;7786:19;:47::i;4380:261::-;4556:34;4563:12;4577;4556:6;:34::i;:::-;4600;4607:12;4621;4600:6;:34::i;:::-;4380:261;;;;:::o;6952:325::-;-1:-1:-1;;;;;7101:23:16;;584:42;7101:23;7097:120;;7140:66;7164:10;7184:4;7191:6;7199;7140:23;:66::i;:::-;7226:44;7244:9;7255:6;7263;7226:17;:44::i;5962:255::-;6092:46;;-1:-1:-1;;;6092:46:16;;-1:-1:-1;;;;;6092:32:16;;;;;:46;;6125:12;;6092:46;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6092:46:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6092:46:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6092:46:16;;;;;;;;;:51;6071:139;;;;-1:-1:-1;;;6071:139:16;;;;;;;;7283:163;7360:22;7367:6;7375;7360;:22::i;4881:383::-;-1:-1:-1;;;;;4963:23:16;;584:42;4963:23;4959:299;;;5010:6;-1:-1:-1;;;;;5002:27:16;;5036:6;5002:43;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5002:43:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5002:43:16;;;;;4959:299;;;5076:29;5090:6;5098;5076:13;:29::i;:::-;5144:35;;-1:-1:-1;;;5144:35:16;;-1:-1:-1;;;;;5144:27:16;;;;;:35;;5172:6;;5144:35;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5144:35:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5144:35:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5144:35:16;;;;;;;;;:40;5119:128;;;;-1:-1:-1;;;5119:128:16;;;;;;;;4417:2400:25;4589:39;;:::i;:::-;4631:76;;;;4655:5;4631:76;;;4781:33;;4862:27;;;;4926;;;;4589:118;;-1:-1:-1;4781:33:25;;4718:31;5404:43;5434:12;5404:25;:11;5420:8;5404:25;:15;:25;:::i;:::-;:29;:43;:29;:43;:::i;:::-;5382:65;;5482:15;-1:-1:-1;;;;;5482:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5482:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5482:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5482:31:25;;;;;;;;;-1:-1:-1;;;;;5462:51:25;:16;-1:-1:-1;;;;;5462:51:25;;5458:541;;;5529:37;5536:16;5554:11;5529:6;:37::i;:::-;5458:541;;;5681:26;5718:16;-1:-1:-1;;;;;5710:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5710:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5710:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5710:38:25;;;;;;;;;5681:67;;5762:32;5797:90;5826:18;5862:11;5797;:90::i;:::-;5762:125;;5938:50;5945:16;5963:24;5938:6;:50::i;:::-;5458:541;;;6091:15;-1:-1:-1;;;;;6091:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6091:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6091:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6091:31:25;;;;;;;;;-1:-1:-1;;;;;6071:51:25;:16;-1:-1:-1;;;;;6071:51:25;;6067:744;;;6138:47;6155:16;6173:11;6138:16;:47::i;6067:744::-;6297:26;6334:16;-1:-1:-1;;;;;6326:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6326:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6326:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6326:38:25;;;;;;;;;6297:67;;6378:32;6413:99;6451:18;6487:11;6413:20;:99::i;:::-;6378:134;;6555:60;6572:16;6590:24;6555:16;:60::i;:::-;6668:132;6697:18;6733:24;6775:11;6668;:132::i;8006:2410::-;8479:16;-1:-1:-1;;;;;8459:36:25;:16;-1:-1:-1;;;;;8459:36:25;;;8438:110;;;;-1:-1:-1;;;8438:110:25;;;;;;;;;8764:31;8827:22;8764:95;;8988:21;9044:15;-1:-1:-1;;;;;9044:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9044:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9044:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;9044:31:25;;;;;;;;;-1:-1:-1;;;;;9024:51:25;:16;-1:-1:-1;;;;;9024:51:25;;9020:355;;;-1:-1:-1;9107:23:25;9020:355;;;9233:131;9279:16;-1:-1:-1;;;;;9271:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9271:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9271:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;9271:38:25;;;;;;;;;9327:23;9233:20;:131::i;:::-;9217:147;;9020:355;9524:53;9634:27;9623:39;;;;;;;;;;;;;-1:-1:-1;;26:21;;;22:32;6:49;;9623:39:25;;;;9580:136;;9676:30;;49:4:-1;9580:136:25;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;9580:136:25;;;9524:192;;9727:24;9827:15;-1:-1:-1;;;;;9827:53:25;;:55;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9827:55:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9827:55:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;9827:55:25;;;;;;;;;-1:-1:-1;;;;;9780:148:25;;:150;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;9780:150:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;9780:150:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;9780:150:25;;;;;;;;;9727:213;;9996:56;10014:15;10039:11;9996:17;:56::i;:::-;10110:11;-1:-1:-1;;;;;10110:21:25;;10145:15;10174;-1:-1:-1;;;;;10174:30:25;;:32;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10174:32:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;10174:32:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;10174:32:25;;;;;;;;;10220:13;10247:40;10110:187;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;10110:187:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;10110:187:25;;;;10353:56;10371:15;10396:11;10353:17;:56::i;:::-;8006:2410;;;;;;;;;;;:::o;6673:273:16:-;-1:-1:-1;;;;;6787:23:16;;584:42;6787:23;6783:120;;6826:66;6850:10;6870:4;6877:6;6885;6826:23;:66::i;:::-;6912:27;6924:6;6932;6912:11;:27::i;2366:446::-;2594:75;;-1:-1:-1;;;2594:75:16;;2568:23;;503:42;;2594:66;;:75;;2661:7;;2594:75;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2594:75:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2594:75:16;;;;;;39:16:-1;36:1;17:17;2:54;101:4;2594:75:16;80:15:-1;;;-1:-1;;76:31;65:43;;120:4;113:20;2594:75:16;;;;;;;;;2568:101;-1:-1:-1;2685:9:16;2680:126;2704:6;:13;2700:1;:17;2680:126;;;2746:6;2753:1;2746:9;;;;;;;;;;;;;;2759:1;2746:14;2738:57;;;;-1:-1:-1;;;2738:57:16;;;;;;;;;2719:3;;2680:126;;12584:2364:25;13034:38;13075:95;13115:16;13145:15;13075:26;:95::i;:::-;13034:136;-1:-1:-1;13414:23:25;13375:36;13490:47;13533:3;13490:38;13034:136;13525:2;13490:38;:34;:38;:::i;:::-;:42;:47;:42;:47;:::i;:::-;13447:90;;13586:32;13560:23;:58;13556:152;;;13665:32;13634:63;;13556:152;13756:275;13783:27;13824:15;13853:22;13889:16;13919:28;13961:16;13991:30;;13756:275;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;30:3:-1;22:6;14;1:33;99:1;81:16;;74:27;;;;-1:-1;13756:13:25;;-1:-1:-1;;;13756:275:25:i;:::-;14092:39;14134:95;14174:16;14204:15;14134:26;:95::i;:::-;14092:137;-1:-1:-1;14273:28:25;14304:89;:30;14092:137;14304:89;:34;:89;:::i;:::-;14273:120;;14683:23;14660:20;:46;14656:286;;;14722:209;14760:22;14800:16;14834:49;:23;14862:20;14834:49;:27;:49;:::i;:::-;14901:16;14722:20;:209::i;2818:326:16:-;2949:18;2978:6;-1:-1:-1;;;;;2970:26:16;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2970:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2970:28:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2970:28:16;;;;;;;;;3029:42;;-1:-1:-1;;;3029:42:16;;2949:49;;-1:-1:-1;;;;;;3029:26:16;;;;;:42;;3056:6;;3064;;3029:42;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3029:42:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3029:42:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3029:42:16;;;;;;;;;:50;;3075:4;3029:50;3008:129;;;;-1:-1:-1;;;3008:129:16;;;;;;;;7452:171;7537:22;7544:6;7552;7537;:22::i;808:477::-;942:7;979:11;1004:21;1039;1074:28;1123:6;-1:-1:-1;;;;;1115:34:16;;1150:5;1115:41;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1115:41:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1115:41:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1115:41:16;;;;;;;;;965:191;;-1:-1:-1;965:191:16;;-1:-1:-1;965:191:16;-1:-1:-1;965:191:16;-1:-1:-1;1229:49:16;1273:4;1229:39;965:191;;1229:39;:17;:39;:::i;:49::-;1222:56;;;;;;808:477;;;;;:::o;3736:436::-;-1:-1:-1;;;;;3813:23:16;;584:42;3813:23;3809:357;;;584:42;-1:-1:-1;;;;;3852:27:16;;3886:6;3852:43;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;3809:357:16;3989:29;4003:6;4011;3989:13;:29::i;:::-;4058:28;;-1:-1:-1;;;4058:28:16;;-1:-1:-1;;;;;4058:20:16;;;;;:28;;4079:6;;4058:28;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4058:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4058:28:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4058:28:16;;;;;;;;;:33;4033:122;;;;-1:-1:-1;;;4033:122:16;;;;;;;;1291:368;1448:18;1477:6;-1:-1:-1;;;;;1469:26:16;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1469:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1469:28:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1469:28:16;;;;;;;;;1528:58;;-1:-1:-1;;;1528:58:16;;1448:49;;-1:-1:-1;;;;;;1528:31:16;;;;;:58;;1560:6;;1568:9;;1579:6;;1528:58;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1528:58:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1528:58:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1528:58:16;;;;;;;;;1507:145;;;;-1:-1:-1;;;1507:145:16;;;;;;;;834:176:32;892:7;923:5;;;946:6;;;;938:46;;;;-1:-1:-1;;;938:46:32;;;;;;;;;1002:1;834:176;-1:-1:-1;;;834:176:32:o;514:160:24:-;599:4;622:45;634:12;648:9;664:1;622:11;:45::i;2311:208::-;2402:4;2442:33;2462:12;2442:19;:33::i;:::-;-1:-1:-1;;;;;2425:76:24;;2502:9;2425:87;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2425:87:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2425:87:24;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2425:87:24;;;;;;;;1117:355;1215:4;1231:16;1250:33;1270:12;1250:19;:33::i;:::-;1294:51;;-1:-1:-1;;;1294:51:24;;1231:52;;-1:-1:-1;;;;;;1294:28:24;;;;;:51;;1231:52;;1333:11;;1294:51;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1294:51:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1294:51:24;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1294:51:24;;;;;;;;;-1:-1:-1;1363:102:24;;-1:-1:-1;;;1363:102:24;;-1:-1:-1;;;;;1363:59:24;;;;;:102;;1423:11;;1436:12;;1461:2;1455:3;:8;;1363:102;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1363:102:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1363:102:24;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1363:102:24;;;;;;;;;1356:109;1117:355;-1:-1:-1;;;;;1117:355:24:o;1665:469:16:-;-1:-1:-1;;;;;1798:23:16;;584:42;1798:23;1794:334;;;1837:9;-1:-1:-1;;;;;1837:14:16;1858:6;1837:32;;;;;;;;;;;;;;;;;;;;;;;14:1:-1;21;16:31;;;;75:4;69:11;64:16;;144:4;140:9;133:4;115:16;111:27;107:43;104:1;100:51;94:4;87:65;169:16;166:1;159:27;225:16;222:1;215:4;212:1;208:12;193:49;7:242;;16:31;36:4;31:9;;7:242;;1837:32:16;;1794:334;;;1940:6;-1:-1:-1;;;;;1932:26:16;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1932:28:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1932:28:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1932:28:16;;;;;;;;;-1:-1:-1;;;;;1925:45:16;;1992:9;2023:6;1925:122;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1925:122:16;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1925:122:16;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1925:122:16;;;;;;;;;1900:217;;;;-1:-1:-1;;;1900:217:16;;;;;;;;1274:134:32;1332:7;1358:43;1362:1;1365;1358:43;;;;;;;;;;;;;;;;;:3;:43::i;2525:212:24:-;2618:4;2658:33;2678:12;2658:19;:33::i;:::-;-1:-1:-1;;;;;2641:76:24;;2718:11;2641:89;;;;;;;;;;;;;;;;939:305:25;1040:9;1069:12;-1:-1:-1;;;;;1060:32:25;;:34;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1060:34:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1060:34:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1060:34:25;;;;;;;;;1040:55;;1114:1;-1:-1:-1;;;;;1106:17:25;;1161:3;1145:21;;1137:30;;;1189:1;-1:-1:-1;;;;;1181:14:25;;:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1181:16:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1181:16:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1181:16:25;;;;;;;;;1219:1;-1:-1:-1;;;;;1211:14:25;;:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1211:16:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1211:16:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1211:16:25;;;;;;;;;1106:131;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1106:131:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1106:131:25;;;;939:305;;;:::o;1250:::-;1351:9;1380:12;-1:-1:-1;;;;;1371:32:25;;:34;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1371:34:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1371:34:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1371:34:25;;;;;;;;;1351:55;;1425:1;-1:-1:-1;;;;;1417:17:25;;1472:3;1456:21;;1448:30;;;1500:1;-1:-1:-1;;;;;1492:14:25;;:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;2159:459:32;2217:7;2458:6;2454:45;;-1:-1:-1;2487:1:32;2480:8;;2454:45;2521:5;;;2525:1;2521;:5;:1;2544:5;;;;;:10;2536:56;;;;-1:-1:-1;;;2536:56:32;;;;;;;;3073:130;3131:7;3157:39;3161:1;3164;3157:39;;;;;;;;;;;;;;;;;:3;:39::i;10507:1746:25:-;11089:16;-1:-1:-1;;;;;11069:36:25;:16;-1:-1:-1;;;;;11069:36:25;;;11048:112;;;;-1:-1:-1;;;11048:112:25;;;;;;;;;11171:20;11264:22;11337:60;11354:16;11372:24;11337:16;:60::i;:::-;11432:15;-1:-1:-1;;;;;11432:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11432:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11432:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;11432:31:25;;;;;;;;;-1:-1:-1;;;;;11412:51:25;:16;-1:-1:-1;;;;;11412:51:25;;11408:759;;;11522:123;11559:16;-1:-1:-1;;;;;11551:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11551:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11551:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;11551:38:25;;;;;;;;;11607:24;11522:11;:123::i;:::-;11507:138;;11408:759;;;11686:15;-1:-1:-1;;;;;11686:29:25;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11686:31:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11686:31:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;11686:31:25;;;;;;;;;-1:-1:-1;;;;;11666:51:25;:16;-1:-1:-1;;;;;11666:51:25;;11662:505;;;11776:123;11813:16;-1:-1:-1;;;;;11805:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;11805:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;11805:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;11805:38:25;;;;;;;;;11861:24;11776:11;:123::i;11662:505::-;11975:181;12014:16;-1:-1:-1;;;;;12006:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12006:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;12006:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;12006:38:25;;;;;;;;;12070:16;-1:-1:-1;;;;;12062:36:25;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;12062:38:25;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;12062:38:25;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;12062:38:25;;;;;;;;;12118:24;11975:13;:181::i;:::-;11960:196;;11662:505;12208:38;12215:16;12233:12;12208:6;:38::i;:::-;10507:1746;;;;;;:::o;680:269:24:-;786:4;826:33;846:12;826:19;:33::i;:::-;-1:-1:-1;;;;;809:84:24;;900:9;911:14;932:3;938:2;932:8;809:133;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;809:133:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;809:133:24;;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;809:133:24;;;;;;;;;802:140;680:269;-1:-1:-1;;;;680:269:24:o;337:171::-;437:64;;-1:-1:-1;;;437:64:24;;411:7;;288:42;;437:50;;:64;;488:12;;437:64;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;437:64:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;437:64:24;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;437:64:24;;;;;;;;1732:187:32;1818:7;1853:12;1845:6;;;;1837:29;;;;-1:-1:-1;;;1837:29:32;;;;;;;;;;-1:-1:-1;;;1888:5:32;;;1732:187::o;3718:338::-;3804:7;3904:12;3897:5;3889:28;;;;-1:-1:-1;;;3889:28:32;;;;;;;;;;;3927:9;3943:1;3939;:5;;;;;;;3718:338;-1:-1:-1;;;;;3718:338:32:o;955:156:24:-;1034:4;1057:47;1069:12;1083:11;1101:1;1057:11;:47::i;1717:160::-;1802:4;1825:45;1839:4;1845:2;1849:11;1867:1;1583:4;1599:14;1616:32;1628:4;1634:13;1616:11;:32::i;:::-;1599:49;;1665:39;1677:2;1681:9;1692:11;1665;:39::i;:::-;1658:46;1478:233;-1:-1:-1;;;;;;1478:233:24:o;720:14230:25:-;;;;;;;;;-1:-1:-1;720:14230:25;;;;;;;;;;;;;;;;;:::o;5:130:-1:-;72:20;;97:33;72:20;97:33;;142:134;220:13;;238:33;220:13;238:33;;454:707;;571:3;564:4;556:6;552:17;548:27;538:2;;589:1;586;579:12;538:2;626:6;613:20;648:80;663:64;720:6;663:64;;;648:80;;;639:89;;745:5;770:6;763:5;756:21;800:4;792:6;788:17;778:27;;822:4;817:3;813:14;806:21;;875:6;922:3;914:4;906:6;902:17;897:3;893:27;890:36;887:2;;;939:1;936;929:12;887:2;964:1;949:206;974:6;971:1;968:13;949:206;;;1032:3;1054:37;1087:3;1075:10;1054:37;;;1042:50;;-1:-1;1115:4;1106:14;;;;1134;;;;;996:1;989:9;949:206;;;953:14;531:630;;;;;;;;1187:722;;1315:3;1308:4;1300:6;1296:17;1292:27;1282:2;;1333:1;1330;1323:12;1282:2;1363:6;1357:13;1385:80;1400:64;1457:6;1400:64;;1385:80;1376:89;;1482:5;1507:6;1500:5;1493:21;1537:4;1529:6;1525:17;1515:27;;1559:4;1554:3;1550:14;1543:21;;1612:6;1659:3;1651:4;1643:6;1639:17;1634:3;1630:27;1627:36;1624:2;;;1676:1;1673;1666:12;1624:2;1701:1;1686:217;1711:6;1708:1;1705:13;1686:217;;;1769:3;1791:48;1835:3;1823:10;1791:48;;;1779:61;;-1:-1;1863:4;1854:14;;;;1882;;;;;1733:1;1726:9;1686:217;;1917:128;1992:13;;2010:30;1992:13;2010:30;;2052:134;2130:13;;2148:33;2130:13;2148:33;;2207:336;;;2321:3;2314:4;2306:6;2302:17;2298:27;2288:2;;2339:1;2336;2329:12;2288:2;-1:-1;2359:20;;2399:18;2388:30;;2385:2;;;2431:1;2428;2421:12;2385:2;2465:4;2457:6;2453:17;2441:29;;2516:3;2508:4;2500:6;2496:17;2486:8;2482:32;2479:41;2476:2;;;2533:1;2530;2523:12;2476:2;2281:262;;;;;;2552:440;;2653:3;2646:4;2638:6;2634:17;2630:27;2620:2;;2671:1;2668;2661:12;2620:2;2708:6;2695:20;2730:64;2745:48;2786:6;2745:48;;2730:64;2721:73;;2814:6;2807:5;2800:21;2850:4;2842:6;2838:17;2883:4;2876:5;2872:16;2918:3;2909:6;2904:3;2900:16;2897:25;2894:2;;;2935:1;2932;2925:12;2894:2;2945:41;2979:6;2974:3;2969;2945:41;;;2613:379;;;;;;;;3000:174;3098:13;;3116:53;3098:13;3116:53;;3237:663;;3361:4;3349:9;3344:3;3340:19;3336:30;3333:2;;;3379:1;3376;3369:12;3333:2;3397:20;3412:4;3397:20;;;3388:29;-1:-1;3485:1;3517:49;3562:3;3542:9;3517:49;;;3492:75;;-1:-1;3640:2;3673:49;3718:3;3694:22;;;3673:49;;;3666:4;3659:5;3655:16;3648:75;3588:146;3796:2;3829:49;3874:3;3865:6;3854:9;3850:22;3829:49;;;3822:4;3815:5;3811:16;3804:75;3744:146;3327:573;;;;;3907:130;3974:20;;3999:33;3974:20;3999:33;;4185:263;;4300:2;4288:9;4279:7;4275:23;4271:32;4268:2;;;4316:1;4313;4306:12;4268:2;4351:1;4368:64;4424:7;4404:9;4368:64;;4455:366;;;4576:2;4564:9;4555:7;4551:23;4547:32;4544:2;;;4592:1;4589;4582:12;4544:2;4627:1;4644:53;4689:7;4669:9;4644:53;;;4634:63;;4606:97;4734:2;4752:53;4797:7;4788:6;4777:9;4773:22;4752:53;;;4742:63;;4713:98;4538:283;;;;;;4828:1135;;;;;;;;;5061:3;5049:9;5040:7;5036:23;5032:33;5029:2;;;5078:1;5075;5068:12;5029:2;5113:1;5130:53;5175:7;5155:9;5130:53;;;5120:63;;5092:97;5220:2;5238:61;5291:7;5282:6;5271:9;5267:22;5238:61;;;5228:71;;5199:106;5336:2;5354:53;5399:7;5390:6;5379:9;5375:22;5354:53;;;5344:63;;5315:98;5444:2;5462:53;5507:7;5498:6;5487:9;5483:22;5462:53;;;5452:63;;5423:98;5552:3;5571:53;5616:7;5607:6;5596:9;5592:22;5571:53;;;5561:63;;5531:99;5661:3;5680:53;5725:7;5716:6;5705:9;5701:22;5680:53;;;5670:63;;5640:99;5798:3;5787:9;5783:19;5770:33;5823:18;5815:6;5812:30;5809:2;;;5855:1;5852;5845:12;5809:2;5883:64;5939:7;5930:6;5919:9;5915:22;5883:64;;;5873:74;;;;5749:204;5023:940;;;;;;;;;;;;5970:1115;;;;;;;;6193:3;6181:9;6172:7;6168:23;6164:33;6161:2;;;6210:1;6207;6200:12;6161:2;6245:1;6262:53;6307:7;6287:9;6262:53;;;6252:63;;6224:97;6352:2;6370:61;6423:7;6414:6;6403:9;6399:22;6370:61;;;6360:71;;6331:106;6468:2;6486:53;6531:7;6522:6;6511:9;6507:22;6486:53;;;6476:63;;6447:98;6576:2;6594:53;6639:7;6630:6;6619:9;6615:22;6594:53;;;6584:63;;6555:98;6684:3;6703:53;6748:7;6739:6;6728:9;6724:22;6703:53;;;6693:63;;6663:99;6793:3;6812:53;6857:7;6848:6;6837:9;6833:22;6812:53;;;6802:63;;6772:99;6930:3;6919:9;6915:19;6902:33;6955:18;6947:6;6944:30;6941:2;;;6987:1;6984;6977:12;6941:2;7007:62;7061:7;7052:6;7041:9;7037:22;7007:62;;;6997:72;;6881:194;6155:930;;;;;;;;;;;7092:491;;;;7230:2;7218:9;7209:7;7205:23;7201:32;7198:2;;;7246:1;7243;7236:12;7198:2;7281:1;7298:53;7343:7;7323:9;7298:53;;;7288:63;;7260:97;7388:2;7406:53;7451:7;7442:6;7431:9;7427:22;7406:53;;;7396:63;;7367:98;7496:2;7514:53;7559:7;7550:6;7539:9;7535:22;7514:53;;;7504:63;;7475:98;7192:391;;;;;;7590:366;;;7711:2;7699:9;7690:7;7686:23;7682:32;7679:2;;;7727:1;7724;7717:12;7679:2;7762:1;7779:53;7824:7;7804:9;7779:53;;;7769:63;;7741:97;7869:2;7887:53;7932:7;7923:6;7912:9;7908:22;7887:53;;7963:617;;;;;8118:3;8106:9;8097:7;8093:23;8089:33;8086:2;;;8135:1;8132;8125:12;8086:2;8170:1;8187:53;8232:7;8212:9;8187:53;;;8177:63;;8149:97;8277:2;8295:53;8340:7;8331:6;8320:9;8316:22;8295:53;;;8285:63;;8256:98;8385:2;8403:53;8448:7;8439:6;8428:9;8424:22;8403:53;;;8393:63;;8364:98;8493:2;8511:53;8556:7;8547:6;8536:9;8532:22;8511:53;;;8501:63;;8472:98;8080:500;;;;;;;;8587:377;;8716:2;8704:9;8695:7;8691:23;8687:32;8684:2;;;8732:1;8729;8722:12;8684:2;8767:31;;8818:18;8807:30;;8804:2;;;8850:1;8847;8840:12;8804:2;8870:78;8940:7;8931:6;8920:9;8916:22;8870:78;;8971:392;;9111:2;9099:9;9090:7;9086:23;9082:32;9079:2;;;9127:1;9124;9117:12;9079:2;9162:24;;9206:18;9195:30;;9192:2;;;9238:1;9235;9228:12;9192:2;9258:89;9339:7;9330:6;9319:9;9315:22;9258:89;;9370:257;;9482:2;9470:9;9461:7;9457:23;9453:32;9450:2;;;9498:1;9495;9488:12;9450:2;9533:1;9550:61;9603:7;9583:9;9550:61;;9634:263;;9749:2;9737:9;9728:7;9724:23;9720:32;9717:2;;;9765:1;9762;9755:12;9717:2;9800:1;9817:64;9873:7;9853:9;9817:64;;9904:303;;10039:2;10027:9;10018:7;10014:23;10010:32;10007:2;;;10055:1;10052;10045:12;10007:2;10090:1;10107:84;10183:7;10163:9;10107:84;;10214:311;;10353:2;10341:9;10332:7;10328:23;10324:32;10321:2;;;10369:1;10366;10359:12;10321:2;10404:1;10421:88;10501:7;10481:9;10421:88;;10802:741;;;;;;10976:3;10964:9;10955:7;10951:23;10947:33;10944:2;;;10993:1;10990;10983:12;10944:2;11028:1;11045:53;11090:7;11070:9;11045:53;;;11035:63;;11007:97;11135:2;11153:53;11198:7;11189:6;11178:9;11174:22;11153:53;;;11143:63;;11114:98;11243:2;11261:53;11306:7;11297:6;11286:9;11282:22;11261:53;;;11251:63;;11222:98;11379:2;11368:9;11364:18;11351:32;11403:18;11395:6;11392:30;11389:2;;;11435:1;11432;11425:12;11389:2;11463:64;11519:7;11510:6;11499:9;11495:22;11463:64;;;11453:74;;;;11330:203;10938:605;;;;;;;;;11550:672;;;;;11716:3;11704:9;11695:7;11691:23;11687:33;11684:2;;;11733:1;11730;11723:12;11684:2;11768:1;11785:64;11841:7;11821:9;11785:64;;;11775:74;;11747:108;11886:2;11904:64;11960:7;11951:6;11940:9;11936:22;11904:64;;;11894:74;;11865:109;12005:2;12023:64;12079:7;12070:6;12059:9;12055:22;12023:64;;;12013:74;;11984:109;12124:2;12142:64;12198:7;12189:6;12178:9;12174:22;12142:64;;12230:173;;12317:46;12359:3;12351:6;12317:46;;;-1:-1;;12392:4;12383:14;;12310:93;12411:142;12502:45;12541:5;12502:45;;;12497:3;12490:58;12484:69;;;12560:103;12633:24;12651:5;12633:24;;12821:690;;12966:54;13014:5;12966:54;;;13033:86;13112:6;13107:3;13033:86;;;13026:93;;13140:56;13190:5;13140:56;;;13216:7;13244:1;13229:260;13254:6;13251:1;13248:13;13229:260;;;13321:6;13315:13;13342:63;13401:3;13386:13;13342:63;;;13335:70;;13422:60;13475:6;13422:60;;;13412:70;-1:-1;;13276:1;13269:9;13229:260;;;-1:-1;13502:3;;12945:566;-1:-1;;;;;12945:566;13519:113;13602:24;13620:5;13602:24;;13639:343;;13749:38;13781:5;13749:38;;;13799:70;13862:6;13857:3;13799:70;;;13792:77;;13874:52;13919:6;13914:3;13907:4;13900:5;13896:16;13874:52;;;13947:29;13969:6;13947:29;;;13938:39;;;;13729:253;-1:-1;;;13729:253;13989:356;;14117:38;14149:5;14117:38;;;14167:88;14248:6;14243:3;14167:88;;;14160:95;;14260:52;14305:6;14300:3;14293:4;14286:5;14282:16;14260:52;;;14324:16;;;;;14097:248;-1:-1;;14097:248;14707:327;;14867:67;14931:2;14926:3;14867:67;;;14967:29;14947:50;;15025:2;15016:12;;14853:181;-1:-1;;14853:181;15043:330;;15203:67;15267:2;15262:3;15203:67;;;15303:32;15283:53;;15364:2;15355:12;;15189:184;-1:-1;;15189:184;15382:330;;15542:67;15606:2;15601:3;15542:67;;;15642:32;15622:53;;15703:2;15694:12;;15528:184;-1:-1;;15528:184;15721:378;;15881:67;15945:2;15940:3;15881:67;;;15981:34;15961:55;;-1:-1;;;16045:2;16036:12;;16029:33;16090:2;16081:12;;15867:232;-1:-1;;15867:232;16108:377;;16268:67;16332:2;16327:3;16268:67;;;16368:34;16348:55;;-1:-1;;;16432:2;16423:12;;16416:32;16476:2;16467:12;;16254:231;-1:-1;;16254:231;16494:330;;16654:67;16718:2;16713:3;16654:67;;;16754:32;16734:53;;16815:2;16806:12;;16640:184;-1:-1;;16640:184;16833:370;;16993:67;17057:2;17052:3;16993:67;;;17093:34;17073:55;;-1:-1;;;17157:2;17148:12;;17141:25;17194:2;17185:12;;16979:224;-1:-1;;16979:224;17212:372;;17372:67;17436:2;17431:3;17372:67;;;17472:34;17452:55;;-1:-1;;;17536:2;17527:12;;17520:27;17575:2;17566:12;;17358:226;-1:-1;;17358:226;17593:329;;17753:67;17817:2;17812:3;17753:67;;;17853:31;17833:52;;17913:2;17904:12;;17739:183;-1:-1;;17739:183;17931:296;;18108:83;18189:1;18184:3;18108:83;;18236:332;;18396:67;18460:2;18455:3;18396:67;;;18496:34;18476:55;;18559:2;18550:12;;18382:186;-1:-1;;18382:186;18577:327;;18737:67;18801:2;18796:3;18737:67;;;18837:29;18817:50;;18895:2;18886:12;;18723:181;-1:-1;;18723:181;18913:373;;19073:67;19137:2;19132:3;19073:67;;;19173:34;19153:55;;-1:-1;;;19237:2;19228:12;;19221:28;19277:2;19268:12;;19059:227;-1:-1;;19059:227;19295:329;;19455:67;19519:2;19514:3;19455:67;;;19555:31;19535:52;;19615:2;19606:12;;19441:183;-1:-1;;19441:183;19633:330;;19793:67;19857:2;19852:3;19793:67;;;19893:32;19873:53;;19954:2;19945:12;;19779:184;-1:-1;;19779:184;20091:419;;20281:93;20370:3;20361:6;20281:93;;;20274:100;;20392:93;20481:3;20472:6;20392:93;;20517:370;;20715:147;20858:3;20715:147;;20894:213;21012:2;20997:18;;21026:71;21001:9;21070:6;21026:71;;21114:647;21342:3;21327:19;;21357:79;21331:9;21409:6;21357:79;;;21447:72;21515:2;21504:9;21500:18;21491:6;21447:72;;;21530;21598:2;21587:9;21583:18;21574:6;21530:72;;;21650:9;21644:4;21640:20;21635:2;21624:9;21620:18;21613:48;21675:76;21746:4;21737:6;21675:76;;21768:435;21942:2;21927:18;;21956:71;21931:9;22000:6;21956:71;;;22038:72;22106:2;22095:9;22091:18;22082:6;22038:72;;;22121;22189:2;22178:9;22174:18;22165:6;22121:72;;22210:324;22356:2;22341:18;;22370:71;22345:9;22414:6;22370:71;;;22452:72;22520:2;22509:9;22505:18;22496:6;22452:72;;22541:361;22709:2;22723:47;;;22694:18;;22784:108;22694:18;22878:6;22784:108;;22909:435;23083:2;23068:18;;23097:71;23072:9;23141:6;23097:71;;;23179:72;23247:2;23236:9;23232:18;23223:6;23179:72;;23351:301;23489:2;23503:47;;;23474:18;;23564:78;23474:18;23628:6;23564:78;;23659:407;23850:2;23864:47;;;23835:18;;23925:131;23835:18;23925:131;;24073:407;24264:2;24278:47;;;24249:18;;24339:131;24249:18;24339:131;;24487:407;24678:2;24692:47;;;24663:18;;24753:131;24663:18;24753:131;;24901:407;25092:2;25106:47;;;25077:18;;25167:131;25077:18;25167:131;;25315:407;25506:2;25520:47;;;25491:18;;25581:131;25491:18;25581:131;;25729:407;25920:2;25934:47;;;25905:18;;25995:131;25905:18;25995:131;;26143:407;26334:2;26348:47;;;26319:18;;26409:131;26319:18;26409:131;;26557:407;26748:2;26762:47;;;26733:18;;26823:131;26733:18;26823:131;;26971:407;27162:2;27176:47;;;27147:18;;27237:131;27147:18;27237:131;;27385:407;27576:2;27590:47;;;27561:18;;27651:131;27561:18;27651:131;;27799:407;27990:2;28004:47;;;27975:18;;28065:131;27975:18;28065:131;;28213:407;28404:2;28418:47;;;28389:18;;28479:131;28389:18;28479:131;;28627:407;28818:2;28832:47;;;28803:18;;28893:131;28803:18;28893:131;;29041:407;29232:2;29246:47;;;29217:18;;29307:131;29217:18;29307:131;;29455:213;29573:2;29558:18;;29587:71;29562:9;29631:6;29587:71;;29675:324;29821:2;29806:18;;29835:71;29810:9;29879:6;29835:71;;30448:256;30510:2;30504:9;30536:17;;;30611:18;30596:34;;30632:22;;;30593:62;30590:2;;;30668:1;30665;30658:12;30590:2;30684;30677:22;30488:216;;-1:-1;30488:216;30711:304;;30870:18;30862:6;30859:30;30856:2;;;30902:1;30899;30892:12;30856:2;-1:-1;30937:4;30925:17;;;30990:15;;30793:222;31333:321;;31476:18;31468:6;31465:30;31462:2;;;31508:1;31505;31498:12;31462:2;-1:-1;31639:4;31575;31552:17;;;;-1:-1;;31548:33;31629:15;;31399:255;31661:151;31785:4;31776:14;;31733:79;31819:137;31922:12;;31893:63;32336:178;32454:19;;;32503:4;32494:14;;32447:67;32694:144;32829:3;32807:31;-1:-1;32807:31;33018:91;;33080:24;33098:5;33080:24;;33222:85;33288:13;33281:21;;33264:43;33314:72;33376:5;33359:27;33393:111;;33475:24;33493:5;33475:24;;33511:121;-1:-1;;;;;33573:54;;33556:76;33718:129;;33805:37;33836:5;33805:37;;34098:145;34179:6;34174:3;34169;34156:30;-1:-1;34235:1;34217:16;;34210:27;34149:94;34252:268;34317:1;34324:101;34338:6;34335:1;34332:13;34324:101;;;34405:11;;;34399:18;34386:11;;;34379:39;34360:2;34353:10;34324:101;;;34440:6;34437:1;34434:13;34431:2;;;-1:-1;;34505:1;34487:16;;34480:27;34301:219;34528:97;34616:2;34596:14;-1:-1;;34592:28;;34576:49;34633:117;34702:24;34720:5;34702:24;;;34695:5;34692:35;34682:2;;34741:1;34738;34731:12;34897:111;34963:21;34978:5;34963:21;;35015:117;35084:24;35102:5;35084:24;;35139:157;35228:44;35266:5;35228:44;", + "source": "/*\n Dedge's Aave and Compound manager\n*/\n\npragma solidity 0.5.16;\npragma experimental ABIEncoderV2;\n\nimport \"../lib/compound/CompoundBase.sol\";\n\nimport \"../lib/dapphub/Guard.sol\";\n\nimport \"../lib/uniswap/UniswapLiteBase.sol\";\n\nimport \"../interfaces/aave/ILendingPoolAddressesProvider.sol\";\nimport \"../interfaces/aave/ILendingPool.sol\";\nimport \"../interfaces/aave/ILendingPoolParametersProvider.sol\";\n\nimport \"../interfaces/compound/ICompoundPriceOracle.sol\";\nimport \"../interfaces/compound/IComptroller.sol\";\nimport \"../interfaces/compound/ICEther.sol\";\nimport \"../interfaces/compound/ICToken.sol\";\n\nimport \"../interfaces/IERC20.sol\";\n\nimport \"../registries/AddressRegistry.sol\";\n\nimport \"../proxies/DACProxy.sol\";\n\n\ncontract DedgeCompoundManager is UniswapLiteBase, CompoundBase {\n struct SwapOperationCalldata {\n address addressRegistryAddress;\n address oldCTokenAddress;\n address newCTokenAddress;\n }\n\n function _proxyGuardPermit(address payable proxyAddress, address src)\n internal\n {\n address g = address(DACProxy(proxyAddress).authority());\n\n DSGuard(g).permit(\n bytes32(bytes20(address(src))),\n DSGuard(g).ANY(),\n DSGuard(g).ANY()\n );\n }\n\n function _proxyGuardForbid(address payable proxyAddress, address src)\n internal\n {\n address g = address(DACProxy(proxyAddress).authority());\n\n DSGuard(g).forbid(\n bytes32(bytes20(address(src))),\n DSGuard(g).ANY(),\n DSGuard(g).ANY()\n );\n }\n\n function swapDebtPostLoan(\n uint256 _loanAmount,\n uint256 _aaveFee,\n uint256 _protocolFee,\n bytes calldata _data\n ) external {\n SwapOperationCalldata memory soCalldata = abi.decode(\n _data,\n (SwapOperationCalldata)\n );\n\n AddressRegistry addressRegistry = AddressRegistry(\n soCalldata.addressRegistryAddress\n );\n\n address oldCTokenAddress = soCalldata.oldCTokenAddress;\n address newCTokenAddress = soCalldata.newCTokenAddress;\n\n uint256 debtAmount = _loanAmount.add(_aaveFee).add(_protocolFee);\n\n // Note: debtAmount = loanAmount + fees\n // 1. Has ETH from Aave flashloan\n // 2. Converts ETH to oldCToken underlying\n // 3. Repays oldCToken underlying\n // 4. Calculates new amount to borrow from new token to repay debtAmount\n // 5. Borrows from new token\n // 6. Convert new token to ETH\n\n // Steps 2 + 3\n // Converts ETH to oldCToken underlying and repay\n // Unless old target underlying is already ether\n if (oldCTokenAddress == addressRegistry.CEtherAddress()) {\n repayBorrow(oldCTokenAddress, _loanAmount);\n } else {\n // Gets old token underlying and amount\n address oldTokenUnderlying = ICToken(oldCTokenAddress).underlying();\n\n uint256 oldTokenUnderlyingAmount = _ethToToken(\n oldTokenUnderlying,\n _loanAmount\n );\n\n // Approves CToken proxy and repays them\n IERC20(oldTokenUnderlying).approve(\n oldCTokenAddress,\n oldTokenUnderlyingAmount\n );\n\n // Repays CToken\n repayBorrow(oldCTokenAddress, oldTokenUnderlyingAmount);\n }\n\n // Steps 4, 5, 6\n // Calculates new debt amount to borrow\n // Unless new target underlying is already ether\n if (newCTokenAddress == addressRegistry.CEtherAddress()) {\n borrow(newCTokenAddress, debtAmount);\n } else {\n // Gets new token underlying\n address newTokenUnderlying = ICToken(newCTokenAddress).underlying();\n\n // Calculates amount of old token underlying that needs to be borrowed\n // to repay debts\n uint256 newTokenUnderlyingAmount = _getTokenToEthOutput(\n newTokenUnderlying,\n debtAmount\n );\n\n // Borrows new debt\n borrow(newCTokenAddress, newTokenUnderlyingAmount);\n\n // Converts to ether\n // Note this part is a bit more strict as we need to have\n // enough ETH to repay Aave\n _tokenToEth(\n newTokenUnderlying,\n newTokenUnderlyingAmount,\n debtAmount\n );\n }\n }\n\n function swapCollateralPostLoan(\n uint256 _loanAmount,\n uint256 _aaveFee,\n uint256 _protocolFee,\n bytes calldata _data\n ) external {\n SwapOperationCalldata memory soCalldata = abi.decode(\n _data,\n (SwapOperationCalldata)\n );\n\n AddressRegistry addressRegistry = AddressRegistry(\n soCalldata.addressRegistryAddress\n );\n\n address oldCTokenAddress = soCalldata.oldCTokenAddress;\n address newCTokenAddress = soCalldata.newCTokenAddress;\n\n // 1. Has ETH from Aave flashloan\n // 2. Converts ETH into newCToken underlying\n // 3. Supplies newCToken underlying\n // 4. Redeems oldCToken underlying\n // 5. Converts outCToken underlying to ETH\n // 6. Borrow ETH to repay aave\n\n // Steps 2 + 3\n // Converts ETH to newCToken underlying and supply\n // Unless old target underlying is already ether\n uint256 repayAmount = _loanAmount.sub(_aaveFee).sub(_protocolFee);\n\n if (newCTokenAddress == addressRegistry.CEtherAddress()) {\n supply(newCTokenAddress, repayAmount);\n } else {\n // Gets new token underlying and converts ETH into newCToken underlying\n address newTokenUnderlying = ICToken(newCTokenAddress).underlying();\n uint256 newTokenUnderlyingAmount = _ethToToken(\n newTokenUnderlying,\n repayAmount\n );\n\n // Supplies new CTokens\n supply(newCTokenAddress, newTokenUnderlyingAmount);\n }\n\n // Steps 4, 5\n // Redeem CToken underlying\n if (oldCTokenAddress == addressRegistry.CEtherAddress()) {\n redeemUnderlying(oldCTokenAddress, _loanAmount);\n } else {\n // Gets old token underlying and amount to redeem (based on uniswap)\n address oldTokenUnderlying = ICToken(oldCTokenAddress).underlying();\n uint256 oldTokenUnderlyingAmount = _getTokenToEthOutput(\n oldTokenUnderlying,\n _loanAmount\n );\n\n // Redeems them\n redeemUnderlying(oldCTokenAddress, oldTokenUnderlyingAmount);\n\n // Converts them into ETH\n _tokenToEth(\n oldTokenUnderlying,\n oldTokenUnderlyingAmount,\n _loanAmount\n );\n }\n }\n\n /*\n Main entry point for swapping collateral / debt\n\n @params:\n\n dedgeCompoundManagerAddress: Dedge Compound Manager address\n dacProxyAddress: User's proxy address\n addressRegistryAddress: AddressRegistry's Address\n oldCTokenAddress: oldCToken address\n oldTokenUnderlyingDelta: Amount of tokens to swap from old c token's underlying\n executeOperationCalldataParams:\n Abi-encoded `data` used by User's proxy's `execute(address, )` function.\n Used to delegatecall to another contract (i.e. this contract) in the context\n of the proxy. This allows us to decouple the logic of handling flashloans\n from the proxy contract. In this specific case, it is expecting the results\n from: (from JS)\n\n ```\n const IDedgeCompoundManager = ethers.utils.Interface(DedgeCompoundManager.abi)\n\n const executeOperationCalldataParams = IDedgeCompoundManager\n .functions\n .swapDebt OR .swapCollateral\n .encode([\n \n ])\n ```\n */\n function swapOperation(\n address dedgeCompoundManagerAddress,\n address payable dacProxyAddress,\n address addressRegistryAddress,\n address oldCTokenAddress, // Old CToken address for [debt|collateral]\n uint256 oldTokenUnderlyingDelta, // Amount of old tokens to swap to new tokens\n address newCTokenAddress,\n bytes memory executeOperationCalldataParams\n ) public payable {\n require(\n oldCTokenAddress != newCTokenAddress,\n \"swap-operation-same-address\"\n );\n\n // Calling from dacProxy context (msg.sender is dacProxy)\n // 1. Get amount of ETH obtained by selling that from Uniswap\n // 2. Flashloans ETH to dacProxy\n\n // Gets registries\n AddressRegistry addressRegistry = AddressRegistry(\n addressRegistryAddress\n );\n\n // 1. Get amount of ETH needed\n // If the old target is ether than the ethDebtAmount is just the delta\n uint256 ethDebtAmount;\n\n if (oldCTokenAddress == addressRegistry.CEtherAddress()) {\n ethDebtAmount = oldTokenUnderlyingDelta;\n } else {\n // Otherwise calculate it from the exchange\n ethDebtAmount = _getEthToTokenOutput(\n ICToken(oldCTokenAddress).underlying(),\n oldTokenUnderlyingDelta\n );\n }\n\n // Injects the target address into calldataParams\n // so user proxy know which address it'll be calling `calldataParams` on\n bytes memory addressAndExecuteOperationCalldataParams = abi\n .encodePacked(\n abi.encode(dedgeCompoundManagerAddress),\n executeOperationCalldataParams\n );\n\n ILendingPool lendingPool = ILendingPool(\n ILendingPoolAddressesProvider(\n addressRegistry.AaveLendingPoolAddressProviderAddress()\n )\n .getLendingPool()\n );\n\n // Approve lendingPool to call proxy\n _proxyGuardPermit(dacProxyAddress, address(lendingPool));\n\n // 3. Flashloan ETH with relevant data\n lendingPool.flashLoan(\n dacProxyAddress,\n addressRegistry.AaveEthAddress(),\n ethDebtAmount,\n addressAndExecuteOperationCalldataParams\n );\n\n // Forbids lendingPool to call proxy\n _proxyGuardForbid(dacProxyAddress, address(lendingPool));\n }\n\n // Helper function to clear out collateral dust\n // after swapping collateral\n function _clearCollateralDust(\n address addressRegistryAddress,\n address oldCTokenAddress,\n uint256 oldTokenUnderlyingAmount,\n address newCTokenAddress\n ) internal {\n // i.e. Has 10 ETH collateral and 10 DAI collateral\n // wants to have it all in ETH\n\n // 1. Redeems 10 DAI collateral\n // 2. Converts it to ETH\n // 3. Puts it into ETH\n\n // More abstractly,\n // 1. Redeems tokens\n // 2. Convert it to other token\n // 3. Put other token in\n\n require(\n oldCTokenAddress != newCTokenAddress,\n \"clear-collateral-same-address\"\n );\n\n uint256 supplyAmount;\n AddressRegistry addressRegistry = AddressRegistry(\n addressRegistryAddress\n );\n\n // Redeems collateral\n redeemUnderlying(oldCTokenAddress, oldTokenUnderlyingAmount);\n\n if (oldCTokenAddress == addressRegistry.CEtherAddress()) {\n // ETH -> Token\n supplyAmount = _ethToToken(\n ICToken(newCTokenAddress).underlying(),\n oldTokenUnderlyingAmount\n );\n } else if (newCTokenAddress == addressRegistry.CEtherAddress()) {\n // Token -> ETH\n supplyAmount = _tokenToEth(\n ICToken(oldCTokenAddress).underlying(),\n oldTokenUnderlyingAmount\n );\n } else {\n // Token -> Token\n supplyAmount = _tokenToToken(\n ICToken(oldCTokenAddress).underlying(),\n ICToken(newCTokenAddress).underlying(),\n oldTokenUnderlyingAmount\n );\n }\n\n // Supplies collateral\n supply(newCTokenAddress, supplyAmount);\n }\n\n // Due to the limitations of swap-collateral we can't swap 100% of the collateral,\n // As such, we introduce a new function: \"swapOperationAndClearCollateralDust\"\n // that performs a swap collateral operation and clears the underlying dust difference,\n // IF the oldTokenUnderlyingDelta > 95% of underlyingDelta\n function swapOperationAndClearCollateralDust(\n address dedgeCompoundManagerAddress,\n address payable dacProxyAddress,\n address addressRegistryAddress,\n address oldCTokenAddress, // Old CToken address for [debt|collateral]\n uint256 oldTokenUnderlyingDelta, // Amount of old tokens to swap to new tokens\n address newCTokenAddress,\n bytes calldata executeOperationCalldataParams\n ) external {\n uint256 initialBorrowBalanceUnderlying = getBorrowBalanceUnderlying(\n oldCTokenAddress,\n dacProxyAddress\n );\n\n // If we wanna swap > 93% of our collateral,\n // we need to swap then clear the dust as\n // we can only flashloan and swap 93% of underlying\n // due to slippages :(\n uint256 oldTokenUnderlyingDeltaFixed = oldTokenUnderlyingDelta;\n uint256 oldTokenUnderlyingDeltaThreshold = initialBorrowBalanceUnderlying.mul(95).div(100);\n \n if (oldTokenUnderlyingDelta > oldTokenUnderlyingDeltaThreshold) {\n oldTokenUnderlyingDeltaFixed = oldTokenUnderlyingDeltaThreshold;\n }\n\n // Swap tokens via flashloans\n swapOperation(\n dedgeCompoundManagerAddress,\n dacProxyAddress,\n addressRegistryAddress,\n oldCTokenAddress,\n oldTokenUnderlyingDeltaFixed,\n newCTokenAddress,\n executeOperationCalldataParams\n );\n\n // Re calculate borrow balance underlying\n uint256 postSwapBorrowBalanceUnderlying = getBorrowBalanceUnderlying(\n oldCTokenAddress,\n dacProxyAddress\n );\n\n // How much was swapped?\n uint256 oldTokenSwappedDelta = initialBorrowBalanceUnderlying.sub(\n postSwapBorrowBalanceUnderlying\n );\n\n // If how much we swapped is not gte then `oldTokenUnderlyingDelta`\n // We will clear the dust between the delta of the two\n // NOTE: Assumption is that user has borrowing power\n // to borrow 7.5% of their collateral\n if (oldTokenSwappedDelta < oldTokenUnderlyingDelta) {\n _clearCollateralDust(\n addressRegistryAddress,\n oldCTokenAddress,\n oldTokenUnderlyingDelta.sub(oldTokenSwappedDelta),\n newCTokenAddress\n );\n }\n }\n}\n", "sourcePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeCompoundManager.sol", "ast": { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeCompoundManager.sol", "exportedSymbols": { "DedgeCompoundManager": [ - 5896 + 5887 ] }, - "id": 5897, + "id": 5888, "nodeType": "SourceUnit", "nodes": [ { - "id": 5196, + "id": 5248, "literals": [ "solidity", "0.5", @@ -564,7 +580,7 @@ "src": "45:23:25" }, { - "id": 5197, + "id": 5249, "literals": [ "experimental", "ABIEncoderV2" @@ -575,154 +591,143 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/compound/CompoundBase.sol", "file": "../lib/compound/CompoundBase.sol", - "id": 5198, + "id": 5250, "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 2786, - "src": "105:42:25", + "scope": 5888, + "sourceUnit": 2838, + "src": "104:42:25", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "file": "../lib/dapphub/Guard.sol", - "id": 5199, + "id": 5251, "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 3196, - "src": "149:34:25", + "scope": 5888, + "sourceUnit": 3248, + "src": "148:34:25", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapLiteBase.sol", "file": "../lib/uniswap/UniswapLiteBase.sol", - "id": 5200, + "id": 5252, "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 5195, - "src": "185:44:25", + "scope": 5888, + "sourceUnit": 5247, + "src": "184:44:25", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol", "file": "../interfaces/aave/ILendingPoolAddressesProvider.sol", - "id": 5201, + "id": 5253, "nodeType": "ImportDirective", - "scope": 5897, + "scope": 5888, "sourceUnit": 660, - "src": "231:62:25", + "src": "230:62:25", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol", "file": "../interfaces/aave/ILendingPool.sol", - "id": 5202, + "id": 5254, "nodeType": "ImportDirective", - "scope": 5897, + "scope": 5888, "sourceUnit": 547, - "src": "294:45:25", + "src": "293:45:25", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolParametersProvider.sol", "file": "../interfaces/aave/ILendingPoolParametersProvider.sol", - "id": 5203, + "id": 5255, "nodeType": "ImportDirective", - "scope": 5897, + "scope": 5888, "sourceUnit": 670, - "src": "340:63:25", + "src": "339:63:25", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICompoundPriceOracle.sol", "file": "../interfaces/compound/ICompoundPriceOracle.sol", - "id": 5204, + "id": 5256, "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 869, - "src": "405:57:25", + "scope": 5888, + "sourceUnit": 895, + "src": "404:57:25", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", "file": "../interfaces/compound/IComptroller.sol", - "id": 5205, + "id": 5257, "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 1097, - "src": "463:49:25", + "scope": 5888, + "sourceUnit": 1123, + "src": "462:49:25", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol", "file": "../interfaces/compound/ICEther.sol", - "id": 5206, + "id": 5258, "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 733, - "src": "513:44:25", + "scope": 5888, + "sourceUnit": 746, + "src": "512:44:25", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol", "file": "../interfaces/compound/ICToken.sol", - "id": 5207, + "id": 5259, "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 859, - "src": "558:44:25", + "scope": 5888, + "sourceUnit": 885, + "src": "557:44:25", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../interfaces/IERC20.sol", - "id": 5208, + "id": 5260, "nodeType": "ImportDirective", - "scope": 5897, + "scope": 5888, "sourceUnit": 121, - "src": "604:34:25", + "src": "603:34:25", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol", "file": "../registries/AddressRegistry.sol", - "id": 5209, + "id": 5261, "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 7551, - "src": "640:43:25", + "scope": 5888, + "sourceUnit": 7542, + "src": "639:43:25", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol", "file": "../proxies/DACProxy.sol", - "id": 5210, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 7245, - "src": "685:33:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "@openzeppelin/contracts/math/SafeMath.sol", - "file": "@openzeppelin/contracts/math/SafeMath.sol", - "id": 5211, + "id": 5262, "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 7738, - "src": "720:51:25", + "scope": 5888, + "sourceUnit": 7236, + "src": "684:33:25", "symbolAliases": [], "unitAlias": "" }, @@ -732,93 +737,66 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 5212, + "id": 5263, "name": "UniswapLiteBase", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5194, - "src": "806:15:25", + "referencedDeclaration": 5246, + "src": "753:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_UniswapLiteBase_$5194", + "typeIdentifier": "t_contract$_UniswapLiteBase_$5246", "typeString": "contract UniswapLiteBase" } }, - "id": 5213, + "id": 5264, "nodeType": "InheritanceSpecifier", - "src": "806:15:25" + "src": "753:15:25" }, { "arguments": null, "baseName": { "contractScope": null, - "id": 5214, + "id": 5265, "name": "CompoundBase", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2785, - "src": "823:12:25", + "referencedDeclaration": 2837, + "src": "770:12:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_CompoundBase_$2785", + "typeIdentifier": "t_contract$_CompoundBase_$2837", "typeString": "contract CompoundBase" } }, - "id": 5215, + "id": 5266, "nodeType": "InheritanceSpecifier", - "src": "823:12:25" + "src": "770:12:25" } ], "contractDependencies": [ - 2785, - 5194 + 2837, + 5246 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 5896, + "id": 5887, "linearizedBaseContracts": [ - 5896, - 2785, - 5194 + 5887, + 2837, + 5246 ], "name": "DedgeCompoundManager", "nodeType": "ContractDefinition", "nodes": [ - { - "id": 5218, - "libraryName": { - "contractScope": null, - "id": 5216, - "name": "SafeMath", - "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7737, - "src": "848:8:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$7737", - "typeString": "library SafeMath" - } - }, - "nodeType": "UsingForDirective", - "src": "842:24:25", - "typeName": { - "id": 5217, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "861:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - }, { "canonicalName": "DedgeCompoundManager.SwapOperationCalldata", - "id": 5225, + "id": 5273, "members": [ { "constant": false, - "id": 5220, + "id": 5268, "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 5225, - "src": "911:30:25", + "scope": 5273, + "src": "828:30:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -826,10 +804,10 @@ "typeString": "address" }, "typeName": { - "id": 5219, + "id": 5267, "name": "address", "nodeType": "ElementaryTypeName", - "src": "911:7:25", + "src": "828:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -841,11 +819,11 @@ }, { "constant": false, - "id": 5222, + "id": 5270, "name": "oldCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 5225, - "src": "951:24:25", + "scope": 5273, + "src": "868:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -853,10 +831,10 @@ "typeString": "address" }, "typeName": { - "id": 5221, + "id": 5269, "name": "address", "nodeType": "ElementaryTypeName", - "src": "951:7:25", + "src": "868:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -868,11 +846,11 @@ }, { "constant": false, - "id": 5224, + "id": 5272, "name": "newCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 5225, - "src": "985:24:25", + "scope": 5273, + "src": "902:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -880,10 +858,10 @@ "typeString": "address" }, "typeName": { - "id": 5223, + "id": 5271, "name": "address", "nodeType": "ElementaryTypeName", - "src": "985:7:25", + "src": "902:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -896,28 +874,28 @@ ], "name": "SwapOperationCalldata", "nodeType": "StructDefinition", - "scope": 5896, - "src": "872:144:25", + "scope": 5887, + "src": "789:144:25", "visibility": "public" }, { "body": { - "id": 5265, + "id": 5313, "nodeType": "Block", - "src": "1101:214:25", + "src": "1030:214:25", "statements": [ { "assignments": [ - 5233 + 5281 ], "declarations": [ { "constant": false, - "id": 5233, + "id": 5281, "name": "g", "nodeType": "VariableDeclaration", - "scope": 5265, - "src": "1111:9:25", + "scope": 5313, + "src": "1040:9:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -925,10 +903,10 @@ "typeString": "address" }, "typeName": { - "id": 5232, + "id": 5280, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1111:7:25", + "src": "1040:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -939,7 +917,7 @@ "visibility": "internal" } ], - "id": 5241, + "id": 5289, "initialValue": { "argumentTypes": null, "arguments": [ @@ -953,12 +931,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5236, + "id": 5284, "name": "proxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5227, - "src": "1140:12:25", + "referencedDeclaration": 5275, + "src": "1069:12:25", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -972,18 +950,18 @@ "typeString": "address payable" } ], - "id": 5235, + "id": 5283, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, - "src": "1131:8:25", + "referencedDeclaration": 7235, + "src": "1060:8:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 5237, + "id": 5285, "isConstant": false, "isLValue": false, "isPure": false, @@ -991,27 +969,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1131:22:25", + "src": "1060:22:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 5238, + "id": 5286, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "authority", "nodeType": "MemberAccess", - "referencedDeclaration": 2812, - "src": "1131:32:25", + "referencedDeclaration": 2864, + "src": "1060:32:25", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2799_$", + "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2851_$", "typeString": "function () view external returns (contract DSAuthority)" } }, - "id": 5239, + "id": 5287, "isConstant": false, "isLValue": false, "isPure": false, @@ -1019,9 +997,9 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1131:34:25", + "src": "1060:34:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -1029,24 +1007,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 5234, + "id": 5282, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "1123:7:25", + "src": "1052:7:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 5240, + "id": 5288, "isConstant": false, "isLValue": false, "isPure": false, @@ -1054,14 +1032,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1123:43:25", + "src": "1052:43:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "1111:55:25" + "src": "1040:55:25" }, { "expression": { @@ -1078,12 +1056,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5249, + "id": 5297, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5229, - "src": "1232:3:25", + "referencedDeclaration": 5277, + "src": "1161:3:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1097,20 +1075,20 @@ "typeString": "address" } ], - "id": 5248, + "id": 5296, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "1224:7:25", + "src": "1153:7:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 5250, + "id": 5298, "isConstant": false, "isLValue": false, "isPure": false, @@ -1118,7 +1096,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1224:12:25", + "src": "1153:12:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1132,20 +1110,20 @@ "typeString": "address" } ], - "id": 5247, + "id": 5295, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "1216:7:25", + "src": "1145:7:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_bytes20_$", "typeString": "type(bytes20)" }, "typeName": "bytes20" }, - "id": 5251, + "id": 5299, "isConstant": false, "isLValue": false, "isPure": false, @@ -1153,7 +1131,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1216:21:25", + "src": "1145:21:25", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -1167,20 +1145,20 @@ "typeString": "bytes20" } ], - "id": 5246, + "id": 5294, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "1208:7:25", + "src": "1137:7:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_bytes32_$", "typeString": "type(bytes32)" }, "typeName": "bytes32" }, - "id": 5252, + "id": 5300, "isConstant": false, "isLValue": false, "isPure": false, @@ -1188,7 +1166,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1208:30:25", + "src": "1137:30:25", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1204,12 +1182,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5254, + "id": 5302, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5233, - "src": "1260:1:25", + "referencedDeclaration": 5281, + "src": "1189:1:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1223,18 +1201,18 @@ "typeString": "address" } ], - "id": 5253, + "id": 5301, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, - "src": "1252:7:25", + "referencedDeclaration": 3215, + "src": "1181:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 5255, + "id": 5303, "isConstant": false, "isLValue": false, "isPure": false, @@ -1242,27 +1220,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1252:10:25", + "src": "1181:10:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 5256, + "id": 5304, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, - "src": "1252:14:25", + "referencedDeclaration": 3010, + "src": "1181:14:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 5257, + "id": 5305, "isConstant": false, "isLValue": false, "isPure": false, @@ -1270,7 +1248,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1252:16:25", + "src": "1181:16:25", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1286,12 +1264,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5259, + "id": 5307, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5233, - "src": "1290:1:25", + "referencedDeclaration": 5281, + "src": "1219:1:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1305,18 +1283,18 @@ "typeString": "address" } ], - "id": 5258, + "id": 5306, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, - "src": "1282:7:25", + "referencedDeclaration": 3215, + "src": "1211:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 5260, + "id": 5308, "isConstant": false, "isLValue": false, "isPure": false, @@ -1324,27 +1302,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1282:10:25", + "src": "1211:10:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 5261, + "id": 5309, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, - "src": "1282:14:25", + "referencedDeclaration": 3010, + "src": "1211:14:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 5262, + "id": 5310, "isConstant": false, "isLValue": false, "isPure": false, @@ -1352,7 +1330,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1282:16:25", + "src": "1211:16:25", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1379,12 +1357,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5243, + "id": 5291, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5233, - "src": "1185:1:25", + "referencedDeclaration": 5281, + "src": "1114:1:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1398,18 +1376,18 @@ "typeString": "address" } ], - "id": 5242, + "id": 5290, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, - "src": "1177:7:25", + "referencedDeclaration": 3215, + "src": "1106:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 5244, + "id": 5292, "isConstant": false, "isLValue": false, "isPure": false, @@ -1417,27 +1395,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1177:10:25", + "src": "1106:10:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 5245, + "id": 5293, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "permit", "nodeType": "MemberAccess", - "referencedDeclaration": 3086, - "src": "1177:17:25", + "referencedDeclaration": 3138, + "src": "1106:17:25", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32) external" } }, - "id": 5263, + "id": 5311, "isConstant": false, "isLValue": false, "isPure": false, @@ -1445,36 +1423,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1177:131:25", + "src": "1106:131:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5264, + "id": 5312, "nodeType": "ExpressionStatement", - "src": "1177:131:25" + "src": "1106:131:25" } ] }, "documentation": null, - "id": 5266, + "id": 5314, "implemented": true, "kind": "function", "modifiers": [], "name": "_proxyGuardPermit", "nodeType": "FunctionDefinition", "parameters": { - "id": 5230, + "id": 5278, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5227, + "id": 5275, "name": "proxyAddress", "nodeType": "VariableDeclaration", - "scope": 5266, - "src": "1049:28:25", + "scope": 5314, + "src": "966:28:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1482,10 +1460,10 @@ "typeString": "address payable" }, "typeName": { - "id": 5226, + "id": 5274, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1049:15:25", + "src": "966:15:25", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -1497,11 +1475,11 @@ }, { "constant": false, - "id": 5229, + "id": 5277, "name": "src", "nodeType": "VariableDeclaration", - "scope": 5266, - "src": "1079:11:25", + "scope": 5314, + "src": "996:11:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1509,10 +1487,10 @@ "typeString": "address" }, "typeName": { - "id": 5228, + "id": 5276, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1079:7:25", + "src": "996:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1523,38 +1501,38 @@ "visibility": "internal" } ], - "src": "1048:43:25" + "src": "965:43:25" }, "returnParameters": { - "id": 5231, + "id": 5279, "nodeType": "ParameterList", "parameters": [], - "src": "1101:0:25" + "src": "1030:0:25" }, - "scope": 5896, - "src": "1022:293:25", + "scope": 5887, + "src": "939:305:25", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 5306, + "id": 5354, "nodeType": "Block", - "src": "1400:214:25", + "src": "1341:214:25", "statements": [ { "assignments": [ - 5274 + 5322 ], "declarations": [ { "constant": false, - "id": 5274, + "id": 5322, "name": "g", "nodeType": "VariableDeclaration", - "scope": 5306, - "src": "1410:9:25", + "scope": 5354, + "src": "1351:9:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1562,10 +1540,10 @@ "typeString": "address" }, "typeName": { - "id": 5273, + "id": 5321, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1410:7:25", + "src": "1351:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1576,7 +1554,7 @@ "visibility": "internal" } ], - "id": 5282, + "id": 5330, "initialValue": { "argumentTypes": null, "arguments": [ @@ -1590,12 +1568,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5277, + "id": 5325, "name": "proxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5268, - "src": "1439:12:25", + "referencedDeclaration": 5316, + "src": "1380:12:25", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -1609,18 +1587,18 @@ "typeString": "address payable" } ], - "id": 5276, + "id": 5324, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, - "src": "1430:8:25", + "referencedDeclaration": 7235, + "src": "1371:8:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 5278, + "id": 5326, "isConstant": false, "isLValue": false, "isPure": false, @@ -1628,27 +1606,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1430:22:25", + "src": "1371:22:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 5279, + "id": 5327, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "authority", "nodeType": "MemberAccess", - "referencedDeclaration": 2812, - "src": "1430:32:25", + "referencedDeclaration": 2864, + "src": "1371:32:25", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2799_$", + "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2851_$", "typeString": "function () view external returns (contract DSAuthority)" } }, - "id": 5280, + "id": 5328, "isConstant": false, "isLValue": false, "isPure": false, @@ -1656,9 +1634,9 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1430:34:25", + "src": "1371:34:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -1666,24 +1644,24 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 5275, + "id": 5323, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "1422:7:25", + "src": "1363:7:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 5281, + "id": 5329, "isConstant": false, "isLValue": false, "isPure": false, @@ -1691,14 +1669,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1422:43:25", + "src": "1363:43:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "1410:55:25" + "src": "1351:55:25" }, { "expression": { @@ -1715,12 +1693,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5290, + "id": 5338, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5270, - "src": "1531:3:25", + "referencedDeclaration": 5318, + "src": "1472:3:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1734,20 +1712,20 @@ "typeString": "address" } ], - "id": 5289, + "id": 5337, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "1523:7:25", + "src": "1464:7:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 5291, + "id": 5339, "isConstant": false, "isLValue": false, "isPure": false, @@ -1755,7 +1733,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1523:12:25", + "src": "1464:12:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1769,20 +1747,20 @@ "typeString": "address" } ], - "id": 5288, + "id": 5336, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "1515:7:25", + "src": "1456:7:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_bytes20_$", "typeString": "type(bytes20)" }, "typeName": "bytes20" }, - "id": 5292, + "id": 5340, "isConstant": false, "isLValue": false, "isPure": false, @@ -1790,7 +1768,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1515:21:25", + "src": "1456:21:25", "typeDescriptions": { "typeIdentifier": "t_bytes20", "typeString": "bytes20" @@ -1804,20 +1782,20 @@ "typeString": "bytes20" } ], - "id": 5287, + "id": 5335, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "1507:7:25", + "src": "1448:7:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_bytes32_$", "typeString": "type(bytes32)" }, "typeName": "bytes32" }, - "id": 5293, + "id": 5341, "isConstant": false, "isLValue": false, "isPure": false, @@ -1825,7 +1803,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1507:30:25", + "src": "1448:30:25", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1841,12 +1819,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5295, + "id": 5343, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5274, - "src": "1559:1:25", + "referencedDeclaration": 5322, + "src": "1500:1:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1860,18 +1838,18 @@ "typeString": "address" } ], - "id": 5294, + "id": 5342, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, - "src": "1551:7:25", + "referencedDeclaration": 3215, + "src": "1492:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 5296, + "id": 5344, "isConstant": false, "isLValue": false, "isPure": false, @@ -1879,27 +1857,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1551:10:25", + "src": "1492:10:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 5297, + "id": 5345, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, - "src": "1551:14:25", + "referencedDeclaration": 3010, + "src": "1492:14:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 5298, + "id": 5346, "isConstant": false, "isLValue": false, "isPure": false, @@ -1907,7 +1885,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1551:16:25", + "src": "1492:16:25", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1923,12 +1901,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5300, + "id": 5348, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5274, - "src": "1589:1:25", + "referencedDeclaration": 5322, + "src": "1530:1:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1942,18 +1920,18 @@ "typeString": "address" } ], - "id": 5299, + "id": 5347, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, - "src": "1581:7:25", + "referencedDeclaration": 3215, + "src": "1522:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 5301, + "id": 5349, "isConstant": false, "isLValue": false, "isPure": false, @@ -1961,27 +1939,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1581:10:25", + "src": "1522:10:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 5302, + "id": 5350, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, - "src": "1581:14:25", + "referencedDeclaration": 3010, + "src": "1522:14:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 5303, + "id": 5351, "isConstant": false, "isLValue": false, "isPure": false, @@ -1989,7 +1967,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1581:16:25", + "src": "1522:16:25", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2016,12 +1994,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5284, + "id": 5332, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5274, - "src": "1484:1:25", + "referencedDeclaration": 5322, + "src": "1425:1:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2035,18 +2013,18 @@ "typeString": "address" } ], - "id": 5283, + "id": 5331, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, - "src": "1476:7:25", + "referencedDeclaration": 3215, + "src": "1417:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 5285, + "id": 5333, "isConstant": false, "isLValue": false, "isPure": false, @@ -2054,27 +2032,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1476:10:25", + "src": "1417:10:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 5286, + "id": 5334, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "forbid", "nodeType": "MemberAccess", - "referencedDeclaration": 3114, - "src": "1476:17:25", + "referencedDeclaration": 3166, + "src": "1417:17:25", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32) external" } }, - "id": 5304, + "id": 5352, "isConstant": false, "isLValue": false, "isPure": false, @@ -2082,36 +2060,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1476:131:25", + "src": "1417:131:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5305, + "id": 5353, "nodeType": "ExpressionStatement", - "src": "1476:131:25" + "src": "1417:131:25" } ] }, "documentation": null, - "id": 5307, + "id": 5355, "implemented": true, "kind": "function", "modifiers": [], "name": "_proxyGuardForbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 5271, + "id": 5319, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5268, + "id": 5316, "name": "proxyAddress", "nodeType": "VariableDeclaration", - "scope": 5307, - "src": "1348:28:25", + "scope": 5355, + "src": "1277:28:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2119,10 +2097,10 @@ "typeString": "address payable" }, "typeName": { - "id": 5267, + "id": 5315, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1348:15:25", + "src": "1277:15:25", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2134,11 +2112,11 @@ }, { "constant": false, - "id": 5270, + "id": 5318, "name": "src", "nodeType": "VariableDeclaration", - "scope": 5307, - "src": "1378:11:25", + "scope": 5355, + "src": "1307:11:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2146,10 +2124,10 @@ "typeString": "address" }, "typeName": { - "id": 5269, + "id": 5317, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1378:7:25", + "src": "1307:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2160,53 +2138,53 @@ "visibility": "internal" } ], - "src": "1347:43:25" + "src": "1276:43:25" }, "returnParameters": { - "id": 5272, + "id": 5320, "nodeType": "ParameterList", "parameters": [], - "src": "1400:0:25" + "src": "1341:0:25" }, - "scope": 5896, - "src": "1321:293:25", + "scope": 5887, + "src": "1250:305:25", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 5434, + "id": 5482, "nodeType": "Block", - "src": "1767:2538:25", + "src": "1717:2694:25", "statements": [ { "assignments": [ - 5319 + 5367 ], "declarations": [ { "constant": false, - "id": 5319, + "id": 5367, "name": "soCalldata", "nodeType": "VariableDeclaration", - "scope": 5434, - "src": "1777:39:25", + "scope": 5482, + "src": "1727:39:25", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", "typeString": "struct DedgeCompoundManager.SwapOperationCalldata" }, "typeName": { "contractScope": null, - "id": 5318, + "id": 5366, "name": "SwapOperationCalldata", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5225, - "src": "1777:21:25", + "referencedDeclaration": 5273, + "src": "1727:21:25", "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_storage_ptr", + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_storage_ptr", "typeString": "struct DedgeCompoundManager.SwapOperationCalldata" } }, @@ -2214,18 +2192,18 @@ "visibility": "internal" } ], - "id": 5326, + "id": 5374, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5322, + "id": 5370, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5315, - "src": "1830:5:25", + "referencedDeclaration": 5363, + "src": "1793:5:25", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", "typeString": "bytes calldata" @@ -2236,28 +2214,28 @@ "components": [ { "argumentTypes": null, - "id": 5323, + "id": 5371, "name": "SwapOperationCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5225, - "src": "1838:21:25", + "referencedDeclaration": 5273, + "src": "1813:21:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5225_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5273_storage_ptr_$", "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" } } ], - "id": 5324, + "id": 5372, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "1837:23:25", + "src": "1812:23:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5225_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5273_storage_ptr_$", "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" } } @@ -2269,24 +2247,24 @@ "typeString": "bytes calldata" }, { - "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5225_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5273_storage_ptr_$", "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" } ], "expression": { "argumentTypes": null, - "id": 5320, + "id": 5368, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, - "src": "1819:3:25", + "referencedDeclaration": 7805, + "src": "1769:3:25", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 5321, + "id": 5369, "isConstant": false, "isLValue": false, "isPure": true, @@ -2294,13 +2272,13 @@ "memberName": "decode", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "1819:10:25", + "src": "1769:10:25", "typeDescriptions": { "typeIdentifier": "t_function_abidecode_pure$__$returns$__$", "typeString": "function () pure" } }, - "id": 5325, + "id": 5373, "isConstant": false, "isLValue": false, "isPure": false, @@ -2308,42 +2286,42 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1819:42:25", + "src": "1769:76:25", "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory", + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory", "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" } }, "nodeType": "VariableDeclarationStatement", - "src": "1777:84:25" + "src": "1727:118:25" }, { "assignments": [ - 5328 + 5376 ], "declarations": [ { "constant": false, - "id": 5328, + "id": 5376, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 5434, - "src": "1872:31:25", + "scope": 5482, + "src": "1856:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 5327, + "id": 5375, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, - "src": "1872:15:25", + "referencedDeclaration": 7541, + "src": "1856:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -2351,7 +2329,7 @@ "visibility": "internal" } ], - "id": 5333, + "id": 5381, "initialValue": { "argumentTypes": null, "arguments": [ @@ -2359,26 +2337,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 5330, + "id": 5378, "name": "soCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5319, - "src": "1922:10:25", + "referencedDeclaration": 5367, + "src": "1919:10:25", "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" } }, - "id": 5331, + "id": 5379, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "addressRegistryAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 5220, - "src": "1922:33:25", + "referencedDeclaration": 5268, + "src": "1919:33:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2392,18 +2370,18 @@ "typeString": "address" } ], - "id": 5329, + "id": 5377, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, - "src": "1906:15:25", + "referencedDeclaration": 7541, + "src": "1890:15:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 5332, + "id": 5380, "isConstant": false, "isLValue": false, "isPure": false, @@ -2411,27 +2389,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1906:50:25", + "src": "1890:72:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, "nodeType": "VariableDeclarationStatement", - "src": "1872:84:25" + "src": "1856:106:25" }, { "assignments": [ - 5335 + 5383 ], "declarations": [ { "constant": false, - "id": 5335, + "id": 5383, "name": "oldCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 5434, - "src": "1967:24:25", + "scope": 5482, + "src": "1973:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2439,10 +2417,10 @@ "typeString": "address" }, "typeName": { - "id": 5334, + "id": 5382, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1967:7:25", + "src": "1973:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2453,51 +2431,51 @@ "visibility": "internal" } ], - "id": 5338, + "id": 5386, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 5336, + "id": 5384, "name": "soCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5319, - "src": "1994:10:25", + "referencedDeclaration": 5367, + "src": "2000:10:25", "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" } }, - "id": 5337, + "id": 5385, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "oldCTokenAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 5222, - "src": "1994:27:25", + "referencedDeclaration": 5270, + "src": "2000:27:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "1967:54:25" + "src": "1973:54:25" }, { "assignments": [ - 5340 + 5388 ], "declarations": [ { "constant": false, - "id": 5340, + "id": 5388, "name": "newCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 5434, - "src": "2031:24:25", + "scope": 5482, + "src": "2037:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2505,10 +2483,10 @@ "typeString": "address" }, "typeName": { - "id": 5339, + "id": 5387, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2031:7:25", + "src": "2037:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2519,51 +2497,51 @@ "visibility": "internal" } ], - "id": 5343, + "id": 5391, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 5341, + "id": 5389, "name": "soCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5319, - "src": "2058:10:25", + "referencedDeclaration": 5367, + "src": "2064:10:25", "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" } }, - "id": 5342, + "id": 5390, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "newCTokenAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 5224, - "src": "2058:27:25", + "referencedDeclaration": 5272, + "src": "2064:27:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "2031:54:25" + "src": "2037:54:25" }, { "assignments": [ - 5345 + 5393 ], "declarations": [ { "constant": false, - "id": 5345, + "id": 5393, "name": "debtAmount", "nodeType": "VariableDeclaration", - "scope": 5434, - "src": "2096:15:25", + "scope": 5482, + "src": "2102:18:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2571,10 +2549,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5344, - "name": "uint", + "id": 5392, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2096:4:25", + "src": "2102:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2584,18 +2562,18 @@ "visibility": "internal" } ], - "id": 5353, + "id": 5401, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5351, + "id": 5399, "name": "_protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5313, - "src": "2144:12:25", + "referencedDeclaration": 5361, + "src": "2153:12:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2614,12 +2592,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5348, + "id": 5396, "name": "_aaveFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5311, - "src": "2130:8:25", + "referencedDeclaration": 5359, + "src": "2139:8:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2635,32 +2613,32 @@ ], "expression": { "argumentTypes": null, - "id": 5346, + "id": 5394, "name": "_loanAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5309, - "src": "2114:11:25", + "referencedDeclaration": 5357, + "src": "2123:11:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5347, + "id": 5395, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 7577, - "src": "2114:15:25", + "referencedDeclaration": 7568, + "src": "2123:15:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 5349, + "id": 5397, "isConstant": false, "isLValue": false, "isPure": false, @@ -2668,27 +2646,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2114:25:25", + "src": "2123:25:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5350, + "id": 5398, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 7577, - "src": "2114:29:25", + "referencedDeclaration": 7568, + "src": "2123:29:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 5352, + "id": 5400, "isConstant": false, "isLValue": false, "isPure": false, @@ -2696,14 +2674,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2114:43:25", + "src": "2123:43:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "2096:61:25" + "src": "2102:64:25" }, { "condition": { @@ -2712,19 +2690,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5358, + "id": 5406, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5354, + "id": 5402, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5335, - "src": "2651:16:25", + "referencedDeclaration": 5383, + "src": "2660:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2739,32 +2717,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5355, + "id": 5403, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5328, - "src": "2671:15:25", + "referencedDeclaration": 5376, + "src": "2680:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 5356, + "id": 5404, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "2671:29:25", + "referencedDeclaration": 7501, + "src": "2680:29:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5357, + "id": 5405, "isConstant": false, "isLValue": false, "isPure": false, @@ -2772,35 +2750,35 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2671:31:25", + "src": "2680:31:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "2651:51:25", + "src": "2660:51:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 5393, + "id": 5441, "nodeType": "Block", - "src": "2777:543:25", + "src": "2786:575:25", "statements": [ { "assignments": [ - 5366 + 5414 ], "declarations": [ { "constant": false, - "id": 5366, + "id": 5414, "name": "oldTokenUnderlying", "nodeType": "VariableDeclaration", - "scope": 5393, - "src": "2843:26:25", + "scope": 5441, + "src": "2852:26:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2808,10 +2786,10 @@ "typeString": "address" }, "typeName": { - "id": 5365, + "id": 5413, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2843:7:25", + "src": "2852:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2822,7 +2800,7 @@ "visibility": "internal" } ], - "id": 5372, + "id": 5420, "initialValue": { "argumentTypes": null, "arguments": [], @@ -2833,12 +2811,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5368, + "id": 5416, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5335, - "src": "2880:16:25", + "referencedDeclaration": 5383, + "src": "2889:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2852,18 +2830,18 @@ "typeString": "address" } ], - "id": 5367, + "id": 5415, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "2872:7:25", + "referencedDeclaration": 884, + "src": "2881:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 5369, + "id": 5417, "isConstant": false, "isLValue": false, "isPure": false, @@ -2871,27 +2849,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2872:25:25", + "src": "2881:25:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 5370, + "id": 5418, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "2872:36:25", + "referencedDeclaration": 835, + "src": "2881:36:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5371, + "id": 5419, "isConstant": false, "isLValue": false, "isPure": false, @@ -2899,27 +2877,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2872:38:25", + "src": "2881:38:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "2843:67:25" + "src": "2852:67:25" }, { "assignments": [ - 5374 + 5422 ], "declarations": [ { "constant": false, - "id": 5374, + "id": 5422, "name": "oldTokenUnderlyingAmount", "nodeType": "VariableDeclaration", - "scope": 5393, - "src": "2925:29:25", + "scope": 5441, + "src": "2934:32:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2927,10 +2905,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5373, - "name": "uint", + "id": 5421, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2925:4:25", + "src": "2934:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2940,18 +2918,18 @@ "visibility": "internal" } ], - "id": 5379, + "id": 5427, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5376, + "id": 5424, "name": "oldTokenUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5366, - "src": "2986:18:25", + "referencedDeclaration": 5414, + "src": "2998:18:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2959,12 +2937,12 @@ }, { "argumentTypes": null, - "id": 5377, + "id": 5425, "name": "_loanAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5309, - "src": "3022:11:25", + "referencedDeclaration": 5357, + "src": "3034:11:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2982,21 +2960,21 @@ "typeString": "uint256" } ], - "id": 5375, + "id": 5423, "name": "_ethToToken", "nodeType": "Identifier", "overloadedDeclarations": [ - 4959, - 4988 + 5011, + 5040 ], - "referencedDeclaration": 4959, - "src": "2957:11:25", + "referencedDeclaration": 5011, + "src": "2969:11:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 5378, + "id": 5426, "isConstant": false, "isLValue": false, "isPure": false, @@ -3004,14 +2982,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2957:90:25", + "src": "2969:90:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "2925:122:25" + "src": "2934:125:25" }, { "expression": { @@ -3019,12 +2997,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5384, + "id": 5432, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5335, - "src": "3167:16:25", + "referencedDeclaration": 5383, + "src": "3179:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3032,12 +3010,12 @@ }, { "argumentTypes": null, - "id": 5385, + "id": 5433, "name": "oldTokenUnderlyingAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5374, - "src": "3185:24:25", + "referencedDeclaration": 5422, + "src": "3213:24:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3060,12 +3038,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5381, + "id": 5429, "name": "oldTokenUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5366, - "src": "3122:18:25", + "referencedDeclaration": 5414, + "src": "3134:18:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3079,18 +3057,18 @@ "typeString": "address" } ], - "id": 5380, + "id": 5428, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 120, - "src": "3115:6:25", + "src": "3127:6:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_contract$_IERC20_$120_$", "typeString": "type(contract IERC20)" } }, - "id": 5382, + "id": 5430, "isConstant": false, "isLValue": false, "isPure": false, @@ -3098,13 +3076,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3115:26:25", + "src": "3127:26:25", "typeDescriptions": { "typeIdentifier": "t_contract$_IERC20_$120", "typeString": "contract IERC20" } }, - "id": 5383, + "id": 5431, "isConstant": false, "isLValue": false, "isPure": false, @@ -3112,13 +3090,13 @@ "memberName": "approve", "nodeType": "MemberAccess", "referencedDeclaration": 77, - "src": "3115:51:25", + "src": "3127:34:25", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 5386, + "id": 5434, "isConstant": false, "isLValue": false, "isPure": false, @@ -3126,15 +3104,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3115:95:25", + "src": "3127:124:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 5387, + "id": 5435, "nodeType": "ExpressionStatement", - "src": "3115:95:25" + "src": "3127:124:25" }, { "expression": { @@ -3142,12 +3120,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5389, + "id": 5437, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5335, - "src": "3266:16:25", + "referencedDeclaration": 5383, + "src": "3307:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3155,12 +3133,12 @@ }, { "argumentTypes": null, - "id": 5390, + "id": 5438, "name": "oldTokenUnderlyingAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5374, - "src": "3284:24:25", + "referencedDeclaration": 5422, + "src": "3325:24:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3178,18 +3156,18 @@ "typeString": "uint256" } ], - "id": 5388, + "id": 5436, "name": "repayBorrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2521, - "src": "3254:11:25", + "referencedDeclaration": 2605, + "src": "3295:11:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 5391, + "id": 5439, "isConstant": false, "isLValue": false, "isPure": false, @@ -3197,25 +3175,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3254:55:25", + "src": "3295:55:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5392, + "id": 5440, "nodeType": "ExpressionStatement", - "src": "3254:55:25" + "src": "3295:55:25" } ] }, - "id": 5394, + "id": 5442, "nodeType": "IfStatement", - "src": "2647:673:25", + "src": "2656:705:25", "trueBody": { - "id": 5364, + "id": 5412, "nodeType": "Block", - "src": "2704:67:25", + "src": "2713:67:25", "statements": [ { "expression": { @@ -3223,12 +3201,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5360, + "id": 5408, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5335, - "src": "2730:16:25", + "referencedDeclaration": 5383, + "src": "2739:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3236,12 +3214,12 @@ }, { "argumentTypes": null, - "id": 5361, + "id": 5409, "name": "_loanAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5309, - "src": "2748:11:25", + "referencedDeclaration": 5357, + "src": "2757:11:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3259,18 +3237,18 @@ "typeString": "uint256" } ], - "id": 5359, + "id": 5407, "name": "repayBorrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2521, - "src": "2718:11:25", + "referencedDeclaration": 2605, + "src": "2727:11:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 5362, + "id": 5410, "isConstant": false, "isLValue": false, "isPure": false, @@ -3278,15 +3256,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2718:42:25", + "src": "2727:42:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5363, + "id": 5411, "nodeType": "ExpressionStatement", - "src": "2718:42:25" + "src": "2727:42:25" } ] } @@ -3298,19 +3276,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5399, + "id": 5447, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5395, + "id": 5443, "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5340, - "src": "3464:16:25", + "referencedDeclaration": 5388, + "src": "3505:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3325,32 +3303,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5396, + "id": 5444, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5328, - "src": "3484:15:25", + "referencedDeclaration": 5376, + "src": "3525:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 5397, + "id": 5445, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "3484:29:25", + "referencedDeclaration": 7501, + "src": "3525:29:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5398, + "id": 5446, "isConstant": false, "isLValue": false, "isPure": false, @@ -3358,35 +3336,35 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3484:31:25", + "src": "3525:31:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "3464:51:25", + "src": "3505:51:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 5432, + "id": 5480, "nodeType": "Block", - "src": "3584:715:25", + "src": "3625:780:25", "statements": [ { "assignments": [ - 5407 + 5455 ], "declarations": [ { "constant": false, - "id": 5407, + "id": 5455, "name": "newTokenUnderlying", "nodeType": "VariableDeclaration", - "scope": 5432, - "src": "3639:26:25", + "scope": 5480, + "src": "3680:26:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3394,10 +3372,10 @@ "typeString": "address" }, "typeName": { - "id": 5406, + "id": 5454, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3639:7:25", + "src": "3680:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3408,7 +3386,7 @@ "visibility": "internal" } ], - "id": 5413, + "id": 5461, "initialValue": { "argumentTypes": null, "arguments": [], @@ -3419,12 +3397,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5409, + "id": 5457, "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5340, - "src": "3676:16:25", + "referencedDeclaration": 5388, + "src": "3717:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3438,18 +3416,18 @@ "typeString": "address" } ], - "id": 5408, + "id": 5456, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "3668:7:25", + "referencedDeclaration": 884, + "src": "3709:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 5410, + "id": 5458, "isConstant": false, "isLValue": false, "isPure": false, @@ -3457,27 +3435,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3668:25:25", + "src": "3709:25:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 5411, + "id": 5459, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "3668:36:25", + "referencedDeclaration": 835, + "src": "3709:36:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5412, + "id": 5460, "isConstant": false, "isLValue": false, "isPure": false, @@ -3485,27 +3463,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3668:38:25", + "src": "3709:38:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "3639:67:25" + "src": "3680:67:25" }, { "assignments": [ - 5415 + 5463 ], "declarations": [ { "constant": false, - "id": 5415, + "id": 5463, "name": "newTokenUnderlyingAmount", "nodeType": "VariableDeclaration", - "scope": 5432, - "src": "3834:29:25", + "scope": 5480, + "src": "3875:32:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3513,10 +3491,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5414, - "name": "uint", + "id": 5462, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3834:4:25", + "src": "3875:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3526,18 +3504,18 @@ "visibility": "internal" } ], - "id": 5420, + "id": 5468, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5417, + "id": 5465, "name": "newTokenUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5407, - "src": "3904:18:25", + "referencedDeclaration": 5455, + "src": "3948:18:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3545,12 +3523,12 @@ }, { "argumentTypes": null, - "id": 5418, + "id": 5466, "name": "debtAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5345, - "src": "3940:10:25", + "referencedDeclaration": 5393, + "src": "3984:10:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3568,18 +3546,18 @@ "typeString": "uint256" } ], - "id": 5416, + "id": 5464, "name": "_getTokenToEthOutput", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5150, - "src": "3866:20:25", + "referencedDeclaration": 5202, + "src": "3910:20:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 5419, + "id": 5467, "isConstant": false, "isLValue": false, "isPure": false, @@ -3587,14 +3565,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3866:98:25", + "src": "3910:98:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "3834:130:25" + "src": "3875:133:25" }, { "expression": { @@ -3602,12 +3580,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5422, + "id": 5470, "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5340, - "src": "4018:16:25", + "referencedDeclaration": 5388, + "src": "4062:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3615,12 +3593,12 @@ }, { "argumentTypes": null, - "id": 5423, + "id": 5471, "name": "newTokenUnderlyingAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5415, - "src": "4036:24:25", + "referencedDeclaration": 5463, + "src": "4080:24:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3638,18 +3616,18 @@ "typeString": "uint256" } ], - "id": 5421, + "id": 5469, "name": "borrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "4011:6:25", + "referencedDeclaration": 2527, + "src": "4055:6:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 5424, + "id": 5472, "isConstant": false, "isLValue": false, "isPure": false, @@ -3657,15 +3635,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4011:50:25", + "src": "4055:50:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5425, + "id": 5473, "nodeType": "ExpressionStatement", - "src": "4011:50:25" + "src": "4055:50:25" }, { "expression": { @@ -3673,12 +3651,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5427, + "id": 5475, "name": "newTokenUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5407, - "src": "4231:18:25", + "referencedDeclaration": 5455, + "src": "4292:18:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3686,12 +3664,12 @@ }, { "argumentTypes": null, - "id": 5428, + "id": 5476, "name": "newTokenUnderlyingAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5415, - "src": "4251:24:25", + "referencedDeclaration": 5463, + "src": "4328:24:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3699,12 +3677,12 @@ }, { "argumentTypes": null, - "id": 5429, + "id": 5477, "name": "debtAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5345, - "src": "4277:10:25", + "referencedDeclaration": 5393, + "src": "4370:10:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3726,21 +3704,21 @@ "typeString": "uint256" } ], - "id": 5426, + "id": 5474, "name": "_tokenToEth", "nodeType": "Identifier", "overloadedDeclarations": [ - 5006, - 5045 + 5058, + 5097 ], - "referencedDeclaration": 5045, - "src": "4219:11:25", + "referencedDeclaration": 5097, + "src": "4263:11:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) returns (uint256)" } }, - "id": 5430, + "id": 5478, "isConstant": false, "isLValue": false, "isPure": false, @@ -3748,25 +3726,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4219:69:25", + "src": "4263:131:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5431, + "id": 5479, "nodeType": "ExpressionStatement", - "src": "4219:69:25" + "src": "4263:131:25" } ] }, - "id": 5433, + "id": 5481, "nodeType": "IfStatement", - "src": "3460:839:25", + "src": "3501:904:25", "trueBody": { - "id": 5405, + "id": 5453, "nodeType": "Block", - "src": "3517:61:25", + "src": "3558:61:25", "statements": [ { "expression": { @@ -3774,12 +3752,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5401, + "id": 5449, "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5340, - "src": "3538:16:25", + "referencedDeclaration": 5388, + "src": "3579:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3787,12 +3765,12 @@ }, { "argumentTypes": null, - "id": 5402, + "id": 5450, "name": "debtAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5345, - "src": "3556:10:25", + "referencedDeclaration": 5393, + "src": "3597:10:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3810,18 +3788,18 @@ "typeString": "uint256" } ], - "id": 5400, + "id": 5448, "name": "borrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "3531:6:25", + "referencedDeclaration": 2527, + "src": "3572:6:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 5403, + "id": 5451, "isConstant": false, "isLValue": false, "isPure": false, @@ -3829,15 +3807,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3531:36:25", + "src": "3572:36:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5404, + "id": 5452, "nodeType": "ExpressionStatement", - "src": "3531:36:25" + "src": "3572:36:25" } ] } @@ -3845,23 +3823,23 @@ ] }, "documentation": null, - "id": 5435, + "id": 5483, "implemented": true, "kind": "function", "modifiers": [], "name": "swapDebtPostLoan", "nodeType": "FunctionDefinition", "parameters": { - "id": 5316, + "id": 5364, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5309, + "id": 5357, "name": "_loanAmount", "nodeType": "VariableDeclaration", - "scope": 5435, - "src": "1655:16:25", + "scope": 5483, + "src": "1596:19:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3869,10 +3847,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5308, - "name": "uint", + "id": 5356, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1655:4:25", + "src": "1596:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3883,11 +3861,11 @@ }, { "constant": false, - "id": 5311, + "id": 5359, "name": "_aaveFee", "nodeType": "VariableDeclaration", - "scope": 5435, - "src": "1681:13:25", + "scope": 5483, + "src": "1625:16:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3895,10 +3873,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5310, - "name": "uint", + "id": 5358, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1681:4:25", + "src": "1625:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3909,11 +3887,11 @@ }, { "constant": false, - "id": 5313, + "id": 5361, "name": "_protocolFee", "nodeType": "VariableDeclaration", - "scope": 5435, - "src": "1704:17:25", + "scope": 5483, + "src": "1651:20:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3921,10 +3899,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5312, - "name": "uint", + "id": 5360, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1704:4:25", + "src": "1651:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3935,11 +3913,11 @@ }, { "constant": false, - "id": 5315, + "id": 5363, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 5435, - "src": "1731:20:25", + "scope": 5483, + "src": "1681:20:25", "stateVariable": false, "storageLocation": "calldata", "typeDescriptions": { @@ -3947,10 +3925,10 @@ "typeString": "bytes" }, "typeName": { - "id": 5314, + "id": 5362, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "1731:5:25", + "src": "1681:5:25", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -3960,53 +3938,53 @@ "visibility": "internal" } ], - "src": "1645:112:25" + "src": "1586:121:25" }, "returnParameters": { - "id": 5317, + "id": 5365, "nodeType": "ParameterList", "parameters": [], - "src": "1767:0:25" + "src": "1717:0:25" }, - "scope": 5896, - "src": "1620:2685:25", + "scope": 5887, + "src": "1561:2850:25", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 5554, + "id": 5602, "nodeType": "Block", - "src": "4464:2065:25", + "src": "4579:2238:25", "statements": [ { "assignments": [ - 5447 + 5495 ], "declarations": [ { "constant": false, - "id": 5447, + "id": 5495, "name": "soCalldata", "nodeType": "VariableDeclaration", - "scope": 5554, - "src": "4474:39:25", + "scope": 5602, + "src": "4589:39:25", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", "typeString": "struct DedgeCompoundManager.SwapOperationCalldata" }, "typeName": { "contractScope": null, - "id": 5446, + "id": 5494, "name": "SwapOperationCalldata", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5225, - "src": "4474:21:25", + "referencedDeclaration": 5273, + "src": "4589:21:25", "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_storage_ptr", + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_storage_ptr", "typeString": "struct DedgeCompoundManager.SwapOperationCalldata" } }, @@ -4014,18 +3992,18 @@ "visibility": "internal" } ], - "id": 5454, + "id": 5502, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5450, + "id": 5498, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5443, - "src": "4527:5:25", + "referencedDeclaration": 5491, + "src": "4655:5:25", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", "typeString": "bytes calldata" @@ -4036,28 +4014,28 @@ "components": [ { "argumentTypes": null, - "id": 5451, + "id": 5499, "name": "SwapOperationCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5225, - "src": "4535:21:25", + "referencedDeclaration": 5273, + "src": "4675:21:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5225_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5273_storage_ptr_$", "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" } } ], - "id": 5452, + "id": 5500, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "4534:23:25", + "src": "4674:23:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5225_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5273_storage_ptr_$", "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" } } @@ -4069,24 +4047,24 @@ "typeString": "bytes calldata" }, { - "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5225_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5273_storage_ptr_$", "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" } ], "expression": { "argumentTypes": null, - "id": 5448, + "id": 5496, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, - "src": "4516:3:25", + "referencedDeclaration": 7805, + "src": "4631:3:25", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 5449, + "id": 5497, "isConstant": false, "isLValue": false, "isPure": true, @@ -4094,13 +4072,13 @@ "memberName": "decode", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4516:10:25", + "src": "4631:10:25", "typeDescriptions": { "typeIdentifier": "t_function_abidecode_pure$__$returns$__$", "typeString": "function () pure" } }, - "id": 5453, + "id": 5501, "isConstant": false, "isLValue": false, "isPure": false, @@ -4108,42 +4086,42 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4516:42:25", + "src": "4631:76:25", "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory", + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory", "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" } }, "nodeType": "VariableDeclarationStatement", - "src": "4474:84:25" + "src": "4589:118:25" }, { "assignments": [ - 5456 + 5504 ], "declarations": [ { "constant": false, - "id": 5456, + "id": 5504, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 5554, - "src": "4569:31:25", + "scope": 5602, + "src": "4718:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 5455, + "id": 5503, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, - "src": "4569:15:25", + "referencedDeclaration": 7541, + "src": "4718:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -4151,7 +4129,7 @@ "visibility": "internal" } ], - "id": 5461, + "id": 5509, "initialValue": { "argumentTypes": null, "arguments": [ @@ -4159,26 +4137,26 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 5458, + "id": 5506, "name": "soCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5447, - "src": "4619:10:25", + "referencedDeclaration": 5495, + "src": "4781:10:25", "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" } }, - "id": 5459, + "id": 5507, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "addressRegistryAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 5220, - "src": "4619:33:25", + "referencedDeclaration": 5268, + "src": "4781:33:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4192,18 +4170,18 @@ "typeString": "address" } ], - "id": 5457, + "id": 5505, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, - "src": "4603:15:25", + "referencedDeclaration": 7541, + "src": "4752:15:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 5460, + "id": 5508, "isConstant": false, "isLValue": false, "isPure": false, @@ -4211,27 +4189,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4603:50:25", + "src": "4752:72:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, "nodeType": "VariableDeclarationStatement", - "src": "4569:84:25" + "src": "4718:106:25" }, { "assignments": [ - 5463 + 5511 ], "declarations": [ { "constant": false, - "id": 5463, + "id": 5511, "name": "oldCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 5554, - "src": "4664:24:25", + "scope": 5602, + "src": "4835:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4239,10 +4217,10 @@ "typeString": "address" }, "typeName": { - "id": 5462, + "id": 5510, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4664:7:25", + "src": "4835:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4253,51 +4231,51 @@ "visibility": "internal" } ], - "id": 5466, + "id": 5514, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 5464, + "id": 5512, "name": "soCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5447, - "src": "4691:10:25", + "referencedDeclaration": 5495, + "src": "4862:10:25", "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" } }, - "id": 5465, + "id": 5513, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "oldCTokenAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 5222, - "src": "4691:27:25", + "referencedDeclaration": 5270, + "src": "4862:27:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "4664:54:25" + "src": "4835:54:25" }, { "assignments": [ - 5468 + 5516 ], "declarations": [ { "constant": false, - "id": 5468, + "id": 5516, "name": "newCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 5554, - "src": "4728:24:25", + "scope": 5602, + "src": "4899:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4305,10 +4283,10 @@ "typeString": "address" }, "typeName": { - "id": 5467, + "id": 5515, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4728:7:25", + "src": "4899:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4319,51 +4297,51 @@ "visibility": "internal" } ], - "id": 5471, + "id": 5519, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 5469, + "id": 5517, "name": "soCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5447, - "src": "4755:10:25", + "referencedDeclaration": 5495, + "src": "4926:10:25", "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" } }, - "id": 5470, + "id": 5518, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "newCTokenAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 5224, - "src": "4755:27:25", + "referencedDeclaration": 5272, + "src": "4926:27:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "4728:54:25" + "src": "4899:54:25" }, { "assignments": [ - 5473 + 5521 ], "declarations": [ { "constant": false, - "id": 5473, + "id": 5521, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 5554, - "src": "5211:16:25", + "scope": 5602, + "src": "5382:19:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4371,10 +4349,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5472, - "name": "uint", + "id": 5520, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "5211:4:25", + "src": "5382:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4384,18 +4362,18 @@ "visibility": "internal" } ], - "id": 5481, + "id": 5529, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5479, + "id": 5527, "name": "_protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5441, - "src": "5260:12:25", + "referencedDeclaration": 5489, + "src": "5434:12:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4414,12 +4392,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5476, + "id": 5524, "name": "_aaveFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5439, - "src": "5246:8:25", + "referencedDeclaration": 5487, + "src": "5420:8:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4435,32 +4413,32 @@ ], "expression": { "argumentTypes": null, - "id": 5474, + "id": 5522, "name": "_loanAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5437, - "src": "5230:11:25", + "referencedDeclaration": 5485, + "src": "5404:11:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5475, + "id": 5523, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 7593, - "src": "5230:15:25", + "referencedDeclaration": 7584, + "src": "5404:15:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 5477, + "id": 5525, "isConstant": false, "isLValue": false, "isPure": false, @@ -4468,27 +4446,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5230:25:25", + "src": "5404:25:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5478, + "id": 5526, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 7593, - "src": "5230:29:25", + "referencedDeclaration": 7584, + "src": "5404:29:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 5480, + "id": 5528, "isConstant": false, "isLValue": false, "isPure": false, @@ -4496,14 +4474,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5230:43:25", + "src": "5404:43:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "5211:62:25" + "src": "5382:65:25" }, { "condition": { @@ -4512,19 +4490,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5486, + "id": 5534, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5482, + "id": 5530, "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5468, - "src": "5288:16:25", + "referencedDeclaration": 5516, + "src": "5462:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4539,32 +4517,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5483, + "id": 5531, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5456, - "src": "5308:15:25", + "referencedDeclaration": 5504, + "src": "5482:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 5484, + "id": 5532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "5308:29:25", + "referencedDeclaration": 7501, + "src": "5482:29:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5485, + "id": 5533, "isConstant": false, "isLValue": false, "isPure": false, @@ -4572,35 +4550,35 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5308:31:25", + "src": "5482:31:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "5288:51:25", + "src": "5462:51:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 5513, + "id": 5561, "nodeType": "Block", - "src": "5409:413:25", + "src": "5583:416:25", "statements": [ { "assignments": [ - 5494 + 5542 ], "declarations": [ { "constant": false, - "id": 5494, + "id": 5542, "name": "newTokenUnderlying", "nodeType": "VariableDeclaration", - "scope": 5513, - "src": "5507:26:25", + "scope": 5561, + "src": "5681:26:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4608,10 +4586,10 @@ "typeString": "address" }, "typeName": { - "id": 5493, + "id": 5541, "name": "address", "nodeType": "ElementaryTypeName", - "src": "5507:7:25", + "src": "5681:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4622,7 +4600,7 @@ "visibility": "internal" } ], - "id": 5500, + "id": 5548, "initialValue": { "argumentTypes": null, "arguments": [], @@ -4633,12 +4611,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5496, + "id": 5544, "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5468, - "src": "5544:16:25", + "referencedDeclaration": 5516, + "src": "5718:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4652,18 +4630,18 @@ "typeString": "address" } ], - "id": 5495, + "id": 5543, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "5536:7:25", + "referencedDeclaration": 884, + "src": "5710:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 5497, + "id": 5545, "isConstant": false, "isLValue": false, "isPure": false, @@ -4671,27 +4649,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5536:25:25", + "src": "5710:25:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 5498, + "id": 5546, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "5536:36:25", + "referencedDeclaration": 835, + "src": "5710:36:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5499, + "id": 5547, "isConstant": false, "isLValue": false, "isPure": false, @@ -4699,27 +4677,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5536:38:25", + "src": "5710:38:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "5507:67:25" + "src": "5681:67:25" }, { "assignments": [ - 5502 + 5550 ], "declarations": [ { "constant": false, - "id": 5502, + "id": 5550, "name": "newTokenUnderlyingAmount", "nodeType": "VariableDeclaration", - "scope": 5513, - "src": "5588:29:25", + "scope": 5561, + "src": "5762:32:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4727,10 +4705,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5501, - "name": "uint", + "id": 5549, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "5588:4:25", + "src": "5762:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4740,18 +4718,18 @@ "visibility": "internal" } ], - "id": 5507, + "id": 5555, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5504, + "id": 5552, "name": "newTokenUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5494, - "src": "5649:18:25", + "referencedDeclaration": 5542, + "src": "5826:18:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4759,12 +4737,12 @@ }, { "argumentTypes": null, - "id": 5505, + "id": 5553, "name": "repayAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5473, - "src": "5685:11:25", + "referencedDeclaration": 5521, + "src": "5862:11:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4782,21 +4760,21 @@ "typeString": "uint256" } ], - "id": 5503, + "id": 5551, "name": "_ethToToken", "nodeType": "Identifier", "overloadedDeclarations": [ - 4959, - 4988 + 5011, + 5040 ], - "referencedDeclaration": 4959, - "src": "5620:11:25", + "referencedDeclaration": 5011, + "src": "5797:11:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 5506, + "id": 5554, "isConstant": false, "isLValue": false, "isPure": false, @@ -4804,14 +4782,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5620:90:25", + "src": "5797:90:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "5588:122:25" + "src": "5762:125:25" }, { "expression": { @@ -4819,12 +4797,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5509, + "id": 5557, "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5468, - "src": "5768:16:25", + "referencedDeclaration": 5516, + "src": "5945:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4832,12 +4810,12 @@ }, { "argumentTypes": null, - "id": 5510, + "id": 5558, "name": "newTokenUnderlyingAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5502, - "src": "5786:24:25", + "referencedDeclaration": 5550, + "src": "5963:24:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4855,18 +4833,18 @@ "typeString": "uint256" } ], - "id": 5508, + "id": 5556, "name": "supply", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2423, - "src": "5761:6:25", + "referencedDeclaration": 2507, + "src": "5938:6:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 5511, + "id": 5559, "isConstant": false, "isLValue": false, "isPure": false, @@ -4874,25 +4852,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5761:50:25", + "src": "5938:50:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5512, + "id": 5560, "nodeType": "ExpressionStatement", - "src": "5761:50:25" + "src": "5938:50:25" } ] }, - "id": 5514, + "id": 5562, "nodeType": "IfStatement", - "src": "5284:538:25", + "src": "5458:541:25", "trueBody": { - "id": 5492, + "id": 5540, "nodeType": "Block", - "src": "5341:62:25", + "src": "5515:62:25", "statements": [ { "expression": { @@ -4900,12 +4878,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5488, + "id": 5536, "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5468, - "src": "5362:16:25", + "referencedDeclaration": 5516, + "src": "5536:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4913,12 +4891,12 @@ }, { "argumentTypes": null, - "id": 5489, + "id": 5537, "name": "repayAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5473, - "src": "5380:11:25", + "referencedDeclaration": 5521, + "src": "5554:11:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4936,18 +4914,18 @@ "typeString": "uint256" } ], - "id": 5487, + "id": 5535, "name": "supply", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2423, - "src": "5355:6:25", + "referencedDeclaration": 2507, + "src": "5529:6:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 5490, + "id": 5538, "isConstant": false, "isLValue": false, "isPure": false, @@ -4955,15 +4933,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5355:37:25", + "src": "5529:37:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5491, + "id": 5539, "nodeType": "ExpressionStatement", - "src": "5355:37:25" + "src": "5529:37:25" } ] } @@ -4975,19 +4953,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5519, + "id": 5567, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5515, + "id": 5563, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5463, - "src": "5894:16:25", + "referencedDeclaration": 5511, + "src": "6071:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5002,32 +4980,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5516, + "id": 5564, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5456, - "src": "5914:15:25", + "referencedDeclaration": 5504, + "src": "6091:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 5517, + "id": 5565, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "5914:29:25", + "referencedDeclaration": 7501, + "src": "6091:29:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5518, + "id": 5566, "isConstant": false, "isLValue": false, "isPure": false, @@ -5035,35 +5013,35 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5914:31:25", + "src": "6091:31:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "5894:51:25", + "src": "6071:51:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 5552, + "id": 5600, "nodeType": "Block", - "src": "6025:498:25", + "src": "6202:609:25", "statements": [ { "assignments": [ - 5527 + 5575 ], "declarations": [ { "constant": false, - "id": 5527, + "id": 5575, "name": "oldTokenUnderlying", "nodeType": "VariableDeclaration", - "scope": 5552, - "src": "6120:26:25", + "scope": 5600, + "src": "6297:26:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5071,10 +5049,10 @@ "typeString": "address" }, "typeName": { - "id": 5526, + "id": 5574, "name": "address", "nodeType": "ElementaryTypeName", - "src": "6120:7:25", + "src": "6297:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5085,7 +5063,7 @@ "visibility": "internal" } ], - "id": 5533, + "id": 5581, "initialValue": { "argumentTypes": null, "arguments": [], @@ -5096,12 +5074,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5529, + "id": 5577, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5463, - "src": "6157:16:25", + "referencedDeclaration": 5511, + "src": "6334:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5115,18 +5093,18 @@ "typeString": "address" } ], - "id": 5528, + "id": 5576, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "6149:7:25", + "referencedDeclaration": 884, + "src": "6326:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 5530, + "id": 5578, "isConstant": false, "isLValue": false, "isPure": false, @@ -5134,27 +5112,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6149:25:25", + "src": "6326:25:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 5531, + "id": 5579, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "6149:36:25", + "referencedDeclaration": 835, + "src": "6326:36:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5532, + "id": 5580, "isConstant": false, "isLValue": false, "isPure": false, @@ -5162,27 +5140,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6149:38:25", + "src": "6326:38:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "6120:67:25" + "src": "6297:67:25" }, { "assignments": [ - 5535 + 5583 ], "declarations": [ { "constant": false, - "id": 5535, + "id": 5583, "name": "oldTokenUnderlyingAmount", "nodeType": "VariableDeclaration", - "scope": 5552, - "src": "6201:29:25", + "scope": 5600, + "src": "6378:32:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5190,10 +5168,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5534, - "name": "uint", + "id": 5582, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "6201:4:25", + "src": "6378:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5203,18 +5181,18 @@ "visibility": "internal" } ], - "id": 5540, + "id": 5588, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5537, + "id": 5585, "name": "oldTokenUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5527, - "src": "6254:18:25", + "referencedDeclaration": 5575, + "src": "6451:18:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5222,12 +5200,12 @@ }, { "argumentTypes": null, - "id": 5538, + "id": 5586, "name": "_loanAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5437, - "src": "6274:11:25", + "referencedDeclaration": 5485, + "src": "6487:11:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5245,18 +5223,18 @@ "typeString": "uint256" } ], - "id": 5536, + "id": 5584, "name": "_getTokenToEthOutput", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5150, - "src": "6233:20:25", + "referencedDeclaration": 5202, + "src": "6413:20:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 5539, + "id": 5587, "isConstant": false, "isLValue": false, "isPure": false, @@ -5264,14 +5242,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6233:53:25", + "src": "6413:99:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "6201:85:25" + "src": "6378:134:25" }, { "expression": { @@ -5279,12 +5257,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5542, + "id": 5590, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5463, - "src": "6346:16:25", + "referencedDeclaration": 5511, + "src": "6572:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5292,12 +5270,12 @@ }, { "argumentTypes": null, - "id": 5543, + "id": 5591, "name": "oldTokenUnderlyingAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5535, - "src": "6364:24:25", + "referencedDeclaration": 5583, + "src": "6590:24:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5315,18 +5293,18 @@ "typeString": "uint256" } ], - "id": 5541, + "id": 5589, "name": "redeemUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2605, - "src": "6329:16:25", + "referencedDeclaration": 2689, + "src": "6555:16:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 5544, + "id": 5592, "isConstant": false, "isLValue": false, "isPure": false, @@ -5334,15 +5312,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6329:60:25", + "src": "6555:60:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5545, + "id": 5593, "nodeType": "ExpressionStatement", - "src": "6329:60:25" + "src": "6555:60:25" }, { "expression": { @@ -5350,12 +5328,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5547, + "id": 5595, "name": "oldTokenUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5527, - "src": "6454:18:25", + "referencedDeclaration": 5575, + "src": "6697:18:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5363,12 +5341,12 @@ }, { "argumentTypes": null, - "id": 5548, + "id": 5596, "name": "oldTokenUnderlyingAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5535, - "src": "6474:24:25", + "referencedDeclaration": 5583, + "src": "6733:24:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5376,12 +5354,12 @@ }, { "argumentTypes": null, - "id": 5549, + "id": 5597, "name": "_loanAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5437, - "src": "6500:11:25", + "referencedDeclaration": 5485, + "src": "6775:11:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5403,21 +5381,21 @@ "typeString": "uint256" } ], - "id": 5546, + "id": 5594, "name": "_tokenToEth", "nodeType": "Identifier", "overloadedDeclarations": [ - 5006, - 5045 + 5058, + 5097 ], - "referencedDeclaration": 5045, - "src": "6442:11:25", + "referencedDeclaration": 5097, + "src": "6668:11:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) returns (uint256)" } }, - "id": 5550, + "id": 5598, "isConstant": false, "isLValue": false, "isPure": false, @@ -5425,25 +5403,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "6442:70:25", + "src": "6668:132:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5551, + "id": 5599, "nodeType": "ExpressionStatement", - "src": "6442:70:25" + "src": "6668:132:25" } ] }, - "id": 5553, + "id": 5601, "nodeType": "IfStatement", - "src": "5890:633:25", + "src": "6067:744:25", "trueBody": { - "id": 5525, + "id": 5573, "nodeType": "Block", - "src": "5947:72:25", + "src": "6124:72:25", "statements": [ { "expression": { @@ -5451,12 +5429,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5521, + "id": 5569, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5463, - "src": "5978:16:25", + "referencedDeclaration": 5511, + "src": "6155:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5464,12 +5442,12 @@ }, { "argumentTypes": null, - "id": 5522, + "id": 5570, "name": "_loanAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5437, - "src": "5996:11:25", + "referencedDeclaration": 5485, + "src": "6173:11:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5487,18 +5465,18 @@ "typeString": "uint256" } ], - "id": 5520, + "id": 5568, "name": "redeemUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2605, - "src": "5961:16:25", + "referencedDeclaration": 2689, + "src": "6138:16:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 5523, + "id": 5571, "isConstant": false, "isLValue": false, "isPure": false, @@ -5506,15 +5484,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5961:47:25", + "src": "6138:47:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5524, + "id": 5572, "nodeType": "ExpressionStatement", - "src": "5961:47:25" + "src": "6138:47:25" } ] } @@ -5522,23 +5500,23 @@ ] }, "documentation": null, - "id": 5555, + "id": 5603, "implemented": true, "kind": "function", "modifiers": [], "name": "swapCollateralPostLoan", "nodeType": "FunctionDefinition", "parameters": { - "id": 5444, + "id": 5492, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5437, + "id": 5485, "name": "_loanAmount", "nodeType": "VariableDeclaration", - "scope": 5555, - "src": "4352:16:25", + "scope": 5603, + "src": "4458:19:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5546,10 +5524,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5436, - "name": "uint", + "id": 5484, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "4352:4:25", + "src": "4458:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5560,11 +5538,11 @@ }, { "constant": false, - "id": 5439, + "id": 5487, "name": "_aaveFee", "nodeType": "VariableDeclaration", - "scope": 5555, - "src": "4378:13:25", + "scope": 5603, + "src": "4487:16:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5572,10 +5550,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5438, - "name": "uint", + "id": 5486, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "4378:4:25", + "src": "4487:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5586,11 +5564,11 @@ }, { "constant": false, - "id": 5441, + "id": 5489, "name": "_protocolFee", "nodeType": "VariableDeclaration", - "scope": 5555, - "src": "4401:17:25", + "scope": 5603, + "src": "4513:20:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5598,10 +5576,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5440, - "name": "uint", + "id": 5488, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "4401:4:25", + "src": "4513:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5612,11 +5590,11 @@ }, { "constant": false, - "id": 5443, + "id": 5491, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 5555, - "src": "4428:20:25", + "scope": 5603, + "src": "4543:20:25", "stateVariable": false, "storageLocation": "calldata", "typeDescriptions": { @@ -5624,10 +5602,10 @@ "typeString": "bytes" }, "typeName": { - "id": 5442, + "id": 5490, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "4428:5:25", + "src": "4543:5:25", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -5637,53 +5615,164 @@ "visibility": "internal" } ], - "src": "4342:112:25" + "src": "4448:121:25" }, "returnParameters": { - "id": 5445, + "id": 5493, "nodeType": "ParameterList", "parameters": [], - "src": "4464:0:25" + "src": "4579:0:25" }, - "scope": 5896, - "src": "4311:2218:25", + "scope": 5887, + "src": "4417:2400:25", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 5650, + "id": 5707, "nodeType": "Block", - "src": "8117:1812:25", + "src": "8428:1988:25", "statements": [ + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "id": 5623, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "id": 5621, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5611, + "src": "8459:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "BinaryOperation", + "operator": "!=", + "rightExpression": { + "argumentTypes": null, + "id": 5622, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5615, + "src": "8479:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "src": "8459:36:25", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + { + "argumentTypes": null, + "hexValue": "737761702d6f7065726174696f6e2d73616d652d61646472657373", + "id": 5624, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "8509:29:25", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_d3720a05a3789543893b88b135380c4cdf28a9da35d1c10271d675f5bcc08f5f", + "typeString": "literal_string \"swap-operation-same-address\"" + }, + "value": "swap-operation-same-address" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_d3720a05a3789543893b88b135380c4cdf28a9da35d1c10271d675f5bcc08f5f", + "typeString": "literal_string \"swap-operation-same-address\"" + } + ], + "id": 5620, + "name": "require", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 7821, + 7822 + ], + "referencedDeclaration": 7822, + "src": "8438:7:25", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 5625, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "8438:110:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5626, + "nodeType": "ExpressionStatement", + "src": "8438:110:25" + }, { "assignments": [ - 5571 + 5628 ], "declarations": [ { "constant": false, - "id": 5571, + "id": 5628, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 5650, - "src": "8332:31:25", + "scope": 5707, + "src": "8764:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 5570, + "id": 5627, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, - "src": "8332:15:25", + "referencedDeclaration": 7541, + "src": "8764:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -5691,18 +5780,18 @@ "visibility": "internal" } ], - "id": 5575, + "id": 5632, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5573, + "id": 5630, "name": "addressRegistryAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5561, - "src": "8382:22:25", + "referencedDeclaration": 5609, + "src": "8827:22:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5716,18 +5805,18 @@ "typeString": "address" } ], - "id": 5572, + "id": 5629, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, - "src": "8366:15:25", + "referencedDeclaration": 7541, + "src": "8798:15:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 5574, + "id": 5631, "isConstant": false, "isLValue": false, "isPure": false, @@ -5735,27 +5824,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8366:39:25", + "src": "8798:61:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, "nodeType": "VariableDeclarationStatement", - "src": "8332:73:25" + "src": "8764:95:25" }, { "assignments": [ - 5577 + 5634 ], "declarations": [ { "constant": false, - "id": 5577, + "id": 5634, "name": "ethDebtAmount", "nodeType": "VariableDeclaration", - "scope": 5650, - "src": "8534:18:25", + "scope": 5707, + "src": "8988:21:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -5763,10 +5852,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5576, - "name": "uint", + "id": 5633, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "8534:4:25", + "src": "8988:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5776,10 +5865,10 @@ "visibility": "internal" } ], - "id": 5578, + "id": 5635, "initialValue": null, "nodeType": "VariableDeclarationStatement", - "src": "8534:18:25" + "src": "8988:21:25" }, { "condition": { @@ -5788,19 +5877,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5583, + "id": 5640, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5579, + "id": 5636, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5563, - "src": "8567:16:25", + "referencedDeclaration": 5611, + "src": "9024:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5815,32 +5904,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5580, + "id": 5637, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5571, - "src": "8587:15:25", + "referencedDeclaration": 5628, + "src": "9044:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 5581, + "id": 5638, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "8587:29:25", + "referencedDeclaration": 7501, + "src": "9044:29:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5582, + "id": 5639, "isConstant": false, "isLValue": false, "isPure": false, @@ -5848,39 +5937,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8587:31:25", + "src": "9044:31:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "8567:51:25", + "src": "9024:51:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 5600, + "id": 5657, "nodeType": "Block", - "src": "8690:228:25", + "src": "9147:228:25", "statements": [ { "expression": { "argumentTypes": null, - "id": 5598, + "id": 5655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 5589, + "id": 5646, "name": "ethDebtAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5577, - "src": "8760:13:25", + "referencedDeclaration": 5634, + "src": "9217:13:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5901,12 +5990,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5592, + "id": 5649, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5563, - "src": "8822:16:25", + "referencedDeclaration": 5611, + "src": "9279:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5920,18 +6009,18 @@ "typeString": "address" } ], - "id": 5591, + "id": 5648, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "8814:7:25", + "referencedDeclaration": 884, + "src": "9271:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 5593, + "id": 5650, "isConstant": false, "isLValue": false, "isPure": false, @@ -5939,27 +6028,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8814:25:25", + "src": "9271:25:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 5594, + "id": 5651, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "8814:36:25", + "referencedDeclaration": 835, + "src": "9271:36:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5595, + "id": 5652, "isConstant": false, "isLValue": false, "isPure": false, @@ -5967,7 +6056,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8814:38:25", + "src": "9271:38:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -5975,12 +6064,12 @@ }, { "argumentTypes": null, - "id": 5596, + "id": 5653, "name": "oldTokenUnderlyingDelta", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5565, - "src": "8870:23:25", + "referencedDeclaration": 5613, + "src": "9327:23:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -5998,18 +6087,18 @@ "typeString": "uint256" } ], - "id": 5590, + "id": 5647, "name": "_getEthToTokenOutput", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5169, - "src": "8776:20:25", + "referencedDeclaration": 5221, + "src": "9233:20:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 5597, + "id": 5654, "isConstant": false, "isLValue": false, "isPure": false, @@ -6017,48 +6106,48 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8776:131:25", + "src": "9233:131:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8760:147:25", + "src": "9217:147:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5599, + "id": 5656, "nodeType": "ExpressionStatement", - "src": "8760:147:25" + "src": "9217:147:25" } ] }, - "id": 5601, + "id": 5658, "nodeType": "IfStatement", - "src": "8563:355:25", + "src": "9020:355:25", "trueBody": { - "id": 5588, + "id": 5645, "nodeType": "Block", - "src": "8620:64:25", + "src": "9077:64:25", "statements": [ { "expression": { "argumentTypes": null, - "id": 5586, + "id": 5643, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 5584, + "id": 5641, "name": "ethDebtAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5577, - "src": "8634:13:25", + "referencedDeclaration": 5634, + "src": "9091:13:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6068,42 +6157,42 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 5585, + "id": 5642, "name": "oldTokenUnderlyingDelta", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5565, - "src": "8650:23:25", + "referencedDeclaration": 5613, + "src": "9107:23:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "8634:39:25", + "src": "9091:39:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5587, + "id": 5644, "nodeType": "ExpressionStatement", - "src": "8634:39:25" + "src": "9091:39:25" } ] } }, { "assignments": [ - 5603 + 5660 ], "declarations": [ { "constant": false, - "id": 5603, + "id": 5660, "name": "addressAndExecuteOperationCalldataParams", "nodeType": "VariableDeclaration", - "scope": 5650, - "src": "9067:53:25", + "scope": 5707, + "src": "9524:53:25", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -6111,10 +6200,10 @@ "typeString": "bytes" }, "typeName": { - "id": 5602, + "id": 5659, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "9067:5:25", + "src": "9524:5:25", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -6124,7 +6213,7 @@ "visibility": "internal" } ], - "id": 5612, + "id": 5669, "initialValue": { "argumentTypes": null, "arguments": [ @@ -6133,12 +6222,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5608, + "id": 5665, "name": "dedgeCompoundManagerAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5557, - "src": "9164:27:25", + "referencedDeclaration": 5605, + "src": "9634:27:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6154,18 +6243,18 @@ ], "expression": { "argumentTypes": null, - "id": 5606, + "id": 5663, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, - "src": "9153:3:25", + "referencedDeclaration": 7805, + "src": "9623:3:25", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 5607, + "id": 5664, "isConstant": false, "isLValue": false, "isPure": true, @@ -6173,13 +6262,13 @@ "memberName": "encode", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9153:10:25", + "src": "9623:10:25", "typeDescriptions": { "typeIdentifier": "t_function_abiencode_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 5609, + "id": 5666, "isConstant": false, "isLValue": false, "isPure": false, @@ -6187,7 +6276,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9153:39:25", + "src": "9623:39:25", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -6195,15 +6284,15 @@ }, { "argumentTypes": null, - "id": 5610, + "id": 5667, "name": "executeOperationCalldataParams", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5567, - "src": "9206:30:25", + "referencedDeclaration": 5617, + "src": "9676:30:25", "typeDescriptions": { - "typeIdentifier": "t_bytes_calldata_ptr", - "typeString": "bytes calldata" + "typeIdentifier": "t_bytes_memory_ptr", + "typeString": "bytes memory" } } ], @@ -6214,24 +6303,24 @@ "typeString": "bytes memory" }, { - "typeIdentifier": "t_bytes_calldata_ptr", - "typeString": "bytes calldata" + "typeIdentifier": "t_bytes_memory_ptr", + "typeString": "bytes memory" } ], "expression": { "argumentTypes": null, - "id": 5604, + "id": 5661, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, - "src": "9123:3:25", + "referencedDeclaration": 7805, + "src": "9580:3:25", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 5605, + "id": 5662, "isConstant": false, "isLValue": false, "isPure": true, @@ -6239,13 +6328,13 @@ "memberName": "encodePacked", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "9123:16:25", + "src": "9580:29:25", "typeDescriptions": { "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", "typeString": "function () pure returns (bytes memory)" } }, - "id": 5611, + "id": 5668, "isConstant": false, "isLValue": false, "isPure": false, @@ -6253,27 +6342,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9123:123:25", + "src": "9580:136:25", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, "nodeType": "VariableDeclarationStatement", - "src": "9067:179:25" + "src": "9524:192:25" }, { "assignments": [ - 5614 + 5671 ], "declarations": [ { "constant": false, - "id": 5614, + "id": 5671, "name": "lendingPool", "nodeType": "VariableDeclaration", - "scope": 5650, - "src": "9257:24:25", + "scope": 5707, + "src": "9727:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6282,11 +6371,11 @@ }, "typeName": { "contractScope": null, - "id": 5613, + "id": 5670, "name": "ILendingPool", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 546, - "src": "9257:12:25", + "src": "9727:12:25", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", "typeString": "contract ILendingPool" @@ -6296,7 +6385,7 @@ "visibility": "internal" } ], - "id": 5624, + "id": 5681, "initialValue": { "argumentTypes": null, "arguments": [ @@ -6315,32 +6404,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5617, + "id": 5674, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5571, - "src": "9357:15:25", + "referencedDeclaration": 5628, + "src": "9827:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 5618, + "id": 5675, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "AaveLendingPoolAddressProviderAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7495, - "src": "9357:53:25", + "referencedDeclaration": 7486, + "src": "9827:53:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5619, + "id": 5676, "isConstant": false, "isLValue": false, "isPure": false, @@ -6348,7 +6437,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9357:55:25", + "src": "9827:55:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6362,18 +6451,18 @@ "typeString": "address" } ], - "id": 5616, + "id": 5673, "name": "ILendingPoolAddressesProvider", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 659, - "src": "9310:29:25", + "src": "9780:29:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_contract$_ILendingPoolAddressesProvider_$659_$", "typeString": "type(contract ILendingPoolAddressesProvider)" } }, - "id": 5620, + "id": 5677, "isConstant": false, "isLValue": false, "isPure": false, @@ -6381,13 +6470,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9310:116:25", + "src": "9780:116:25", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPoolAddressesProvider_$659", "typeString": "contract ILendingPoolAddressesProvider" } }, - "id": 5621, + "id": 5678, "isConstant": false, "isLValue": false, "isPure": false, @@ -6395,13 +6484,13 @@ "memberName": "getLendingPool", "nodeType": "MemberAccess", "referencedDeclaration": 553, - "src": "9310:131:25", + "src": "9780:148:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5622, + "id": 5679, "isConstant": false, "isLValue": false, "isPure": false, @@ -6409,7 +6498,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9310:133:25", + "src": "9780:150:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6423,18 +6512,18 @@ "typeString": "address" } ], - "id": 5615, + "id": 5672, "name": "ILendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 546, - "src": "9284:12:25", + "src": "9754:12:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_contract$_ILendingPool_$546_$", "typeString": "type(contract ILendingPool)" } }, - "id": 5623, + "id": 5680, "isConstant": false, "isLValue": false, "isPure": false, @@ -6442,14 +6531,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9284:169:25", + "src": "9754:186:25", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", "typeString": "contract ILendingPool" } }, "nodeType": "VariableDeclarationStatement", - "src": "9257:196:25" + "src": "9727:213:25" }, { "expression": { @@ -6457,12 +6546,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5626, + "id": 5683, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5559, - "src": "9527:15:25", + "referencedDeclaration": 5607, + "src": "10014:15:25", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -6473,12 +6562,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5628, + "id": 5685, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5614, - "src": "9552:11:25", + "referencedDeclaration": 5671, + "src": "10039:11:25", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", "typeString": "contract ILendingPool" @@ -6492,20 +6581,20 @@ "typeString": "contract ILendingPool" } ], - "id": 5627, + "id": 5684, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "9544:7:25", + "src": "10031:7:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 5629, + "id": 5686, "isConstant": false, "isLValue": false, "isPure": false, @@ -6513,7 +6602,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9544:20:25", + "src": "10031:20:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6531,18 +6620,18 @@ "typeString": "address" } ], - "id": 5625, + "id": 5682, "name": "_proxyGuardPermit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5266, - "src": "9509:17:25", + "referencedDeclaration": 5314, + "src": "9996:17:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", "typeString": "function (address payable,address)" } }, - "id": 5630, + "id": 5687, "isConstant": false, "isLValue": false, "isPure": false, @@ -6550,15 +6639,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9509:56:25", + "src": "9996:56:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5631, + "id": 5688, "nodeType": "ExpressionStatement", - "src": "9509:56:25" + "src": "9996:56:25" }, { "expression": { @@ -6566,12 +6655,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5635, + "id": 5692, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5559, - "src": "9658:15:25", + "referencedDeclaration": 5607, + "src": "10145:15:25", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -6584,32 +6673,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5636, + "id": 5693, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5571, - "src": "9687:15:25", + "referencedDeclaration": 5628, + "src": "10174:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 5637, + "id": 5694, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "AaveEthAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7498, - "src": "9687:30:25", + "referencedDeclaration": 7489, + "src": "10174:30:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5638, + "id": 5695, "isConstant": false, "isLValue": false, "isPure": false, @@ -6617,7 +6706,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9687:32:25", + "src": "10174:32:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6625,12 +6714,12 @@ }, { "argumentTypes": null, - "id": 5639, + "id": 5696, "name": "ethDebtAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5577, - "src": "9733:13:25", + "referencedDeclaration": 5634, + "src": "10220:13:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6638,12 +6727,12 @@ }, { "argumentTypes": null, - "id": 5640, + "id": 5697, "name": "addressAndExecuteOperationCalldataParams", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5603, - "src": "9760:40:25", + "referencedDeclaration": 5660, + "src": "10247:40:25", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -6671,18 +6760,18 @@ ], "expression": { "argumentTypes": null, - "id": 5632, + "id": 5689, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5614, - "src": "9623:11:25", + "referencedDeclaration": 5671, + "src": "10110:11:25", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", "typeString": "contract ILendingPool" } }, - "id": 5634, + "id": 5691, "isConstant": false, "isLValue": false, "isPure": false, @@ -6690,13 +6779,13 @@ "memberName": "flashLoan", "nodeType": "MemberAccess", "referencedDeclaration": 442, - "src": "9623:21:25", + "src": "10110:21:25", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$_t_bytes_memory_ptr_$returns$__$", "typeString": "function (address,address,uint256,bytes memory) external" } }, - "id": 5641, + "id": 5698, "isConstant": false, "isLValue": false, "isPure": false, @@ -6704,15 +6793,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9623:187:25", + "src": "10110:187:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5642, + "id": 5699, "nodeType": "ExpressionStatement", - "src": "9623:187:25" + "src": "10110:187:25" }, { "expression": { @@ -6720,12 +6809,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5644, + "id": 5701, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5559, - "src": "9884:15:25", + "referencedDeclaration": 5607, + "src": "10371:15:25", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -6736,12 +6825,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5646, + "id": 5703, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5614, - "src": "9909:11:25", + "referencedDeclaration": 5671, + "src": "10396:11:25", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", "typeString": "contract ILendingPool" @@ -6755,20 +6844,20 @@ "typeString": "contract ILendingPool" } ], - "id": 5645, + "id": 5702, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "9901:7:25", + "src": "10388:7:25", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" }, "typeName": "address" }, - "id": 5647, + "id": 5704, "isConstant": false, "isLValue": false, "isPure": false, @@ -6776,7 +6865,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9901:20:25", + "src": "10388:20:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -6794,18 +6883,18 @@ "typeString": "address" } ], - "id": 5643, + "id": 5700, "name": "_proxyGuardForbid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5307, - "src": "9866:17:25", + "referencedDeclaration": 5355, + "src": "10353:17:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", "typeString": "function (address payable,address)" } }, - "id": 5648, + "id": 5705, "isConstant": false, "isLValue": false, "isPure": false, @@ -6813,36 +6902,36 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "9866:56:25", + "src": "10353:56:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5649, + "id": 5706, "nodeType": "ExpressionStatement", - "src": "9866:56:25" + "src": "10353:56:25" } ] }, "documentation": null, - "id": 5651, + "id": 5708, "implemented": true, "kind": "function", "modifiers": [], "name": "swapOperation", "nodeType": "FunctionDefinition", "parameters": { - "id": 5568, + "id": 5618, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5557, + "id": 5605, "name": "dedgeCompoundManagerAddress", "nodeType": "VariableDeclaration", - "scope": 5651, - "src": "7750:35:25", + "scope": 5708, + "src": "8038:35:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6850,10 +6939,10 @@ "typeString": "address" }, "typeName": { - "id": 5556, + "id": 5604, "name": "address", "nodeType": "ElementaryTypeName", - "src": "7750:7:25", + "src": "8038:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6865,11 +6954,11 @@ }, { "constant": false, - "id": 5559, + "id": 5607, "name": "dacProxyAddress", "nodeType": "VariableDeclaration", - "scope": 5651, - "src": "7795:31:25", + "scope": 5708, + "src": "8083:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6877,10 +6966,10 @@ "typeString": "address payable" }, "typeName": { - "id": 5558, + "id": 5606, "name": "address", "nodeType": "ElementaryTypeName", - "src": "7795:15:25", + "src": "8083:15:25", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -6892,11 +6981,11 @@ }, { "constant": false, - "id": 5561, + "id": 5609, "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 5651, - "src": "7836:30:25", + "scope": 5708, + "src": "8124:30:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6904,10 +6993,10 @@ "typeString": "address" }, "typeName": { - "id": 5560, + "id": 5608, "name": "address", "nodeType": "ElementaryTypeName", - "src": "7836:7:25", + "src": "8124:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6919,11 +7008,11 @@ }, { "constant": false, - "id": 5563, + "id": 5611, "name": "oldCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 5651, - "src": "7876:24:25", + "scope": 5708, + "src": "8164:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6931,10 +7020,10 @@ "typeString": "address" }, "typeName": { - "id": 5562, + "id": 5610, "name": "address", "nodeType": "ElementaryTypeName", - "src": "7876:7:25", + "src": "8164:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6946,11 +7035,11 @@ }, { "constant": false, - "id": 5565, + "id": 5613, "name": "oldTokenUnderlyingDelta", "nodeType": "VariableDeclaration", - "scope": 5651, - "src": "7965:28:25", + "scope": 5708, + "src": "8242:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -6958,10 +7047,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5564, - "name": "uint", + "id": 5612, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "7965:4:25", + "src": "8242:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -6972,22 +7061,49 @@ }, { "constant": false, - "id": 5567, + "id": 5615, + "name": "newCTokenAddress", + "nodeType": "VariableDeclaration", + "scope": 5708, + "src": "8329:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5614, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "8329:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5617, "name": "executeOperationCalldataParams", "nodeType": "VariableDeclaration", - "scope": 5651, - "src": "8056:45:25", + "scope": 5708, + "src": "8363:43:25", "stateVariable": false, - "storageLocation": "calldata", + "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_bytes_calldata_ptr", + "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes" }, "typeName": { - "id": 5566, + "id": 5616, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "8056:5:25", + "src": "8363:5:25", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -6997,25 +7113,25 @@ "visibility": "internal" } ], - "src": "7740:367:25" + "src": "8028:384:25" }, "returnParameters": { - "id": 5569, + "id": 5619, "nodeType": "ParameterList", "parameters": [], - "src": "8117:0:25" + "src": "8428:0:25" }, - "scope": 5896, - "src": "7718:2211:25", - "stateMutability": "nonpayable", + "scope": 5887, + "src": "8006:2410:25", + "stateMutability": "payable", "superFunction": null, - "visibility": "external" + "visibility": "public" }, { "body": { - "id": 5803, + "id": 5798, "nodeType": "Block", - "src": "10189:2546:25", + "src": "10702:1551:25", "statements": [ { "expression": { @@ -7027,19 +7143,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5665, + "id": 5722, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5663, + "id": 5720, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5655, - "src": "10513:16:25", + "referencedDeclaration": 5712, + "src": "11069:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7049,18 +7165,18 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 5664, + "id": 5721, "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "10533:16:25", + "referencedDeclaration": 5716, + "src": "11089:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "10513:36:25", + "src": "11069:36:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -7068,21 +7184,21 @@ }, { "argumentTypes": null, - "hexValue": "636c6561722d646562742d73616d652d61646472657373", - "id": 5666, + "hexValue": "636c6561722d636f6c6c61746572616c2d73616d652d61646472657373", + "id": 5723, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "10551:25:25", + "src": "11119:31:25", "subdenomination": null, "typeDescriptions": { - "typeIdentifier": "t_stringliteral_f60d97a51de4aac3bfa13da6812001977cdeeeb11eaeb3d4289c176513ce2776", - "typeString": "literal_string \"clear-debt-same-address\"" + "typeIdentifier": "t_stringliteral_edcd146ca03620acad0398928a21180b949d6d0e47fbb0206aa2e50ad659e735", + "typeString": "literal_string \"clear-collateral-same-address\"" }, - "value": "clear-debt-same-address" + "value": "clear-collateral-same-address" } ], "expression": { @@ -7092,25 +7208,25 @@ "typeString": "bool" }, { - "typeIdentifier": "t_stringliteral_f60d97a51de4aac3bfa13da6812001977cdeeeb11eaeb3d4289c176513ce2776", - "typeString": "literal_string \"clear-debt-same-address\"" + "typeIdentifier": "t_stringliteral_edcd146ca03620acad0398928a21180b949d6d0e47fbb0206aa2e50ad659e735", + "typeString": "literal_string \"clear-collateral-same-address\"" } ], - "id": 5662, + "id": 5719, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "10505:7:25", + "referencedDeclaration": 7822, + "src": "11048:7:25", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 5667, + "id": 5724, "isConstant": false, "isLValue": false, "isPure": false, @@ -7118,43 +7234,80 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10505:72:25", + "src": "11048:112:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5668, + "id": 5725, "nodeType": "ExpressionStatement", - "src": "10505:72:25" + "src": "11048:112:25" + }, + { + "assignments": [ + 5727 + ], + "declarations": [ + { + "constant": false, + "id": 5727, + "name": "supplyAmount", + "nodeType": "VariableDeclaration", + "scope": 5798, + "src": "11171:20:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5726, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "11171:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5728, + "initialValue": null, + "nodeType": "VariableDeclarationStatement", + "src": "11171:20:25" }, { "assignments": [ - 5670 + 5730 ], "declarations": [ { "constant": false, - "id": 5670, + "id": 5730, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 5803, - "src": "10588:31:25", + "scope": 5798, + "src": "11201:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 5669, + "id": 5729, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, - "src": "10588:15:25", + "referencedDeclaration": 7541, + "src": "11201:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -7162,18 +7315,18 @@ "visibility": "internal" } ], - "id": 5674, + "id": 5734, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5672, + "id": 5732, "name": "addressRegistryAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5653, - "src": "10638:22:25", + "referencedDeclaration": 5710, + "src": "11264:22:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7187,18 +7340,18 @@ "typeString": "address" } ], - "id": 5671, + "id": 5731, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, - "src": "10622:15:25", + "referencedDeclaration": 7541, + "src": "11235:15:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 5673, + "id": 5733, "isConstant": false, "isLValue": false, "isPure": false, @@ -7206,127 +7359,85 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10622:39:25", + "src": "11235:61:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, "nodeType": "VariableDeclarationStatement", - "src": "10588:73:25" - }, - { - "assignments": [ - 5676 - ], - "declarations": [ - { - "constant": false, - "id": 5676, - "name": "borrowAmount", - "nodeType": "VariableDeclaration", - "scope": 5803, - "src": "10672:17:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 5675, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "10672:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5677, - "initialValue": null, - "nodeType": "VariableDeclarationStatement", - "src": "10672:17:25" + "src": "11201:95:25" }, { - "assignments": [ - 5679 - ], - "declarations": [ - { - "constant": false, - "id": 5679, - "name": "oldTokenUnderlying", - "nodeType": "VariableDeclaration", - "scope": 5803, - "src": "10699:26:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5678, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "10699:7:25", - "stateMutability": "nonpayable", + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5736, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5712, + "src": "11354:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "value": null, - "visibility": "internal" - } - ], - "id": 5680, - "initialValue": null, - "nodeType": "VariableDeclarationStatement", - "src": "10699:26:25" - }, - { - "assignments": [ - 5682 - ], - "declarations": [ - { - "constant": false, - "id": 5682, - "name": "newTokenUnderlying", - "nodeType": "VariableDeclaration", - "scope": 5803, - "src": "10735:26:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5681, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "10735:7:25", - "stateMutability": "nonpayable", + { + "argumentTypes": null, + "id": 5737, + "name": "oldTokenUnderlyingAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5714, + "src": "11372:24:25", "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { "typeIdentifier": "t_address", "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - }, - "value": null, - "visibility": "internal" + ], + "id": 5735, + "name": "redeemUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2689, + "src": "11337:16:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" + } + }, + "id": 5738, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "11337:60:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" } - ], - "id": 5683, - "initialValue": null, - "nodeType": "VariableDeclarationStatement", - "src": "10735:26:25" + }, + "id": 5739, + "nodeType": "ExpressionStatement", + "src": "11337:60:25" }, { "condition": { @@ -7335,19 +7446,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5688, + "id": 5744, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5684, + "id": 5740, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5655, - "src": "10776:16:25", + "referencedDeclaration": 5712, + "src": "11412:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7362,32 +7473,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5685, + "id": 5741, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5670, - "src": "10796:15:25", + "referencedDeclaration": 5730, + "src": "11432:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 5686, + "id": 5742, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "10796:29:25", + "referencedDeclaration": 7501, + "src": "11432:29:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5687, + "id": 5743, "isConstant": false, "isLValue": false, "isPure": false, @@ -7395,13 +7506,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10796:31:25", + "src": "11432:31:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "10776:51:25", + "src": "11412:51:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -7414,19 +7525,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5720, + "id": 5761, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5716, + "id": 5757, "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "11325:16:25", + "referencedDeclaration": 5716, + "src": "11666:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7441,32 +7552,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5717, + "id": 5758, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5670, - "src": "11345:15:25", + "referencedDeclaration": 5730, + "src": "11686:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 5718, + "id": 5759, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "11345:29:25", + "referencedDeclaration": 7501, + "src": "11686:29:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5719, + "id": 5760, "isConstant": false, "isLValue": false, "isPure": false, @@ -7474,115 +7585,257 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11345:31:25", + "src": "11686:31:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "11325:51:25", + "src": "11666:51:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 5795, + "id": 5790, "nodeType": "Block", - "src": "11868:764:25", + "src": "11916:251:25", "statements": [ { "expression": { "argumentTypes": null, - "id": 5754, + "id": 5788, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 5748, - "name": "oldTokenUnderlying", + "id": 5774, + "name": "supplyAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5679, - "src": "11912:18:25", + "referencedDeclaration": 5727, + "src": "11960:12:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, "nodeType": "Assignment", "operator": "=", "rightHandSide": { "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { + "arguments": [ + { "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5750, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5655, - "src": "11941:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], + "arguments": [], "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5749, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "11933:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5751, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11933:25:25", + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5777, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5712, + "src": "12014:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5776, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "12006:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" + } + }, + "id": 5778, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "12006:25:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" + } + }, + "id": 5779, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "underlying", + "nodeType": "MemberAccess", + "referencedDeclaration": 835, + "src": "12006:36:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" + } + }, + "id": 5780, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "12006:38:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" + "typeIdentifier": "t_address", + "typeString": "address" } }, - "id": 5752, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "11933:36:25", + { + "argumentTypes": null, + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5782, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5716, + "src": "12070:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5781, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "12062:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" + } + }, + "id": 5783, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "12062:25:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" + } + }, + "id": 5784, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "underlying", + "nodeType": "MemberAccess", + "referencedDeclaration": 835, + "src": "12062:36:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" + } + }, + "id": 5785, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "12062:38:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5786, + "name": "oldTokenUnderlyingAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5714, + "src": "12118:24:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5775, + "name": "_tokenToToken", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 5124, + 5145 + ], + "referencedDeclaration": 5145, + "src": "11975:13:25", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,address,uint256) returns (uint256)" } }, - "id": 5753, + "id": 5787, "isConstant": false, "isLValue": false, "isPure": false, @@ -7590,286 +7843,148 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11933:38:25", + "src": "11975:181:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "src": "11912:59:25", + "src": "11960:196:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 5755, + "id": 5789, "nodeType": "ExpressionStatement", - "src": "11912:59:25" - }, + "src": "11960:196:25" + } + ] + }, + "id": 5791, + "nodeType": "IfStatement", + "src": "11662:505:25", + "trueBody": { + "id": 5773, + "nodeType": "Block", + "src": "11719:191:25", + "statements": [ { "expression": { "argumentTypes": null, - "id": 5762, + "id": 5771, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 5756, - "name": "newTokenUnderlying", + "id": 5762, + "name": "supplyAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5682, - "src": "11985:18:25", + "referencedDeclaration": 5727, + "src": "11761:12:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, "nodeType": "Assignment", "operator": "=", "rightHandSide": { "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { + "arguments": [ + { "argumentTypes": null, - "arguments": [ - { + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { "argumentTypes": null, - "id": 5758, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "12014:16:25", + "arguments": [ + { + "argumentTypes": null, + "id": 5765, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5712, + "src": "11813:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5764, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "11805:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" + } + }, + "id": 5766, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "11805:25:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" } - ], - "id": 5757, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "12006:7:25", + }, + "id": 5767, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "underlying", + "nodeType": "MemberAccess", + "referencedDeclaration": 835, + "src": "11805:36:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" } }, - "id": 5759, + "id": 5768, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "typeConversion", + "kind": "functionCall", "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12006:25:25", + "src": "11805:38:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5760, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "12006:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5761, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12006:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "src": "11985:59:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "id": 5763, - "nodeType": "ExpressionStatement", - "src": "11985:59:25" - }, - { - "assignments": [ - 5765 - ], - "declarations": [ - { - "constant": false, - "id": 5765, - "name": "ethAmount", - "nodeType": "VariableDeclaration", - "scope": 5795, - "src": "12103:14:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 5764, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "12103:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5770, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5767, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5679, - "src": "12141:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5768, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "12161:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5766, - "name": "_getEthToTokenOutput", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5169, - "src": "12120:20:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) view returns (uint256)" - } - }, - "id": 5769, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12120:70:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "12103:87:25" - }, - { - "expression": { - "argumentTypes": null, - "id": 5776, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5771, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "12251:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5773, - "name": "newTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5682, - "src": "12287:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_address", + "typeString": "address" } }, { "argumentTypes": null, - "id": 5774, - "name": "ethAmount", + "id": 5769, + "name": "oldTokenUnderlyingAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5765, - "src": "12307:9:25", + "referencedDeclaration": 5714, + "src": "11861:24:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7887,18 +8002,21 @@ "typeString": "uint256" } ], - "id": 5772, - "name": "_getTokenToEthOutput", + "id": 5763, + "name": "_tokenToEth", "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5150, - "src": "12266:20:25", + "overloadedDeclarations": [ + 5058, + 5097 + ], + "referencedDeclaration": 5058, + "src": "11776:11:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) view returns (uint256)" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 5775, + "id": 5770, "isConstant": false, "isLValue": false, "isPure": false, @@ -7906,34 +8024,136 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12266:51:25", + "src": "11776:123:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "12251:66:25", + "src": "11761:138:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5777, + "id": 5772, "nodeType": "ExpressionStatement", - "src": "12251:66:25" - }, - { - "expression": { + "src": "11761:138:25" + } + ] + } + }, + "id": 5792, + "nodeType": "IfStatement", + "src": "11408:759:25", + "trueBody": { + "id": 5756, + "nodeType": "Block", + "src": "11465:191:25", + "statements": [ + { + "expression": { + "argumentTypes": null, + "id": 5754, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftHandSide": { + "argumentTypes": null, + "id": 5745, + "name": "supplyAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5727, + "src": "11507:12:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "Assignment", + "operator": "=", + "rightHandSide": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5779, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "12383:16:25", + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5748, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5716, + "src": "11559:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5747, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "11551:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" + } + }, + "id": 5749, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "11551:25:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" + } + }, + "id": 5750, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "underlying", + "nodeType": "MemberAccess", + "referencedDeclaration": 835, + "src": "11551:36:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" + } + }, + "id": 5751, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "11551:38:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -7941,12 +8161,12 @@ }, { "argumentTypes": null, - "id": 5780, - "name": "borrowAmount", + "id": 5752, + "name": "oldTokenUnderlyingAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "12401:12:25", + "referencedDeclaration": 5714, + "src": "11607:24:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -7964,18 +8184,21 @@ "typeString": "uint256" } ], - "id": 5778, - "name": "borrow", + "id": 5746, + "name": "_ethToToken", "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "12376:6:25", + "overloadedDeclarations": [ + 5011, + 5040 + ], + "referencedDeclaration": 5011, + "src": "11522:11:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 5781, + "id": 5753, "isConstant": false, "isLValue": false, "isPure": false, @@ -7983,4023 +8206,79 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12376:38:25", + "src": "11522:123:25", "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 5782, - "nodeType": "ExpressionStatement", - "src": "12376:38:25" + "src": "11507:138:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5784, - "name": "newTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5682, - "src": "12491:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5785, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "12511:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - { - "argumentTypes": null, - "id": 5786, - "name": "ethAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5765, - "src": "12525:9:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5783, - "name": "_tokenToEth", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 5006, - 5045 - ], - "referencedDeclaration": 5045, - "src": "12479:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256,uint256) returns (uint256)" - } - }, - "id": 5787, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12479:56:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5788, - "nodeType": "ExpressionStatement", - "src": "12479:56:25" + "id": 5755, + "nodeType": "ExpressionStatement", + "src": "11507:138:25" + } + ] + } + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5794, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5716, + "src": "12215:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5795, + "name": "supplyAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5727, + "src": "12233:12:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" }, { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5790, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5679, - "src": "12561:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5791, - "name": "ethAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5765, - "src": "12581:9:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - { - "argumentTypes": null, - "id": 5792, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "12592:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5789, - "name": "_ethToToken", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 4959, - 4988 - ], - "referencedDeclaration": 4988, - "src": "12549:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256,uint256) returns (uint256)" - } - }, - "id": 5793, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12549:72:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5794, - "nodeType": "ExpressionStatement", - "src": "12549:72:25" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - ] + ], + "id": 5793, + "name": "supply", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2507, + "src": "12208:6:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" + } }, "id": 5796, - "nodeType": "IfStatement", - "src": "11321:1311:25", - "trueBody": { - "id": 5747, - "nodeType": "Block", - "src": "11378:484:25", - "statements": [ - { - "expression": { - "argumentTypes": null, - "id": 5727, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5721, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5679, - "src": "11420:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5723, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5655, - "src": "11449:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5722, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "11441:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5724, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11441:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5725, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "11441:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5726, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11441:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "src": "11420:59:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "id": 5728, - "nodeType": "ExpressionStatement", - "src": "11420:59:25" - }, - { - "expression": { - "argumentTypes": null, - "id": 5734, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5729, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "11544:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5731, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5679, - "src": "11580:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5732, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "11600:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5730, - "name": "_getEthToTokenOutput", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5169, - "src": "11559:20:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) view returns (uint256)" - } - }, - "id": 5733, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11559:70:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "11544:85:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5735, - "nodeType": "ExpressionStatement", - "src": "11544:85:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5737, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "11693:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5738, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "11711:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5736, - "name": "borrow", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "11686:6:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" - } - }, - "id": 5739, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11686:38:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5740, - "nodeType": "ExpressionStatement", - "src": "11686:38:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5742, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5679, - "src": "11788:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5743, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "11808:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - { - "argumentTypes": null, - "id": 5744, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "11822:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5741, - "name": "_ethToToken", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 4959, - 4988 - ], - "referencedDeclaration": 4988, - "src": "11776:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256,uint256) returns (uint256)" - } - }, - "id": 5745, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11776:75:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5746, - "nodeType": "ExpressionStatement", - "src": "11776:75:25" - } - ] - } - }, - "id": 5797, - "nodeType": "IfStatement", - "src": "10772:1860:25", - "trueBody": { - "id": 5715, - "nodeType": "Block", - "src": "10829:486:25", - "statements": [ - { - "expression": { - "argumentTypes": null, - "id": 5695, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5689, - "name": "newTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5682, - "src": "10871:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5691, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "10900:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5690, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "10892:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5692, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "10892:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5693, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "10892:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5694, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "10892:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "src": "10871:59:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "id": 5696, - "nodeType": "ExpressionStatement", - "src": "10871:59:25" - }, - { - "expression": { - "argumentTypes": null, - "id": 5702, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5697, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "10995:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5699, - "name": "newTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5682, - "src": "11031:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5700, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "11051:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5698, - "name": "_getTokenToEthOutput", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5150, - "src": "11010:20:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) view returns (uint256)" - } - }, - "id": 5701, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11010:70:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "10995:85:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5703, - "nodeType": "ExpressionStatement", - "src": "10995:85:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5705, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "11146:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5706, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "11164:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5704, - "name": "borrow", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "11139:6:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" - } - }, - "id": 5707, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11139:38:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5708, - "nodeType": "ExpressionStatement", - "src": "11139:38:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5710, - "name": "newTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5682, - "src": "11241:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5711, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "11261:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - { - "argumentTypes": null, - "id": 5712, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "11275:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5709, - "name": "_tokenToEth", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 5006, - 5045 - ], - "referencedDeclaration": 5045, - "src": "11229:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256,uint256) returns (uint256)" - } - }, - "id": 5713, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11229:75:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5714, - "nodeType": "ExpressionStatement", - "src": "11229:75:25" - } - ] - } - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5799, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5655, - "src": "12681:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5800, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "12699:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5798, - "name": "repayBorrow", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2521, - "src": "12669:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" - } - }, - "id": 5801, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12669:59:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5802, - "nodeType": "ExpressionStatement", - "src": "12669:59:25" - } - ] - }, - "documentation": null, - "id": 5804, - "implemented": true, - "kind": "function", - "modifiers": [], - "name": "clearDebtDust", - "nodeType": "FunctionDefinition", - "parameters": { - "id": 5660, - "nodeType": "ParameterList", - "parameters": [ - { - "constant": false, - "id": 5653, - "name": "addressRegistryAddress", - "nodeType": "VariableDeclaration", - "scope": 5804, - "src": "10026:30:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5652, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "10026:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5655, - "name": "oldCTokenAddress", - "nodeType": "VariableDeclaration", - "scope": 5804, - "src": "10066:24:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5654, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "10066:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5657, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "VariableDeclaration", - "scope": 5804, - "src": "10100:33:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 5656, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "10100:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5659, - "name": "newCTokenAddress", - "nodeType": "VariableDeclaration", - "scope": 5804, - "src": "10143:24:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5658, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "10143:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "src": "10016:157:25" - }, - "returnParameters": { - "id": 5661, - "nodeType": "ParameterList", - "parameters": [], - "src": "10189:0:25" - }, - "scope": 5896, - "src": "9994:2741:25", - "stateMutability": "payable", - "superFunction": null, - "visibility": "public" - }, - { - "body": { - "id": 5894, - "nodeType": "Block", - "src": "12938:1492:25", - "statements": [ - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "id": 5818, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 5816, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5808, - "src": "13292:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "BinaryOperation", - "operator": "!=", - "rightExpression": { - "argumentTypes": null, - "id": 5817, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5812, - "src": "13312:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "src": "13292:36:25", - "typeDescriptions": { - "typeIdentifier": "t_bool", - "typeString": "bool" - } - }, - { - "argumentTypes": null, - "hexValue": "636c6561722d636f6c6c61746572616c2d73616d652d61646472657373", - "id": 5819, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "string", - "lValueRequested": false, - "nodeType": "Literal", - "src": "13330:31:25", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_stringliteral_edcd146ca03620acad0398928a21180b949d6d0e47fbb0206aa2e50ad659e735", - "typeString": "literal_string \"clear-collateral-same-address\"" - }, - "value": "clear-collateral-same-address" - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_bool", - "typeString": "bool" - }, - { - "typeIdentifier": "t_stringliteral_edcd146ca03620acad0398928a21180b949d6d0e47fbb0206aa2e50ad659e735", - "typeString": "literal_string \"clear-collateral-same-address\"" - } - ], - "id": 5815, - "name": "require", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 7830, - 7831 - ], - "referencedDeclaration": 7831, - "src": "13284:7:25", - "typeDescriptions": { - "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", - "typeString": "function (bool,string memory) pure" - } - }, - "id": 5820, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13284:78:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5821, - "nodeType": "ExpressionStatement", - "src": "13284:78:25" - }, - { - "assignments": [ - 5823 - ], - "declarations": [ - { - "constant": false, - "id": 5823, - "name": "supplyAmount", - "nodeType": "VariableDeclaration", - "scope": 5894, - "src": "13373:17:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 5822, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "13373:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5824, - "initialValue": null, - "nodeType": "VariableDeclarationStatement", - "src": "13373:17:25" - }, - { - "assignments": [ - 5826 - ], - "declarations": [ - { - "constant": false, - "id": 5826, - "name": "addressRegistry", - "nodeType": "VariableDeclaration", - "scope": 5894, - "src": "13400:31:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - }, - "typeName": { - "contractScope": null, - "id": 5825, - "name": "AddressRegistry", - "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, - "src": "13400:15:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5830, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5828, - "name": "addressRegistryAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5806, - "src": "13450:22:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5827, - "name": "AddressRegistry", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7550, - "src": "13434:15:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", - "typeString": "type(contract AddressRegistry)" - } - }, - "id": 5829, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13434:39:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "13400:73:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5832, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5808, - "src": "13531:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5833, - "name": "oldTokenUnderlyingAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5810, - "src": "13549:24:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5831, - "name": "redeemUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2605, - "src": "13514:16:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" - } - }, - "id": 5834, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13514:60:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5835, - "nodeType": "ExpressionStatement", - "src": "13514:60:25" - }, - { - "condition": { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "id": 5840, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 5836, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5808, - "src": "13589:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "BinaryOperation", - "operator": "==", - "rightExpression": { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "id": 5837, - "name": "addressRegistry", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5826, - "src": "13609:15:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - } - }, - "id": 5838, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "CEtherAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "13609:29:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5839, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13609:31:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "src": "13589:51:25", - "typeDescriptions": { - "typeIdentifier": "t_bool", - "typeString": "bool" - } - }, - "falseBody": { - "condition": { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "id": 5857, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 5853, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5812, - "src": "13843:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "BinaryOperation", - "operator": "==", - "rightExpression": { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "id": 5854, - "name": "addressRegistry", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5826, - "src": "13863:15:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - } - }, - "id": 5855, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "CEtherAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "13863:29:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5856, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13863:31:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "src": "13843:51:25", - "typeDescriptions": { - "typeIdentifier": "t_bool", - "typeString": "bool" - } - }, - "falseBody": { - "id": 5886, - "nodeType": "Block", - "src": "14093:251:25", - "statements": [ - { - "expression": { - "argumentTypes": null, - "id": 5884, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5870, - "name": "supplyAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5823, - "src": "14137:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5873, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5808, - "src": "14191:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5872, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "14183:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5874, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "14183:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5875, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "14183:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5876, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "14183:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5878, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5812, - "src": "14247:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5877, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "14239:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5879, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "14239:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5880, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "14239:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5881, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "14239:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5882, - "name": "oldTokenUnderlyingAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5810, - "src": "14295:24:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5871, - "name": "_tokenToToken", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 5072, - 5093 - ], - "referencedDeclaration": 5093, - "src": "14152:13:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,address,uint256) returns (uint256)" - } - }, - "id": 5883, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "14152:181:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "14137:196:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5885, - "nodeType": "ExpressionStatement", - "src": "14137:196:25" - } - ] - }, - "id": 5887, - "nodeType": "IfStatement", - "src": "13839:505:25", - "trueBody": { - "id": 5869, - "nodeType": "Block", - "src": "13896:191:25", - "statements": [ - { - "expression": { - "argumentTypes": null, - "id": 5867, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5858, - "name": "supplyAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5823, - "src": "13938:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5861, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5808, - "src": "13990:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5860, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "13982:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5862, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13982:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5863, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "13982:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5864, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13982:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5865, - "name": "oldTokenUnderlyingAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5810, - "src": "14038:24:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5859, - "name": "_tokenToEth", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 5006, - 5045 - ], - "referencedDeclaration": 5006, - "src": "13953:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) returns (uint256)" - } - }, - "id": 5866, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13953:123:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "13938:138:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5868, - "nodeType": "ExpressionStatement", - "src": "13938:138:25" - } - ] - } - }, - "id": 5888, - "nodeType": "IfStatement", - "src": "13585:759:25", - "trueBody": { - "id": 5852, - "nodeType": "Block", - "src": "13642:191:25", - "statements": [ - { - "expression": { - "argumentTypes": null, - "id": 5850, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5841, - "name": "supplyAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5823, - "src": "13684:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5844, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5812, - "src": "13736:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5843, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "13728:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5845, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13728:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5846, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "13728:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5847, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13728:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5848, - "name": "oldTokenUnderlyingAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5810, - "src": "13784:24:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5842, - "name": "_ethToToken", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 4959, - 4988 - ], - "referencedDeclaration": 4959, - "src": "13699:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) returns (uint256)" - } - }, - "id": 5849, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13699:123:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "13684:138:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5851, - "nodeType": "ExpressionStatement", - "src": "13684:138:25" - } - ] - } - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5890, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5812, - "src": "14392:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5891, - "name": "supplyAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5823, - "src": "14410:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5889, - "name": "supply", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2423, - "src": "14385:6:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" - } - }, - "id": 5892, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "14385:38:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5893, - "nodeType": "ExpressionStatement", - "src": "14385:38:25" - } - ] - }, - "documentation": null, - "id": 5895, - "implemented": true, - "kind": "function", - "modifiers": [], - "name": "clearCollateralDust", - "nodeType": "FunctionDefinition", - "parameters": { - "id": 5813, - "nodeType": "ParameterList", - "parameters": [ - { - "constant": false, - "id": 5806, - "name": "addressRegistryAddress", - "nodeType": "VariableDeclaration", - "scope": 5895, - "src": "12779:30:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5805, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "12779:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5808, - "name": "oldCTokenAddress", - "nodeType": "VariableDeclaration", - "scope": 5895, - "src": "12819:24:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5807, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "12819:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5810, - "name": "oldTokenUnderlyingAmount", - "nodeType": "VariableDeclaration", - "scope": 5895, - "src": "12853:29:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 5809, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "12853:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5812, - "name": "newCTokenAddress", - "nodeType": "VariableDeclaration", - "scope": 5895, - "src": "12892:24:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5811, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "12892:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "src": "12769:153:25" - }, - "returnParameters": { - "id": 5814, - "nodeType": "ParameterList", - "parameters": [], - "src": "12938:0:25" - }, - "scope": 5896, - "src": "12741:1689:25", - "stateMutability": "payable", - "superFunction": null, - "visibility": "public" - } - ], - "scope": 5897, - "src": "773:13659:25" - } - ], - "src": "45:14388:25" - }, - "legacyAST": { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeCompoundManager.sol", - "exportedSymbols": { - "DedgeCompoundManager": [ - 5896 - ] - }, - "id": 5897, - "nodeType": "SourceUnit", - "nodes": [ - { - "id": 5196, - "literals": [ - "solidity", - "0.5", - ".16" - ], - "nodeType": "PragmaDirective", - "src": "45:23:25" - }, - { - "id": 5197, - "literals": [ - "experimental", - "ABIEncoderV2" - ], - "nodeType": "PragmaDirective", - "src": "69:33:25" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/compound/CompoundBase.sol", - "file": "../lib/compound/CompoundBase.sol", - "id": 5198, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 2786, - "src": "105:42:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", - "file": "../lib/dapphub/Guard.sol", - "id": 5199, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 3196, - "src": "149:34:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapLiteBase.sol", - "file": "../lib/uniswap/UniswapLiteBase.sol", - "id": 5200, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 5195, - "src": "185:44:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol", - "file": "../interfaces/aave/ILendingPoolAddressesProvider.sol", - "id": 5201, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 660, - "src": "231:62:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol", - "file": "../interfaces/aave/ILendingPool.sol", - "id": 5202, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 547, - "src": "294:45:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolParametersProvider.sol", - "file": "../interfaces/aave/ILendingPoolParametersProvider.sol", - "id": 5203, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 670, - "src": "340:63:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICompoundPriceOracle.sol", - "file": "../interfaces/compound/ICompoundPriceOracle.sol", - "id": 5204, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 869, - "src": "405:57:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", - "file": "../interfaces/compound/IComptroller.sol", - "id": 5205, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 1097, - "src": "463:49:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol", - "file": "../interfaces/compound/ICEther.sol", - "id": 5206, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 733, - "src": "513:44:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol", - "file": "../interfaces/compound/ICToken.sol", - "id": 5207, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 859, - "src": "558:44:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", - "file": "../interfaces/IERC20.sol", - "id": 5208, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 121, - "src": "604:34:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol", - "file": "../registries/AddressRegistry.sol", - "id": 5209, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 7551, - "src": "640:43:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol", - "file": "../proxies/DACProxy.sol", - "id": 5210, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 7245, - "src": "685:33:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "absolutePath": "@openzeppelin/contracts/math/SafeMath.sol", - "file": "@openzeppelin/contracts/math/SafeMath.sol", - "id": 5211, - "nodeType": "ImportDirective", - "scope": 5897, - "sourceUnit": 7738, - "src": "720:51:25", - "symbolAliases": [], - "unitAlias": "" - }, - { - "baseContracts": [ - { - "arguments": null, - "baseName": { - "contractScope": null, - "id": 5212, - "name": "UniswapLiteBase", - "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5194, - "src": "806:15:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_UniswapLiteBase_$5194", - "typeString": "contract UniswapLiteBase" - } - }, - "id": 5213, - "nodeType": "InheritanceSpecifier", - "src": "806:15:25" - }, - { - "arguments": null, - "baseName": { - "contractScope": null, - "id": 5214, - "name": "CompoundBase", - "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 2785, - "src": "823:12:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_CompoundBase_$2785", - "typeString": "contract CompoundBase" - } - }, - "id": 5215, - "nodeType": "InheritanceSpecifier", - "src": "823:12:25" - } - ], - "contractDependencies": [ - 2785, - 5194 - ], - "contractKind": "contract", - "documentation": null, - "fullyImplemented": true, - "id": 5896, - "linearizedBaseContracts": [ - 5896, - 2785, - 5194 - ], - "name": "DedgeCompoundManager", - "nodeType": "ContractDefinition", - "nodes": [ - { - "id": 5218, - "libraryName": { - "contractScope": null, - "id": 5216, - "name": "SafeMath", - "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7737, - "src": "848:8:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$7737", - "typeString": "library SafeMath" - } - }, - "nodeType": "UsingForDirective", - "src": "842:24:25", - "typeName": { - "id": 5217, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "861:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - }, - { - "canonicalName": "DedgeCompoundManager.SwapOperationCalldata", - "id": 5225, - "members": [ - { - "constant": false, - "id": 5220, - "name": "addressRegistryAddress", - "nodeType": "VariableDeclaration", - "scope": 5225, - "src": "911:30:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5219, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "911:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5222, - "name": "oldCTokenAddress", - "nodeType": "VariableDeclaration", - "scope": 5225, - "src": "951:24:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5221, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "951:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5224, - "name": "newCTokenAddress", - "nodeType": "VariableDeclaration", - "scope": 5225, - "src": "985:24:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5223, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "985:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "name": "SwapOperationCalldata", - "nodeType": "StructDefinition", - "scope": 5896, - "src": "872:144:25", - "visibility": "public" - }, - { - "body": { - "id": 5265, - "nodeType": "Block", - "src": "1101:214:25", - "statements": [ - { - "assignments": [ - 5233 - ], - "declarations": [ - { - "constant": false, - "id": 5233, - "name": "g", - "nodeType": "VariableDeclaration", - "scope": 5265, - "src": "1111:9:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5232, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "1111:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5241, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5236, - "name": "proxyAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5227, - "src": "1140:12:25", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - } - ], - "id": 5235, - "name": "DACProxy", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7244, - "src": "1131:8:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", - "typeString": "type(contract DACProxy)" - } - }, - "id": 5237, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1131:22:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", - "typeString": "contract DACProxy" - } - }, - "id": 5238, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "authority", - "nodeType": "MemberAccess", - "referencedDeclaration": 2812, - "src": "1131:32:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2799_$", - "typeString": "function () view external returns (contract DSAuthority)" - } - }, - "id": 5239, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1131:34:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", - "typeString": "contract DSAuthority" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_contract$_DSAuthority_$2799", - "typeString": "contract DSAuthority" - } - ], - "id": 5234, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "1123:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_address_$", - "typeString": "type(address)" - }, - "typeName": "address" - }, - "id": 5240, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1123:43:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "1111:55:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5249, - "name": "src", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5229, - "src": "1232:3:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5248, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "1224:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_address_$", - "typeString": "type(address)" - }, - "typeName": "address" - }, - "id": 5250, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1224:12:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5247, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "1216:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_bytes20_$", - "typeString": "type(bytes20)" - }, - "typeName": "bytes20" - }, - "id": 5251, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1216:21:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes20", - "typeString": "bytes20" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_bytes20", - "typeString": "bytes20" - } - ], - "id": 5246, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "1208:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_bytes32_$", - "typeString": "type(bytes32)" - }, - "typeName": "bytes32" - }, - "id": 5252, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1208:30:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes32", - "typeString": "bytes32" - } - }, - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5254, - "name": "g", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5233, - "src": "1260:1:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5253, - "name": "DSGuard", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3163, - "src": "1252:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", - "typeString": "type(contract DSGuard)" - } - }, - "id": 5255, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1252:10:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", - "typeString": "contract DSGuard" - } - }, - "id": 5256, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "ANY", - "nodeType": "MemberAccess", - "referencedDeclaration": 2958, - "src": "1252:14:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", - "typeString": "function () view external returns (bytes32)" - } - }, - "id": 5257, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1252:16:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes32", - "typeString": "bytes32" - } - }, - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5259, - "name": "g", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5233, - "src": "1290:1:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5258, - "name": "DSGuard", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3163, - "src": "1282:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", - "typeString": "type(contract DSGuard)" - } - }, - "id": 5260, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1282:10:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", - "typeString": "contract DSGuard" - } - }, - "id": 5261, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "ANY", - "nodeType": "MemberAccess", - "referencedDeclaration": 2958, - "src": "1282:14:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", - "typeString": "function () view external returns (bytes32)" - } - }, - "id": 5262, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1282:16:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes32", - "typeString": "bytes32" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_bytes32", - "typeString": "bytes32" - }, - { - "typeIdentifier": "t_bytes32", - "typeString": "bytes32" - }, - { - "typeIdentifier": "t_bytes32", - "typeString": "bytes32" - } - ], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5243, - "name": "g", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5233, - "src": "1185:1:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5242, - "name": "DSGuard", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3163, - "src": "1177:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", - "typeString": "type(contract DSGuard)" - } - }, - "id": 5244, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1177:10:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", - "typeString": "contract DSGuard" - } - }, - "id": 5245, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "permit", - "nodeType": "MemberAccess", - "referencedDeclaration": 3086, - "src": "1177:17:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", - "typeString": "function (bytes32,bytes32,bytes32) external" - } - }, - "id": 5263, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1177:131:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5264, - "nodeType": "ExpressionStatement", - "src": "1177:131:25" - } - ] - }, - "documentation": null, - "id": 5266, - "implemented": true, - "kind": "function", - "modifiers": [], - "name": "_proxyGuardPermit", - "nodeType": "FunctionDefinition", - "parameters": { - "id": 5230, - "nodeType": "ParameterList", - "parameters": [ - { - "constant": false, - "id": 5227, - "name": "proxyAddress", - "nodeType": "VariableDeclaration", - "scope": 5266, - "src": "1049:28:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - }, - "typeName": { - "id": 5226, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "1049:15:25", - "stateMutability": "payable", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5229, - "name": "src", - "nodeType": "VariableDeclaration", - "scope": 5266, - "src": "1079:11:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5228, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "1079:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "src": "1048:43:25" - }, - "returnParameters": { - "id": 5231, - "nodeType": "ParameterList", - "parameters": [], - "src": "1101:0:25" - }, - "scope": 5896, - "src": "1022:293:25", - "stateMutability": "nonpayable", - "superFunction": null, - "visibility": "internal" - }, - { - "body": { - "id": 5306, - "nodeType": "Block", - "src": "1400:214:25", - "statements": [ - { - "assignments": [ - 5274 - ], - "declarations": [ - { - "constant": false, - "id": 5274, - "name": "g", - "nodeType": "VariableDeclaration", - "scope": 5306, - "src": "1410:9:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5273, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "1410:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5282, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5277, - "name": "proxyAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5268, - "src": "1439:12:25", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - } - ], - "id": 5276, - "name": "DACProxy", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7244, - "src": "1430:8:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", - "typeString": "type(contract DACProxy)" - } - }, - "id": 5278, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1430:22:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", - "typeString": "contract DACProxy" - } - }, - "id": 5279, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "authority", - "nodeType": "MemberAccess", - "referencedDeclaration": 2812, - "src": "1430:32:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2799_$", - "typeString": "function () view external returns (contract DSAuthority)" - } - }, - "id": 5280, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1430:34:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", - "typeString": "contract DSAuthority" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_contract$_DSAuthority_$2799", - "typeString": "contract DSAuthority" - } - ], - "id": 5275, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "1422:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_address_$", - "typeString": "type(address)" - }, - "typeName": "address" - }, - "id": 5281, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1422:43:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "1410:55:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5290, - "name": "src", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5270, - "src": "1531:3:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5289, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "1523:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_address_$", - "typeString": "type(address)" - }, - "typeName": "address" - }, - "id": 5291, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1523:12:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5288, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "1515:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_bytes20_$", - "typeString": "type(bytes20)" - }, - "typeName": "bytes20" - }, - "id": 5292, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1515:21:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes20", - "typeString": "bytes20" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_bytes20", - "typeString": "bytes20" - } - ], - "id": 5287, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "1507:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_bytes32_$", - "typeString": "type(bytes32)" - }, - "typeName": "bytes32" - }, - "id": 5293, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1507:30:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes32", - "typeString": "bytes32" - } - }, - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5295, - "name": "g", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5274, - "src": "1559:1:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5294, - "name": "DSGuard", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3163, - "src": "1551:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", - "typeString": "type(contract DSGuard)" - } - }, - "id": 5296, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1551:10:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", - "typeString": "contract DSGuard" - } - }, - "id": 5297, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "ANY", - "nodeType": "MemberAccess", - "referencedDeclaration": 2958, - "src": "1551:14:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", - "typeString": "function () view external returns (bytes32)" - } - }, - "id": 5298, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1551:16:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes32", - "typeString": "bytes32" - } - }, - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5300, - "name": "g", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5274, - "src": "1589:1:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5299, - "name": "DSGuard", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3163, - "src": "1581:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", - "typeString": "type(contract DSGuard)" - } - }, - "id": 5301, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1581:10:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", - "typeString": "contract DSGuard" - } - }, - "id": 5302, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "ANY", - "nodeType": "MemberAccess", - "referencedDeclaration": 2958, - "src": "1581:14:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", - "typeString": "function () view external returns (bytes32)" - } - }, - "id": 5303, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1581:16:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes32", - "typeString": "bytes32" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_bytes32", - "typeString": "bytes32" - }, - { - "typeIdentifier": "t_bytes32", - "typeString": "bytes32" - }, - { - "typeIdentifier": "t_bytes32", - "typeString": "bytes32" - } - ], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5284, - "name": "g", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5274, - "src": "1484:1:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5283, - "name": "DSGuard", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 3163, - "src": "1476:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", - "typeString": "type(contract DSGuard)" - } - }, - "id": 5285, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1476:10:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", - "typeString": "contract DSGuard" - } - }, - "id": 5286, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "forbid", - "nodeType": "MemberAccess", - "referencedDeclaration": 3114, - "src": "1476:17:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", - "typeString": "function (bytes32,bytes32,bytes32) external" - } - }, - "id": 5304, "isConstant": false, "isLValue": false, "isPure": false, @@ -12007,488 +8286,169 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1476:131:25", + "src": "12208:38:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5305, + "id": 5797, "nodeType": "ExpressionStatement", - "src": "1476:131:25" + "src": "12208:38:25" } ] }, "documentation": null, - "id": 5307, + "id": 5799, "implemented": true, "kind": "function", "modifiers": [], - "name": "_proxyGuardForbid", + "name": "_clearCollateralDust", "nodeType": "FunctionDefinition", "parameters": { - "id": 5271, + "id": 5717, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5268, - "name": "proxyAddress", - "nodeType": "VariableDeclaration", - "scope": 5307, - "src": "1348:28:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - }, - "typeName": { - "id": 5267, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "1348:15:25", - "stateMutability": "payable", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5270, - "name": "src", + "id": 5710, + "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 5307, - "src": "1378:11:25", + "scope": 5799, + "src": "10546:30:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" }, - "typeName": { - "id": 5269, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "1378:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "src": "1347:43:25" - }, - "returnParameters": { - "id": 5272, - "nodeType": "ParameterList", - "parameters": [], - "src": "1400:0:25" - }, - "scope": 5896, - "src": "1321:293:25", - "stateMutability": "nonpayable", - "superFunction": null, - "visibility": "internal" - }, - { - "body": { - "id": 5434, - "nodeType": "Block", - "src": "1767:2538:25", - "statements": [ - { - "assignments": [ - 5319 - ], - "declarations": [ - { - "constant": false, - "id": 5319, - "name": "soCalldata", - "nodeType": "VariableDeclaration", - "scope": 5434, - "src": "1777:39:25", - "stateVariable": false, - "storageLocation": "memory", - "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", - "typeString": "struct DedgeCompoundManager.SwapOperationCalldata" - }, - "typeName": { - "contractScope": null, - "id": 5318, - "name": "SwapOperationCalldata", - "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5225, - "src": "1777:21:25", - "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_storage_ptr", - "typeString": "struct DedgeCompoundManager.SwapOperationCalldata" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5326, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5322, - "name": "_data", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5315, - "src": "1830:5:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes_calldata_ptr", - "typeString": "bytes calldata" - } - }, - { - "argumentTypes": null, - "components": [ - { - "argumentTypes": null, - "id": 5323, - "name": "SwapOperationCalldata", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5225, - "src": "1838:21:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5225_storage_ptr_$", - "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" - } - } - ], - "id": 5324, - "isConstant": false, - "isInlineArray": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "1837:23:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5225_storage_ptr_$", - "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_bytes_calldata_ptr", - "typeString": "bytes calldata" - }, - { - "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5225_storage_ptr_$", - "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" - } - ], - "expression": { - "argumentTypes": null, - "id": 5320, - "name": "abi", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7814, - "src": "1819:3:25", - "typeDescriptions": { - "typeIdentifier": "t_magic_abi", - "typeString": "abi" - } - }, - "id": 5321, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "memberName": "decode", - "nodeType": "MemberAccess", - "referencedDeclaration": null, - "src": "1819:10:25", - "typeDescriptions": { - "typeIdentifier": "t_function_abidecode_pure$__$returns$__$", - "typeString": "function () pure" - } - }, - "id": 5325, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1819:42:25", - "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory", - "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "1777:84:25" - }, - { - "assignments": [ - 5328 - ], - "declarations": [ - { - "constant": false, - "id": 5328, - "name": "addressRegistry", - "nodeType": "VariableDeclaration", - "scope": 5434, - "src": "1872:31:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - }, - "typeName": { - "contractScope": null, - "id": 5327, - "name": "AddressRegistry", - "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, - "src": "1872:15:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5333, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "expression": { - "argumentTypes": null, - "id": 5330, - "name": "soCalldata", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5319, - "src": "1922:10:25", - "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", - "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" - } - }, - "id": 5331, - "isConstant": false, - "isLValue": true, - "isPure": false, - "lValueRequested": false, - "memberName": "addressRegistryAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 5220, - "src": "1922:33:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5329, - "name": "AddressRegistry", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7550, - "src": "1906:15:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", - "typeString": "type(contract AddressRegistry)" - } - }, - "id": 5332, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "1906:50:25", + "typeName": { + "id": 5709, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "10546:7:25", + "stateMutability": "nonpayable", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" + "typeIdentifier": "t_address", + "typeString": "address" } }, - "nodeType": "VariableDeclarationStatement", - "src": "1872:84:25" + "value": null, + "visibility": "internal" }, { - "assignments": [ - 5335 - ], - "declarations": [ - { - "constant": false, - "id": 5335, - "name": "oldCTokenAddress", - "nodeType": "VariableDeclaration", - "scope": 5434, - "src": "1967:24:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5334, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "1967:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5338, - "initialValue": { - "argumentTypes": null, - "expression": { - "argumentTypes": null, - "id": 5336, - "name": "soCalldata", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5319, - "src": "1994:10:25", - "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", - "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" - } - }, - "id": 5337, - "isConstant": false, - "isLValue": true, - "isPure": false, - "lValueRequested": false, - "memberName": "oldCTokenAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 5222, - "src": "1994:27:25", + "constant": false, + "id": 5712, + "name": "oldCTokenAddress", + "nodeType": "VariableDeclaration", + "scope": 5799, + "src": "10586:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5711, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "10586:7:25", + "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "nodeType": "VariableDeclarationStatement", - "src": "1967:54:25" + "value": null, + "visibility": "internal" }, { - "assignments": [ - 5340 - ], - "declarations": [ - { - "constant": false, - "id": 5340, - "name": "newCTokenAddress", - "nodeType": "VariableDeclaration", - "scope": 5434, - "src": "2031:24:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5339, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "2031:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" + "constant": false, + "id": 5714, + "name": "oldTokenUnderlyingAmount", + "nodeType": "VariableDeclaration", + "scope": 5799, + "src": "10620:32:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5713, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "10620:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - ], - "id": 5343, - "initialValue": { - "argumentTypes": null, - "expression": { - "argumentTypes": null, - "id": 5341, - "name": "soCalldata", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5319, - "src": "2058:10:25", - "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", - "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" - } - }, - "id": 5342, - "isConstant": false, - "isLValue": true, - "isPure": false, - "lValueRequested": false, - "memberName": "newCTokenAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 5224, - "src": "2058:27:25", + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5716, + "name": "newCTokenAddress", + "nodeType": "VariableDeclaration", + "scope": 5799, + "src": "10662:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5715, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "10662:7:25", + "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "nodeType": "VariableDeclarationStatement", - "src": "2031:54:25" - }, + "value": null, + "visibility": "internal" + } + ], + "src": "10536:156:25" + }, + "returnParameters": { + "id": 5718, + "nodeType": "ParameterList", + "parameters": [], + "src": "10702:0:25" + }, + "scope": 5887, + "src": "10507:1746:25", + "stateMutability": "nonpayable", + "superFunction": null, + "visibility": "internal" + }, + { + "body": { + "id": 5885, + "nodeType": "Block", + "src": "13024:1924:25", + "statements": [ { "assignments": [ - 5345 + 5817 ], "declarations": [ { "constant": false, - "id": 5345, - "name": "debtAmount", + "id": 5817, + "name": "initialBorrowBalanceUnderlying", "nodeType": "VariableDeclaration", - "scope": 5434, - "src": "2096:15:25", + "scope": 5885, + "src": "13034:38:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -12496,10 +8456,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5344, - "name": "uint", + "id": 5816, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2096:4:25", + "src": "13034:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -12509,111 +8469,60 @@ "visibility": "internal" } ], - "id": 5353, + "id": 5822, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5351, - "name": "_protocolFee", + "id": 5819, + "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5313, - "src": "2144:12:25", + "referencedDeclaration": 5807, + "src": "13115:16:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5820, + "name": "dacProxyAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5803, + "src": "13145:15:25", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" } } ], "expression": { "argumentTypes": [ { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5348, - "name": "_aaveFee", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5311, - "src": "2130:8:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "expression": { - "argumentTypes": null, - "id": 5346, - "name": "_loanAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5309, - "src": "2114:11:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5347, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "add", - "nodeType": "MemberAccess", - "referencedDeclaration": 7577, - "src": "2114:15:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", - "typeString": "function (uint256,uint256) pure returns (uint256)" - } + "typeIdentifier": "t_address", + "typeString": "address" }, - "id": 5349, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "2114:25:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" } - }, - "id": 5350, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "add", - "nodeType": "MemberAccess", - "referencedDeclaration": 7577, - "src": "2114:29:25", + ], + "id": 5818, + "name": "getBorrowBalanceUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2238, + "src": "13075:26:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", - "typeString": "function (uint256,uint256) pure returns (uint256)" + "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$returns$_t_uint256_$", + "typeString": "function (address,address) view returns (uint256)" } }, - "id": 5352, + "id": 5821, "isConstant": false, "isLValue": false, "isPure": false, @@ -12621,989 +8530,757 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2114:43:25", + "src": "13075:95:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "2096:61:25" + "src": "13034:136:25" }, { - "condition": { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "id": 5358, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 5354, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5335, - "src": "2651:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "BinaryOperation", - "operator": "==", - "rightExpression": { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "id": 5355, - "name": "addressRegistry", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5328, - "src": "2671:15:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - } - }, - "id": 5356, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "CEtherAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "2671:29:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5357, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "2671:31:25", + "assignments": [ + 5824 + ], + "declarations": [ + { + "constant": false, + "id": 5824, + "name": "oldTokenUnderlyingDeltaFixed", + "nodeType": "VariableDeclaration", + "scope": 5885, + "src": "13375:36:25", + "stateVariable": false, + "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "src": "2651:51:25", - "typeDescriptions": { - "typeIdentifier": "t_bool", - "typeString": "bool" - } - }, - "falseBody": { - "id": 5393, - "nodeType": "Block", - "src": "2777:543:25", - "statements": [ - { - "assignments": [ - 5366 - ], - "declarations": [ - { - "constant": false, - "id": 5366, - "name": "oldTokenUnderlying", - "nodeType": "VariableDeclaration", - "scope": 5393, - "src": "2843:26:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5365, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "2843:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5372, - "initialValue": { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5368, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5335, - "src": "2880:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5367, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "2872:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5369, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "2872:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5370, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "2872:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5371, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "2872:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "2843:67:25" - }, - { - "assignments": [ - 5374 - ], - "declarations": [ - { - "constant": false, - "id": 5374, - "name": "oldTokenUnderlyingAmount", - "nodeType": "VariableDeclaration", - "scope": 5393, - "src": "2925:29:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 5373, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "2925:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5379, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5376, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5366, - "src": "2986:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5377, - "name": "_loanAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5309, - "src": "3022:11:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5375, - "name": "_ethToToken", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 4959, - 4988 - ], - "referencedDeclaration": 4959, - "src": "2957:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) returns (uint256)" - } - }, - "id": 5378, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "2957:90:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "2925:122:25" + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5823, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "13375:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5826, + "initialValue": { + "argumentTypes": null, + "id": 5825, + "name": "oldTokenUnderlyingDelta", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5809, + "src": "13414:23:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "13375:62:25" + }, + { + "assignments": [ + 5828 + ], + "declarations": [ + { + "constant": false, + "id": 5828, + "name": "oldTokenUnderlyingDeltaThreshold", + "nodeType": "VariableDeclaration", + "scope": 5885, + "src": "13447:40:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5827, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "13447:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } }, + "value": null, + "visibility": "internal" + } + ], + "id": 5836, + "initialValue": { + "argumentTypes": null, + "arguments": [ { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5384, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5335, - "src": "3167:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5385, - "name": "oldTokenUnderlyingAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5374, - "src": "3185:24:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5381, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5366, - "src": "3122:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5380, - "name": "IERC20", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 120, - "src": "3115:6:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IERC20_$120_$", - "typeString": "type(contract IERC20)" - } - }, - "id": 5382, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "3115:26:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_IERC20_$120", - "typeString": "contract IERC20" - } - }, - "id": 5383, + "argumentTypes": null, + "hexValue": "313030", + "id": 5834, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "13533:3:25", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + }, + "value": "100" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "3935", + "id": 5831, "isConstant": false, "isLValue": false, - "isPure": false, + "isPure": true, + "kind": "number", "lValueRequested": false, - "memberName": "approve", - "nodeType": "MemberAccess", - "referencedDeclaration": 77, - "src": "3115:51:25", + "nodeType": "Literal", + "src": "13525:2:25", + "subdenomination": null, "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", - "typeString": "function (address,uint256) external returns (bool)" - } - }, - "id": 5386, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "3115:95:25", - "typeDescriptions": { - "typeIdentifier": "t_bool", - "typeString": "bool" - } - }, - "id": 5387, - "nodeType": "ExpressionStatement", - "src": "3115:95:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5389, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5335, - "src": "3266:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } + "typeIdentifier": "t_rational_95_by_1", + "typeString": "int_const 95" }, - { - "argumentTypes": null, - "id": 5390, - "name": "oldTokenUnderlyingAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5374, - "src": "3284:24:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5388, - "name": "repayBorrow", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2521, - "src": "3254:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" - } - }, - "id": 5391, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "3254:55:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" + "value": "95" } - }, - "id": 5392, - "nodeType": "ExpressionStatement", - "src": "3254:55:25" - } - ] - }, - "id": 5394, - "nodeType": "IfStatement", - "src": "2647:673:25", - "trueBody": { - "id": 5364, - "nodeType": "Block", - "src": "2704:67:25", - "statements": [ - { + ], "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5360, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5335, - "src": "2730:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, + "argumentTypes": [ { - "argumentTypes": null, - "id": 5361, - "name": "_loanAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5309, - "src": "2748:11:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } + "typeIdentifier": "t_rational_95_by_1", + "typeString": "int_const 95" } ], "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5359, - "name": "repayBorrow", + "argumentTypes": null, + "id": 5829, + "name": "initialBorrowBalanceUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2521, - "src": "2718:11:25", + "referencedDeclaration": 5817, + "src": "13490:30:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 5362, + "id": 5830, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "2718:42:25", + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 7645, + "src": "13490:34:25", "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 5363, - "nodeType": "ExpressionStatement", - "src": "2718:42:25" + "id": 5832, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "13490:38:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5833, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "div", + "nodeType": "MemberAccess", + "referencedDeclaration": 7661, + "src": "13490:42:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } - ] - } + }, + "id": 5835, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "13490:47:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "13447:90:25" }, { "condition": { "argumentTypes": null, "commonType": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" }, - "id": 5399, + "id": 5839, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5395, - "name": "newCTokenAddress", + "id": 5837, + "name": "oldTokenUnderlyingDelta", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5340, - "src": "3464:16:25", + "referencedDeclaration": 5809, + "src": "13560:23:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, "nodeType": "BinaryOperation", - "operator": "==", + "operator": ">", "rightExpression": { "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "id": 5396, - "name": "addressRegistry", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5328, - "src": "3484:15:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - } - }, - "id": 5397, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "CEtherAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "3484:29:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5398, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "3484:31:25", + "id": 5838, + "name": "oldTokenUnderlyingDeltaThreshold", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5828, + "src": "13586:32:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "src": "3464:51:25", + "src": "13560:58:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "falseBody": { - "id": 5432, + "falseBody": null, + "id": 5845, + "nodeType": "IfStatement", + "src": "13556:152:25", + "trueBody": { + "id": 5844, "nodeType": "Block", - "src": "3584:715:25", + "src": "13620:88:25", "statements": [ { - "assignments": [ - 5407 - ], - "declarations": [ - { - "constant": false, - "id": 5407, - "name": "newTokenUnderlying", - "nodeType": "VariableDeclaration", - "scope": 5432, - "src": "3639:26:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5406, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "3639:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5413, - "initialValue": { + "expression": { "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5409, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5340, - "src": "3676:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5408, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "3668:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5410, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "3668:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5411, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "3668:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5412, + "id": 5842, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "3668:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "3639:67:25" - }, - { - "assignments": [ - 5415 - ], - "declarations": [ - { - "constant": false, - "id": 5415, - "name": "newTokenUnderlyingAmount", - "nodeType": "VariableDeclaration", - "scope": 5432, - "src": "3834:29:25", - "stateVariable": false, - "storageLocation": "default", + "leftHandSide": { + "argumentTypes": null, + "id": 5840, + "name": "oldTokenUnderlyingDeltaFixed", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5824, + "src": "13634:28:25", "typeDescriptions": { "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 5414, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "3834:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5420, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5417, - "name": "newTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5407, - "src": "3904:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5418, - "name": "debtAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5345, - "src": "3940:10:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } + "typeString": "uint256" } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5416, - "name": "_getTokenToEthOutput", + }, + "nodeType": "Assignment", + "operator": "=", + "rightHandSide": { + "argumentTypes": null, + "id": 5841, + "name": "oldTokenUnderlyingDeltaThreshold", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5150, - "src": "3866:20:25", + "referencedDeclaration": 5828, + "src": "13665:32:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) view returns (uint256)" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 5419, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "3866:98:25", + "src": "13634:63:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "nodeType": "VariableDeclarationStatement", - "src": "3834:130:25" + "id": 5843, + "nodeType": "ExpressionStatement", + "src": "13634:63:25" + } + ] + } + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5847, + "name": "dedgeCompoundManagerAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5801, + "src": "13783:27:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5848, + "name": "dacProxyAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5803, + "src": "13824:15:25", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + }, + { + "argumentTypes": null, + "id": 5849, + "name": "addressRegistryAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5805, + "src": "13853:22:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5850, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5807, + "src": "13889:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5851, + "name": "oldTokenUnderlyingDeltaFixed", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5824, + "src": "13919:28:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + { + "argumentTypes": null, + "id": 5852, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5811, + "src": "13961:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5853, + "name": "executeOperationCalldataParams", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5813, + "src": "13991:30:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + ], + "id": 5846, + "name": "swapOperation", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5708, + "src": "13756:13:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_payable_$_t_address_$_t_address_$_t_uint256_$_t_address_$_t_bytes_memory_ptr_$returns$__$", + "typeString": "function (address,address payable,address,address,uint256,address,bytes memory)" + } + }, + "id": 5854, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "13756:275:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5855, + "nodeType": "ExpressionStatement", + "src": "13756:275:25" + }, + { + "assignments": [ + 5857 + ], + "declarations": [ + { + "constant": false, + "id": 5857, + "name": "postSwapBorrowBalanceUnderlying", + "nodeType": "VariableDeclaration", + "scope": 5885, + "src": "14092:39:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5856, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "14092:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5862, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5859, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5807, + "src": "14174:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5860, + "name": "dacProxyAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5803, + "src": "14204:15:25", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + ], + "id": 5858, + "name": "getBorrowBalanceUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2238, + "src": "14134:26:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$returns$_t_uint256_$", + "typeString": "function (address,address) view returns (uint256)" + } + }, + "id": 5861, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "14134:95:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "14092:137:25" + }, + { + "assignments": [ + 5864 + ], + "declarations": [ + { + "constant": false, + "id": 5864, + "name": "oldTokenSwappedDelta", + "nodeType": "VariableDeclaration", + "scope": 5885, + "src": "14273:28:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5863, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "14273:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } }, + "value": null, + "visibility": "internal" + } + ], + "id": 5869, + "initialValue": { + "argumentTypes": null, + "arguments": [ { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5422, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5340, - "src": "4018:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5423, - "name": "newTokenUnderlyingAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5415, - "src": "4036:24:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5421, - "name": "borrow", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "4011:6:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" - } - }, - "id": 5424, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "4011:50:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5425, - "nodeType": "ExpressionStatement", - "src": "4011:50:25" + "argumentTypes": null, + "id": 5867, + "name": "postSwapBorrowBalanceUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5857, + "src": "14352:31:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "id": 5865, + "name": "initialBorrowBalanceUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5817, + "src": "14304:30:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } }, + "id": 5866, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 7584, + "src": "14304:34:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 5868, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "14304:89:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "14273:120:25" + }, + { + "condition": { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "id": 5872, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "id": 5870, + "name": "oldTokenSwappedDelta", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5864, + "src": "14660:20:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "BinaryOperation", + "operator": "<", + "rightExpression": { + "argumentTypes": null, + "id": 5871, + "name": "oldTokenUnderlyingDelta", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5809, + "src": "14683:23:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "src": "14660:46:25", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + "falseBody": null, + "id": 5884, + "nodeType": "IfStatement", + "src": "14656:286:25", + "trueBody": { + "id": 5883, + "nodeType": "Block", + "src": "14708:234:25", + "statements": [ { "expression": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5427, - "name": "newTokenUnderlying", + "id": 5874, + "name": "addressRegistryAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5407, - "src": "4231:18:25", + "referencedDeclaration": 5805, + "src": "14760:22:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -13611,121 +9288,102 @@ }, { "argumentTypes": null, - "id": 5428, - "name": "newTokenUnderlyingAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5415, - "src": "4251:24:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - { - "argumentTypes": null, - "id": 5429, - "name": "debtAmount", + "id": 5875, + "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5345, - "src": "4277:10:25", + "referencedDeclaration": 5807, + "src": "14800:16:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { "typeIdentifier": "t_address", "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" } - ], - "id": 5426, - "name": "_tokenToEth", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 5006, - 5045 - ], - "referencedDeclaration": 5045, - "src": "4219:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256,uint256) returns (uint256)" - } - }, - "id": 5430, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "4219:69:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5431, - "nodeType": "ExpressionStatement", - "src": "4219:69:25" - } - ] - }, - "id": 5433, - "nodeType": "IfStatement", - "src": "3460:839:25", - "trueBody": { - "id": 5405, - "nodeType": "Block", - "src": "3517:61:25", - "statements": [ - { - "expression": { - "argumentTypes": null, - "arguments": [ + }, { "argumentTypes": null, - "id": 5401, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5340, - "src": "3538:16:25", + "arguments": [ + { + "argumentTypes": null, + "id": 5878, + "name": "oldTokenSwappedDelta", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5864, + "src": "14862:20:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "id": 5876, + "name": "oldTokenUnderlyingDelta", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5809, + "src": "14834:23:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5877, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 7584, + "src": "14834:27:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 5879, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "14834:49:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, { "argumentTypes": null, - "id": 5402, - "name": "debtAmount", + "id": 5880, + "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5345, - "src": "3556:10:25", + "referencedDeclaration": 5811, + "src": "14901:16:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } } ], "expression": { "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, { "typeIdentifier": "t_address", "typeString": "address" @@ -13733,20 +9391,24 @@ { "typeIdentifier": "t_uint256", "typeString": "uint256" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" } ], - "id": 5400, - "name": "borrow", + "id": 5873, + "name": "_clearCollateralDust", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "3531:6:25", + "referencedDeclaration": 5799, + "src": "14722:20:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$_t_address_$returns$__$", + "typeString": "function (address,address,uint256,address)" } }, - "id": 5403, + "id": 5881, "isConstant": false, "isLValue": false, "isPure": false, @@ -13754,15 +9416,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3531:36:25", + "src": "14722:209:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5404, + "id": 5882, "nodeType": "ExpressionStatement", - "src": "3531:36:25" + "src": "14722:209:25" } ] } @@ -13770,37 +9432,38 @@ ] }, "documentation": null, - "id": 5435, + "id": 5886, "implemented": true, "kind": "function", "modifiers": [], - "name": "swapDebtPostLoan", + "name": "swapOperationAndClearCollateralDust", "nodeType": "FunctionDefinition", "parameters": { - "id": 5316, + "id": 5814, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5309, - "name": "_loanAmount", + "id": 5801, + "name": "dedgeCompoundManagerAddress", "nodeType": "VariableDeclaration", - "scope": 5435, - "src": "1655:16:25", + "scope": 5886, + "src": "12638:35:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" }, "typeName": { - "id": 5308, - "name": "uint", + "id": 5800, + "name": "address", "nodeType": "ElementaryTypeName", - "src": "1655:4:25", + "src": "12638:7:25", + "stateMutability": "nonpayable", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } }, "value": null, @@ -13808,25 +9471,26 @@ }, { "constant": false, - "id": 5311, - "name": "_aaveFee", + "id": 5803, + "name": "dacProxyAddress", "nodeType": "VariableDeclaration", - "scope": 5435, - "src": "1681:13:25", + "scope": 5886, + "src": "12683:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address_payable", + "typeString": "address payable" }, "typeName": { - "id": 5310, - "name": "uint", + "id": 5802, + "name": "address", "nodeType": "ElementaryTypeName", - "src": "1681:4:25", + "src": "12683:15:25", + "stateMutability": "payable", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address_payable", + "typeString": "address payable" } }, "value": null, @@ -13834,11 +9498,65 @@ }, { "constant": false, - "id": 5313, - "name": "_protocolFee", + "id": 5805, + "name": "addressRegistryAddress", + "nodeType": "VariableDeclaration", + "scope": 5886, + "src": "12724:30:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5804, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "12724:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5807, + "name": "oldCTokenAddress", + "nodeType": "VariableDeclaration", + "scope": 5886, + "src": "12764:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5806, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "12764:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5809, + "name": "oldTokenUnderlyingDelta", "nodeType": "VariableDeclaration", - "scope": 5435, - "src": "1704:17:25", + "scope": 5886, + "src": "12842:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -13846,10 +9564,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5312, - "name": "uint", + "id": 5808, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1704:4:25", + "src": "12842:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -13860,11 +9578,38 @@ }, { "constant": false, - "id": 5315, - "name": "_data", + "id": 5811, + "name": "newCTokenAddress", + "nodeType": "VariableDeclaration", + "scope": 5886, + "src": "12929:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5810, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "12929:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5813, + "name": "executeOperationCalldataParams", "nodeType": "VariableDeclaration", - "scope": 5435, - "src": "1731:20:25", + "scope": 5886, + "src": "12963:45:25", "stateVariable": false, "storageLocation": "calldata", "typeDescriptions": { @@ -13872,10 +9617,10 @@ "typeString": "bytes" }, "typeName": { - "id": 5314, + "id": 5812, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "1731:5:25", + "src": "12963:5:25", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -13885,344 +9630,364 @@ "visibility": "internal" } ], - "src": "1645:112:25" + "src": "12628:386:25" }, "returnParameters": { - "id": 5317, + "id": 5815, "nodeType": "ParameterList", "parameters": [], - "src": "1767:0:25" + "src": "13024:0:25" + }, + "scope": 5887, + "src": "12584:2364:25", + "stateMutability": "nonpayable", + "superFunction": null, + "visibility": "external" + } + ], + "scope": 5888, + "src": "720:14230:25" + } + ], + "src": "45:14906:25" + }, + "legacyAST": { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeCompoundManager.sol", + "exportedSymbols": { + "DedgeCompoundManager": [ + 5887 + ] + }, + "id": 5888, + "nodeType": "SourceUnit", + "nodes": [ + { + "id": 5248, + "literals": [ + "solidity", + "0.5", + ".16" + ], + "nodeType": "PragmaDirective", + "src": "45:23:25" + }, + { + "id": 5249, + "literals": [ + "experimental", + "ABIEncoderV2" + ], + "nodeType": "PragmaDirective", + "src": "69:33:25" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/compound/CompoundBase.sol", + "file": "../lib/compound/CompoundBase.sol", + "id": 5250, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 2838, + "src": "104:42:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", + "file": "../lib/dapphub/Guard.sol", + "id": 5251, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 3248, + "src": "148:34:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapLiteBase.sol", + "file": "../lib/uniswap/UniswapLiteBase.sol", + "id": 5252, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 5247, + "src": "184:44:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol", + "file": "../interfaces/aave/ILendingPoolAddressesProvider.sol", + "id": 5253, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 660, + "src": "230:62:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol", + "file": "../interfaces/aave/ILendingPool.sol", + "id": 5254, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 547, + "src": "293:45:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolParametersProvider.sol", + "file": "../interfaces/aave/ILendingPoolParametersProvider.sol", + "id": 5255, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 670, + "src": "339:63:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICompoundPriceOracle.sol", + "file": "../interfaces/compound/ICompoundPriceOracle.sol", + "id": 5256, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 895, + "src": "404:57:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", + "file": "../interfaces/compound/IComptroller.sol", + "id": 5257, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 1123, + "src": "462:49:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol", + "file": "../interfaces/compound/ICEther.sol", + "id": 5258, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 746, + "src": "512:44:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol", + "file": "../interfaces/compound/ICToken.sol", + "id": 5259, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 885, + "src": "557:44:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", + "file": "../interfaces/IERC20.sol", + "id": 5260, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 121, + "src": "603:34:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol", + "file": "../registries/AddressRegistry.sol", + "id": 5261, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 7542, + "src": "639:43:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol", + "file": "../proxies/DACProxy.sol", + "id": 5262, + "nodeType": "ImportDirective", + "scope": 5888, + "sourceUnit": 7236, + "src": "684:33:25", + "symbolAliases": [], + "unitAlias": "" + }, + { + "baseContracts": [ + { + "arguments": null, + "baseName": { + "contractScope": null, + "id": 5263, + "name": "UniswapLiteBase", + "nodeType": "UserDefinedTypeName", + "referencedDeclaration": 5246, + "src": "753:15:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_UniswapLiteBase_$5246", + "typeString": "contract UniswapLiteBase" + } }, - "scope": 5896, - "src": "1620:2685:25", - "stateMutability": "nonpayable", - "superFunction": null, - "visibility": "external" + "id": 5264, + "nodeType": "InheritanceSpecifier", + "src": "753:15:25" }, { - "body": { - "id": 5554, - "nodeType": "Block", - "src": "4464:2065:25", - "statements": [ - { - "assignments": [ - 5447 - ], - "declarations": [ - { - "constant": false, - "id": 5447, - "name": "soCalldata", - "nodeType": "VariableDeclaration", - "scope": 5554, - "src": "4474:39:25", - "stateVariable": false, - "storageLocation": "memory", - "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", - "typeString": "struct DedgeCompoundManager.SwapOperationCalldata" - }, - "typeName": { - "contractScope": null, - "id": 5446, - "name": "SwapOperationCalldata", - "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5225, - "src": "4474:21:25", - "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_storage_ptr", - "typeString": "struct DedgeCompoundManager.SwapOperationCalldata" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5454, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5450, - "name": "_data", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5443, - "src": "4527:5:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes_calldata_ptr", - "typeString": "bytes calldata" - } - }, - { - "argumentTypes": null, - "components": [ - { - "argumentTypes": null, - "id": 5451, - "name": "SwapOperationCalldata", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5225, - "src": "4535:21:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5225_storage_ptr_$", - "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" - } - } - ], - "id": 5452, - "isConstant": false, - "isInlineArray": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "nodeType": "TupleExpression", - "src": "4534:23:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5225_storage_ptr_$", - "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_bytes_calldata_ptr", - "typeString": "bytes calldata" - }, - { - "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5225_storage_ptr_$", - "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" - } - ], - "expression": { - "argumentTypes": null, - "id": 5448, - "name": "abi", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7814, - "src": "4516:3:25", - "typeDescriptions": { - "typeIdentifier": "t_magic_abi", - "typeString": "abi" - } - }, - "id": 5449, - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "memberName": "decode", - "nodeType": "MemberAccess", - "referencedDeclaration": null, - "src": "4516:10:25", - "typeDescriptions": { - "typeIdentifier": "t_function_abidecode_pure$__$returns$__$", - "typeString": "function () pure" - } - }, - "id": 5453, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "4516:42:25", - "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory", - "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "4474:84:25" + "arguments": null, + "baseName": { + "contractScope": null, + "id": 5265, + "name": "CompoundBase", + "nodeType": "UserDefinedTypeName", + "referencedDeclaration": 2837, + "src": "770:12:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_CompoundBase_$2837", + "typeString": "contract CompoundBase" + } + }, + "id": 5266, + "nodeType": "InheritanceSpecifier", + "src": "770:12:25" + } + ], + "contractDependencies": [ + 2837, + 5246 + ], + "contractKind": "contract", + "documentation": null, + "fullyImplemented": true, + "id": 5887, + "linearizedBaseContracts": [ + 5887, + 2837, + 5246 + ], + "name": "DedgeCompoundManager", + "nodeType": "ContractDefinition", + "nodes": [ + { + "canonicalName": "DedgeCompoundManager.SwapOperationCalldata", + "id": 5273, + "members": [ + { + "constant": false, + "id": 5268, + "name": "addressRegistryAddress", + "nodeType": "VariableDeclaration", + "scope": 5273, + "src": "828:30:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" }, - { - "assignments": [ - 5456 - ], - "declarations": [ - { - "constant": false, - "id": 5456, - "name": "addressRegistry", - "nodeType": "VariableDeclaration", - "scope": 5554, - "src": "4569:31:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - }, - "typeName": { - "contractScope": null, - "id": 5455, - "name": "AddressRegistry", - "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, - "src": "4569:15:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5461, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "expression": { - "argumentTypes": null, - "id": 5458, - "name": "soCalldata", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5447, - "src": "4619:10:25", - "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", - "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" - } - }, - "id": 5459, - "isConstant": false, - "isLValue": true, - "isPure": false, - "lValueRequested": false, - "memberName": "addressRegistryAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 5220, - "src": "4619:33:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5457, - "name": "AddressRegistry", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7550, - "src": "4603:15:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", - "typeString": "type(contract AddressRegistry)" - } - }, - "id": 5460, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "4603:50:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "4569:84:25" + "typeName": { + "id": 5267, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "828:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5270, + "name": "oldCTokenAddress", + "nodeType": "VariableDeclaration", + "scope": 5273, + "src": "868:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" }, - { - "assignments": [ - 5463 - ], - "declarations": [ - { - "constant": false, - "id": 5463, - "name": "oldCTokenAddress", - "nodeType": "VariableDeclaration", - "scope": 5554, - "src": "4664:24:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5462, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "4664:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5466, - "initialValue": { - "argumentTypes": null, - "expression": { - "argumentTypes": null, - "id": 5464, - "name": "soCalldata", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5447, - "src": "4691:10:25", - "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", - "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" - } - }, - "id": 5465, - "isConstant": false, - "isLValue": true, - "isPure": false, - "lValueRequested": false, - "memberName": "oldCTokenAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 5222, - "src": "4691:27:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "4664:54:25" + "typeName": { + "id": 5269, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "868:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5272, + "name": "newCTokenAddress", + "nodeType": "VariableDeclaration", + "scope": 5273, + "src": "902:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5271, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "902:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } }, + "value": null, + "visibility": "internal" + } + ], + "name": "SwapOperationCalldata", + "nodeType": "StructDefinition", + "scope": 5887, + "src": "789:144:25", + "visibility": "public" + }, + { + "body": { + "id": 5313, + "nodeType": "Block", + "src": "1030:214:25", + "statements": [ { "assignments": [ - 5468 + 5281 ], "declarations": [ { "constant": false, - "id": 5468, - "name": "newCTokenAddress", + "id": 5281, + "name": "g", "nodeType": "VariableDeclaration", - "scope": 5554, - "src": "4728:24:25", + "scope": 5313, + "src": "1040:9:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -14230,10 +9995,10 @@ "typeString": "address" }, "typeName": { - "id": 5467, + "id": 5280, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4728:7:25", + "src": "1040:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -14244,148 +10009,79 @@ "visibility": "internal" } ], - "id": 5471, - "initialValue": { - "argumentTypes": null, - "expression": { - "argumentTypes": null, - "id": 5469, - "name": "soCalldata", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5447, - "src": "4755:10:25", - "typeDescriptions": { - "typeIdentifier": "t_struct$_SwapOperationCalldata_$5225_memory_ptr", - "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" - } - }, - "id": 5470, - "isConstant": false, - "isLValue": true, - "isPure": false, - "lValueRequested": false, - "memberName": "newCTokenAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 5224, - "src": "4755:27:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "4728:54:25" - }, - { - "assignments": [ - 5473 - ], - "declarations": [ - { - "constant": false, - "id": 5473, - "name": "repayAmount", - "nodeType": "VariableDeclaration", - "scope": 5554, - "src": "5211:16:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 5472, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "5211:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5481, + "id": 5289, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5479, - "name": "_protocolFee", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5441, - "src": "5260:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5476, - "name": "_aaveFee", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5439, - "src": "5246:8:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], + "arguments": [], "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], + "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5474, - "name": "_loanAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5437, - "src": "5230:11:25", + "arguments": [ + { + "argumentTypes": null, + "id": 5284, + "name": "proxyAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5275, + "src": "1069:12:25", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + ], + "id": 5283, + "name": "DACProxy", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 7235, + "src": "1060:8:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", + "typeString": "type(contract DACProxy)" + } + }, + "id": 5285, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1060:22:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_contract$_DACProxy_$7235", + "typeString": "contract DACProxy" } }, - "id": 5475, + "id": 5286, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "memberName": "sub", + "memberName": "authority", "nodeType": "MemberAccess", - "referencedDeclaration": 7593, - "src": "5230:15:25", + "referencedDeclaration": 2864, + "src": "1060:32:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", - "typeString": "function (uint256,uint256) pure returns (uint256)" + "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2851_$", + "typeString": "function () view external returns (contract DSAuthority)" } }, - "id": 5477, + "id": 5287, "isConstant": false, "isLValue": false, "isPure": false, @@ -14393,1117 +10089,1114 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5230:25:25", + "src": "1060:34:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_contract$_DSAuthority_$2851", + "typeString": "contract DSAuthority" } - }, - "id": 5478, + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_contract$_DSAuthority_$2851", + "typeString": "contract DSAuthority" + } + ], + "id": 5282, "isConstant": false, "isLValue": false, - "isPure": false, + "isPure": true, "lValueRequested": false, - "memberName": "sub", - "nodeType": "MemberAccess", - "referencedDeclaration": 7593, - "src": "5230:29:25", + "nodeType": "ElementaryTypeNameExpression", + "src": "1052:7:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", - "typeString": "function (uint256,uint256) pure returns (uint256)" - } + "typeIdentifier": "t_type$_t_address_$", + "typeString": "type(address)" + }, + "typeName": "address" }, - "id": 5480, + "id": 5288, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", + "kind": "typeConversion", "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "5230:43:25", + "src": "1052:43:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } }, "nodeType": "VariableDeclarationStatement", - "src": "5211:62:25" + "src": "1040:55:25" }, { - "condition": { + "expression": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "id": 5486, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 5482, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5468, - "src": "5288:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "BinaryOperation", - "operator": "==", - "rightExpression": { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], + "arguments": [ + { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5297, + "name": "src", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5277, + "src": "1161:3:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5296, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "1153:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_address_$", + "typeString": "type(address)" + }, + "typeName": "address" + }, + "id": 5298, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1153:12:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5295, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "1145:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_bytes20_$", + "typeString": "type(bytes20)" + }, + "typeName": "bytes20" + }, + "id": 5299, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1145:21:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes20", + "typeString": "bytes20" + } + } + ], "expression": { - "argumentTypes": null, - "id": 5483, - "name": "addressRegistry", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5456, - "src": "5308:15:25", + "argumentTypes": [ + { + "typeIdentifier": "t_bytes20", + "typeString": "bytes20" + } + ], + "id": 5294, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "1137:7:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - } + "typeIdentifier": "t_type$_t_bytes32_$", + "typeString": "type(bytes32)" + }, + "typeName": "bytes32" }, - "id": 5484, + "id": 5300, "isConstant": false, "isLValue": false, "isPure": false, + "kind": "typeConversion", "lValueRequested": false, - "memberName": "CEtherAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "5308:29:25", + "names": [], + "nodeType": "FunctionCall", + "src": "1137:30:25", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" } }, - "id": 5485, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5308:31:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "src": "5288:51:25", - "typeDescriptions": { - "typeIdentifier": "t_bool", - "typeString": "bool" - } - }, - "falseBody": { - "id": 5513, - "nodeType": "Block", - "src": "5409:413:25", - "statements": [ { - "assignments": [ - 5494 - ], - "declarations": [ - { - "constant": false, - "id": 5494, - "name": "newTokenUnderlying", - "nodeType": "VariableDeclaration", - "scope": 5513, - "src": "5507:26:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5493, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "5507:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5500, - "initialValue": { - "argumentTypes": null, - "arguments": [], + "argumentTypes": null, + "arguments": [], + "expression": { + "argumentTypes": [], "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5496, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5468, - "src": "5544:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5495, - "name": "ICToken", + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5302, + "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "5536:7:25", + "referencedDeclaration": 5281, + "src": "1189:1:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" + "typeIdentifier": "t_address", + "typeString": "address" } - }, - "id": 5497, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5536:25:25", + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5301, + "name": "DSGuard", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3215, + "src": "1181:7:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", + "typeString": "type(contract DSGuard)" } }, - "id": 5498, + "id": 5303, "isConstant": false, "isLValue": false, "isPure": false, + "kind": "typeConversion", "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "5536:36:25", + "names": [], + "nodeType": "FunctionCall", + "src": "1181:10:25", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" + "typeIdentifier": "t_contract$_DSGuard_$3215", + "typeString": "contract DSGuard" } }, - "id": 5499, + "id": 5304, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5536:38:25", + "memberName": "ANY", + "nodeType": "MemberAccess", + "referencedDeclaration": 3010, + "src": "1181:14:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", + "typeString": "function () view external returns (bytes32)" } }, - "nodeType": "VariableDeclarationStatement", - "src": "5507:67:25" + "id": 5305, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1181:16:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + } }, { - "assignments": [ - 5502 - ], - "declarations": [ - { - "constant": false, - "id": 5502, - "name": "newTokenUnderlyingAmount", - "nodeType": "VariableDeclaration", - "scope": 5513, - "src": "5588:29:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 5501, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "5588:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "argumentTypes": null, + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5307, + "name": "g", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5281, + "src": "1219:1:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5507, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5504, - "name": "newTokenUnderlying", + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5306, + "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5494, - "src": "5649:18:25", + "referencedDeclaration": 3215, + "src": "1211:7:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", + "typeString": "type(contract DSGuard)" } }, - { - "argumentTypes": null, - "id": 5505, - "name": "repayAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5473, - "src": "5685:11:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5503, - "name": "_ethToToken", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 4959, - 4988 - ], - "referencedDeclaration": 4959, - "src": "5620:11:25", + "id": 5308, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1211:10:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) returns (uint256)" + "typeIdentifier": "t_contract$_DSGuard_$3215", + "typeString": "contract DSGuard" } }, - "id": 5506, + "id": 5309, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5620:90:25", + "memberName": "ANY", + "nodeType": "MemberAccess", + "referencedDeclaration": 3010, + "src": "1211:14:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", + "typeString": "function () view external returns (bytes32)" } }, - "nodeType": "VariableDeclarationStatement", - "src": "5588:122:25" + "id": 5310, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1211:16:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + }, + { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + }, + { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5291, + "name": "g", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5281, + "src": "1114:1:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5290, + "name": "DSGuard", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3215, + "src": "1106:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", + "typeString": "type(contract DSGuard)" + } + }, + "id": 5292, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1106:10:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_DSGuard_$3215", + "typeString": "contract DSGuard" + } + }, + "id": 5293, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "permit", + "nodeType": "MemberAccess", + "referencedDeclaration": 3138, + "src": "1106:17:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", + "typeString": "function (bytes32,bytes32,bytes32) external" + } + }, + "id": 5311, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1106:131:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5312, + "nodeType": "ExpressionStatement", + "src": "1106:131:25" + } + ] + }, + "documentation": null, + "id": 5314, + "implemented": true, + "kind": "function", + "modifiers": [], + "name": "_proxyGuardPermit", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 5278, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 5275, + "name": "proxyAddress", + "nodeType": "VariableDeclaration", + "scope": 5314, + "src": "966:28:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + "typeName": { + "id": 5274, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "966:15:25", + "stateMutability": "payable", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5277, + "name": "src", + "nodeType": "VariableDeclaration", + "scope": 5314, + "src": "996:11:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5276, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "996:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "965:43:25" + }, + "returnParameters": { + "id": 5279, + "nodeType": "ParameterList", + "parameters": [], + "src": "1030:0:25" + }, + "scope": 5887, + "src": "939:305:25", + "stateMutability": "nonpayable", + "superFunction": null, + "visibility": "internal" + }, + { + "body": { + "id": 5354, + "nodeType": "Block", + "src": "1341:214:25", + "statements": [ + { + "assignments": [ + 5322 + ], + "declarations": [ + { + "constant": false, + "id": 5322, + "name": "g", + "nodeType": "VariableDeclaration", + "scope": 5354, + "src": "1351:9:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5321, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1351:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } }, + "value": null, + "visibility": "internal" + } + ], + "id": 5330, + "initialValue": { + "argumentTypes": null, + "arguments": [ { + "argumentTypes": null, + "arguments": [], "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5509, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5468, - "src": "5768:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5510, - "name": "newTokenUnderlyingAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5502, - "src": "5786:24:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], + "argumentTypes": [], "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, + "argumentTypes": null, + "arguments": [ { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "argumentTypes": null, + "id": 5325, + "name": "proxyAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5316, + "src": "1380:12:25", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } } ], - "id": 5508, - "name": "supply", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2423, - "src": "5761:6:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" - } - }, - "id": 5511, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5761:50:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5512, - "nodeType": "ExpressionStatement", - "src": "5761:50:25" - } - ] - }, - "id": 5514, - "nodeType": "IfStatement", - "src": "5284:538:25", - "trueBody": { - "id": 5492, - "nodeType": "Block", - "src": "5341:62:25", - "statements": [ - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5488, - "name": "newCTokenAddress", + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + ], + "id": 5324, + "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5468, - "src": "5362:16:25", + "referencedDeclaration": 7235, + "src": "1371:8:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", + "typeString": "type(contract DACProxy)" } }, - { - "argumentTypes": null, - "id": 5489, - "name": "repayAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5473, - "src": "5380:11:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5487, - "name": "supply", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2423, - "src": "5355:6:25", + "id": 5326, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1371:22:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" + "typeIdentifier": "t_contract$_DACProxy_$7235", + "typeString": "contract DACProxy" } }, - "id": 5490, + "id": 5327, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5355:37:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5491, - "nodeType": "ExpressionStatement", - "src": "5355:37:25" - } - ] - } - }, - { - "condition": { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "id": 5519, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 5515, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5463, - "src": "5894:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "BinaryOperation", - "operator": "==", - "rightExpression": { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "id": 5516, - "name": "addressRegistry", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5456, - "src": "5914:15:25", + "memberName": "authority", + "nodeType": "MemberAccess", + "referencedDeclaration": 2864, + "src": "1371:32:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" + "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2851_$", + "typeString": "function () view external returns (contract DSAuthority)" } }, - "id": 5517, + "id": 5328, "isConstant": false, "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "memberName": "CEtherAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "5914:29:25", + "names": [], + "nodeType": "FunctionCall", + "src": "1371:34:25", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" + "typeIdentifier": "t_contract$_DSAuthority_$2851", + "typeString": "contract DSAuthority" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_contract$_DSAuthority_$2851", + "typeString": "contract DSAuthority" } - }, - "id": 5518, + ], + "id": 5323, "isConstant": false, "isLValue": false, - "isPure": false, - "kind": "functionCall", + "isPure": true, "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5914:31:25", + "nodeType": "ElementaryTypeNameExpression", + "src": "1363:7:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } + "typeIdentifier": "t_type$_t_address_$", + "typeString": "type(address)" + }, + "typeName": "address" }, - "src": "5894:51:25", + "id": 5329, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1363:43:25", "typeDescriptions": { - "typeIdentifier": "t_bool", - "typeString": "bool" + "typeIdentifier": "t_address", + "typeString": "address" } }, - "falseBody": { - "id": 5552, - "nodeType": "Block", - "src": "6025:498:25", - "statements": [ + "nodeType": "VariableDeclarationStatement", + "src": "1351:55:25" + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ { - "assignments": [ - 5527 - ], - "declarations": [ + "argumentTypes": null, + "arguments": [ { - "constant": false, - "id": 5527, - "name": "oldTokenUnderlying", - "nodeType": "VariableDeclaration", - "scope": 5552, - "src": "6120:26:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5526, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "6120:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5533, - "initialValue": { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5529, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5463, - "src": "6157:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "arguments": [ { - "typeIdentifier": "t_address", - "typeString": "address" + "argumentTypes": null, + "id": 5338, + "name": "src", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5318, + "src": "1472:3:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } } ], - "id": 5528, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "6149:7:25", + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5337, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "1464:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_address_$", + "typeString": "type(address)" + }, + "typeName": "address" + }, + "id": 5339, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1464:12:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" + "typeIdentifier": "t_address", + "typeString": "address" } - }, - "id": 5530, + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5336, "isConstant": false, "isLValue": false, - "isPure": false, - "kind": "typeConversion", + "isPure": true, "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "6149:25:25", + "nodeType": "ElementaryTypeNameExpression", + "src": "1456:7:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } + "typeIdentifier": "t_type$_t_bytes20_$", + "typeString": "type(bytes20)" + }, + "typeName": "bytes20" }, - "id": 5531, + "id": 5340, "isConstant": false, "isLValue": false, "isPure": false, + "kind": "typeConversion", "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "6149:36:25", + "names": [], + "nodeType": "FunctionCall", + "src": "1456:21:25", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" + "typeIdentifier": "t_bytes20", + "typeString": "bytes20" } - }, - "id": 5532, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "6149:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "6120:67:25" - }, - { - "assignments": [ - 5535 - ], - "declarations": [ - { - "constant": false, - "id": 5535, - "name": "oldTokenUnderlyingAmount", - "nodeType": "VariableDeclaration", - "scope": 5552, - "src": "6201:29:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 5534, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "6201:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" } ], - "id": 5540, - "initialValue": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5537, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5527, - "src": "6254:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, + "expression": { + "argumentTypes": [ { - "argumentTypes": null, - "id": 5538, - "name": "_loanAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5437, - "src": "6274:11:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } + "typeIdentifier": "t_bytes20", + "typeString": "bytes20" } ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5536, - "name": "_getTokenToEthOutput", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5150, - "src": "6233:20:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) view returns (uint256)" - } - }, - "id": 5539, + "id": 5335, "isConstant": false, "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "6233:53:25", + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "1448:7:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } + "typeIdentifier": "t_type$_t_bytes32_$", + "typeString": "type(bytes32)" + }, + "typeName": "bytes32" }, - "nodeType": "VariableDeclarationStatement", - "src": "6201:85:25" + "id": 5341, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1448:30:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + } }, { + "argumentTypes": null, + "arguments": [], "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5542, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5463, - "src": "6346:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5343, + "name": "g", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5322, + "src": "1500:1:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } } - }, - { - "argumentTypes": null, - "id": 5543, - "name": "oldTokenUnderlyingAmount", + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5342, + "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5535, - "src": "6364:24:25", + "referencedDeclaration": 3215, + "src": "1492:7:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", + "typeString": "type(contract DSGuard)" } - ], - "id": 5541, - "name": "redeemUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2605, - "src": "6329:16:25", + }, + "id": 5344, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1492:10:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" + "typeIdentifier": "t_contract$_DSGuard_$3215", + "typeString": "contract DSGuard" } }, - "id": 5544, + "id": 5345, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "6329:60:25", + "memberName": "ANY", + "nodeType": "MemberAccess", + "referencedDeclaration": 3010, + "src": "1492:14:25", "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" + "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", + "typeString": "function () view external returns (bytes32)" } }, - "id": 5545, - "nodeType": "ExpressionStatement", - "src": "6329:60:25" + "id": 5346, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1492:16:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + } }, { + "argumentTypes": null, + "arguments": [], "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5547, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5527, - "src": "6454:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5348, + "name": "g", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5322, + "src": "1530:1:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } } - }, - { - "argumentTypes": null, - "id": 5548, - "name": "oldTokenUnderlyingAmount", + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5347, + "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5535, - "src": "6474:24:25", + "referencedDeclaration": 3215, + "src": "1522:7:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", + "typeString": "type(contract DSGuard)" } }, - { - "argumentTypes": null, - "id": 5549, - "name": "_loanAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5437, - "src": "6500:11:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5546, - "name": "_tokenToEth", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 5006, - 5045 - ], - "referencedDeclaration": 5045, - "src": "6442:11:25", + "id": 5349, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1522:10:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256,uint256) returns (uint256)" + "typeIdentifier": "t_contract$_DSGuard_$3215", + "typeString": "contract DSGuard" } }, - "id": 5550, + "id": 5350, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "6442:70:25", + "memberName": "ANY", + "nodeType": "MemberAccess", + "referencedDeclaration": 3010, + "src": "1522:14:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", + "typeString": "function () view external returns (bytes32)" } }, - "id": 5551, - "nodeType": "ExpressionStatement", - "src": "6442:70:25" - } - ] - }, - "id": 5553, - "nodeType": "IfStatement", - "src": "5890:633:25", - "trueBody": { - "id": 5525, - "nodeType": "Block", - "src": "5947:72:25", - "statements": [ - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5521, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5463, - "src": "5978:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5522, - "name": "_loanAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5437, - "src": "5996:11:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5520, - "name": "redeemUnderlying", + "id": 5351, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1522:16:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + }, + { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + }, + { + "typeIdentifier": "t_bytes32", + "typeString": "bytes32" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5332, + "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2605, - "src": "5961:16:25", + "referencedDeclaration": 5322, + "src": "1425:1:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" + "typeIdentifier": "t_address", + "typeString": "address" } - }, - "id": 5523, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "5961:47:25", + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5331, + "name": "DSGuard", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 3215, + "src": "1417:7:25", "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", + "typeString": "type(contract DSGuard)" } }, - "id": 5524, - "nodeType": "ExpressionStatement", - "src": "5961:47:25" + "id": 5333, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1417:10:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_DSGuard_$3215", + "typeString": "contract DSGuard" + } + }, + "id": 5334, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "forbid", + "nodeType": "MemberAccess", + "referencedDeclaration": 3166, + "src": "1417:17:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", + "typeString": "function (bytes32,bytes32,bytes32) external" } - ] - } + }, + "id": 5352, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1417:131:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5353, + "nodeType": "ExpressionStatement", + "src": "1417:131:25" } ] }, "documentation": null, - "id": 5555, + "id": 5355, "implemented": true, "kind": "function", "modifiers": [], - "name": "swapCollateralPostLoan", + "name": "_proxyGuardForbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 5444, + "id": 5319, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5437, - "name": "_loanAmount", - "nodeType": "VariableDeclaration", - "scope": 5555, - "src": "4352:16:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 5436, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "4352:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5439, - "name": "_aaveFee", + "id": 5316, + "name": "proxyAddress", "nodeType": "VariableDeclaration", - "scope": 5555, - "src": "4378:13:25", + "scope": 5355, + "src": "1277:28:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address_payable", + "typeString": "address payable" }, "typeName": { - "id": 5438, - "name": "uint", + "id": 5315, + "name": "address", "nodeType": "ElementaryTypeName", - "src": "4378:4:25", + "src": "1277:15:25", + "stateMutability": "payable", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address_payable", + "typeString": "address payable" } }, "value": null, @@ -15511,104 +11204,216 @@ }, { "constant": false, - "id": 5441, - "name": "_protocolFee", + "id": 5318, + "name": "src", "nodeType": "VariableDeclaration", - "scope": 5555, - "src": "4401:17:25", + "scope": 5355, + "src": "1307:11:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "typeName": { - "id": 5440, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "4401:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5443, - "name": "_data", - "nodeType": "VariableDeclaration", - "scope": 5555, - "src": "4428:20:25", - "stateVariable": false, - "storageLocation": "calldata", - "typeDescriptions": { - "typeIdentifier": "t_bytes_calldata_ptr", - "typeString": "bytes" + "typeIdentifier": "t_address", + "typeString": "address" }, "typeName": { - "id": 5442, - "name": "bytes", + "id": 5317, + "name": "address", "nodeType": "ElementaryTypeName", - "src": "4428:5:25", + "src": "1307:7:25", + "stateMutability": "nonpayable", "typeDescriptions": { - "typeIdentifier": "t_bytes_storage_ptr", - "typeString": "bytes" + "typeIdentifier": "t_address", + "typeString": "address" } }, "value": null, "visibility": "internal" } ], - "src": "4342:112:25" + "src": "1276:43:25" }, "returnParameters": { - "id": 5445, + "id": 5320, "nodeType": "ParameterList", "parameters": [], - "src": "4464:0:25" + "src": "1341:0:25" }, - "scope": 5896, - "src": "4311:2218:25", + "scope": 5887, + "src": "1250:305:25", "stateMutability": "nonpayable", "superFunction": null, - "visibility": "external" + "visibility": "internal" }, { "body": { - "id": 5650, + "id": 5482, "nodeType": "Block", - "src": "8117:1812:25", + "src": "1717:2694:25", "statements": [ { "assignments": [ - 5571 + 5367 + ], + "declarations": [ + { + "constant": false, + "id": 5367, + "name": "soCalldata", + "nodeType": "VariableDeclaration", + "scope": 5482, + "src": "1727:39:25", + "stateVariable": false, + "storageLocation": "memory", + "typeDescriptions": { + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", + "typeString": "struct DedgeCompoundManager.SwapOperationCalldata" + }, + "typeName": { + "contractScope": null, + "id": 5366, + "name": "SwapOperationCalldata", + "nodeType": "UserDefinedTypeName", + "referencedDeclaration": 5273, + "src": "1727:21:25", + "typeDescriptions": { + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_storage_ptr", + "typeString": "struct DedgeCompoundManager.SwapOperationCalldata" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5374, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5370, + "name": "_data", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5363, + "src": "1793:5:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + }, + { + "argumentTypes": null, + "components": [ + { + "argumentTypes": null, + "id": 5371, + "name": "SwapOperationCalldata", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5273, + "src": "1813:21:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5273_storage_ptr_$", + "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" + } + } + ], + "id": 5372, + "isConstant": false, + "isInlineArray": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "TupleExpression", + "src": "1812:23:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5273_storage_ptr_$", + "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + }, + { + "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5273_storage_ptr_$", + "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" + } + ], + "expression": { + "argumentTypes": null, + "id": 5368, + "name": "abi", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 7805, + "src": "1769:3:25", + "typeDescriptions": { + "typeIdentifier": "t_magic_abi", + "typeString": "abi" + } + }, + "id": 5369, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "memberName": "decode", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "1769:10:25", + "typeDescriptions": { + "typeIdentifier": "t_function_abidecode_pure$__$returns$__$", + "typeString": "function () pure" + } + }, + "id": 5373, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1769:76:25", + "typeDescriptions": { + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory", + "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "1727:118:25" + }, + { + "assignments": [ + 5376 ], "declarations": [ { "constant": false, - "id": 5571, + "id": 5376, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 5650, - "src": "8332:31:25", + "scope": 5482, + "src": "1856:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 5570, + "id": 5375, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, - "src": "8332:15:25", + "referencedDeclaration": 7541, + "src": "1856:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -15616,18 +11421,34 @@ "visibility": "internal" } ], - "id": 5575, + "id": 5381, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5573, - "name": "addressRegistryAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5561, - "src": "8382:22:25", + "expression": { + "argumentTypes": null, + "id": 5378, + "name": "soCalldata", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5367, + "src": "1919:10:25", + "typeDescriptions": { + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", + "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" + } + }, + "id": 5379, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "addressRegistryAddress", + "nodeType": "MemberAccess", + "referencedDeclaration": 5268, + "src": "1919:33:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15641,18 +11462,18 @@ "typeString": "address" } ], - "id": 5572, + "id": 5377, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, - "src": "8366:15:25", + "referencedDeclaration": 7541, + "src": "1890:15:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 5574, + "id": 5380, "isConstant": false, "isLValue": false, "isPure": false, @@ -15660,27 +11481,159 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8366:39:25", + "src": "1890:72:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, "nodeType": "VariableDeclarationStatement", - "src": "8332:73:25" + "src": "1856:106:25" }, { "assignments": [ - 5577 + 5383 ], "declarations": [ { "constant": false, - "id": 5577, - "name": "ethDebtAmount", + "id": 5383, + "name": "oldCTokenAddress", + "nodeType": "VariableDeclaration", + "scope": 5482, + "src": "1973:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5382, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1973:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5386, + "initialValue": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 5384, + "name": "soCalldata", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5367, + "src": "2000:10:25", + "typeDescriptions": { + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", + "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" + } + }, + "id": 5385, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "oldCTokenAddress", + "nodeType": "MemberAccess", + "referencedDeclaration": 5270, + "src": "2000:27:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "1973:54:25" + }, + { + "assignments": [ + 5388 + ], + "declarations": [ + { + "constant": false, + "id": 5388, + "name": "newCTokenAddress", + "nodeType": "VariableDeclaration", + "scope": 5482, + "src": "2037:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5387, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "2037:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5391, + "initialValue": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 5389, + "name": "soCalldata", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5367, + "src": "2064:10:25", + "typeDescriptions": { + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", + "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" + } + }, + "id": 5390, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "newCTokenAddress", + "nodeType": "MemberAccess", + "referencedDeclaration": 5272, + "src": "2064:27:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "2037:54:25" + }, + { + "assignments": [ + 5393 + ], + "declarations": [ + { + "constant": false, + "id": 5393, + "name": "debtAmount", "nodeType": "VariableDeclaration", - "scope": 5650, - "src": "8534:18:25", + "scope": 5482, + "src": "2102:18:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -15688,10 +11641,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5576, - "name": "uint", + "id": 5392, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "8534:4:25", + "src": "2102:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -15701,10 +11654,126 @@ "visibility": "internal" } ], - "id": 5578, - "initialValue": null, + "id": 5401, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5399, + "name": "_protocolFee", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5361, + "src": "2153:12:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5396, + "name": "_aaveFee", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5359, + "src": "2139:8:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "id": 5394, + "name": "_loanAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5357, + "src": "2123:11:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5395, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 7568, + "src": "2123:15:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 5397, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2123:25:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5398, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 7568, + "src": "2123:29:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 5400, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2123:43:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, "nodeType": "VariableDeclarationStatement", - "src": "8534:18:25" + "src": "2102:64:25" }, { "condition": { @@ -15713,19 +11782,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5583, + "id": 5406, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5579, + "id": 5402, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5563, - "src": "8567:16:25", + "referencedDeclaration": 5383, + "src": "2660:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -15740,32 +11809,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5580, + "id": 5403, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5571, - "src": "8587:15:25", + "referencedDeclaration": 5376, + "src": "2680:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 5581, + "id": 5404, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "8587:29:25", + "referencedDeclaration": 7501, + "src": "2680:29:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5582, + "id": 5405, "isConstant": false, "isLValue": false, "isPure": false, @@ -15773,1070 +11842,1110 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "8587:31:25", + "src": "2680:31:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "8567:51:25", + "src": "2660:51:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 5600, + "id": 5441, "nodeType": "Block", - "src": "8690:228:25", + "src": "2786:575:25", "statements": [ { - "expression": { + "assignments": [ + 5414 + ], + "declarations": [ + { + "constant": false, + "id": 5414, + "name": "oldTokenUnderlying", + "nodeType": "VariableDeclaration", + "scope": 5441, + "src": "2852:26:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5413, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "2852:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5420, + "initialValue": { "argumentTypes": null, - "id": 5598, + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5416, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5383, + "src": "2889:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5415, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "2881:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" + } + }, + "id": 5417, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2881:25:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" + } + }, + "id": 5418, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "underlying", + "nodeType": "MemberAccess", + "referencedDeclaration": 835, + "src": "2881:36:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" + } + }, + "id": 5419, "isConstant": false, "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5589, - "name": "ethDebtAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5577, - "src": "8760:13:25", + "names": [], + "nodeType": "FunctionCall", + "src": "2881:38:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "2852:67:25" + }, + { + "assignments": [ + 5422 + ], + "declarations": [ + { + "constant": false, + "id": 5422, + "name": "oldTokenUnderlyingAmount", + "nodeType": "VariableDeclaration", + "scope": 5441, + "src": "2934:32:25", + "stateVariable": false, + "storageLocation": "default", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" + }, + "typeName": { + "id": 5421, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "2934:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5427, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5424, + "name": "oldTokenUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5414, + "src": "2998:18:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5425, + "name": "_loanAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5357, + "src": "3034:11:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [ + ], + "expression": { + "argumentTypes": [ { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5592, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5563, - "src": "8822:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5591, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "8814:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5593, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "8814:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5594, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "8814:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5595, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "8814:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5423, + "name": "_ethToToken", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 5011, + 5040 + ], + "referencedDeclaration": 5011, + "src": "2969:11:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,uint256) returns (uint256)" + } + }, + "id": 5426, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2969:90:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "2934:125:25" + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5432, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5383, + "src": "3179:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5433, + "name": "oldTokenUnderlyingAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5422, + "src": "3213:24:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" }, { - "argumentTypes": null, - "id": 5596, - "name": "oldTokenUnderlyingDelta", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5565, - "src": "8870:23:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } + "typeIdentifier": "t_uint256", + "typeString": "uint256" } ], "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, + "argumentTypes": null, + "arguments": [ { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "argumentTypes": null, + "id": 5429, + "name": "oldTokenUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5414, + "src": "3134:18:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } } ], - "id": 5590, - "name": "_getEthToTokenOutput", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5169, - "src": "8776:20:25", + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5428, + "name": "IERC20", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 120, + "src": "3127:6:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_IERC20_$120_$", + "typeString": "type(contract IERC20)" + } + }, + "id": 5430, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "3127:26:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) view returns (uint256)" + "typeIdentifier": "t_contract$_IERC20_$120", + "typeString": "contract IERC20" } }, - "id": 5597, + "id": 5431, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "8776:131:25", + "memberName": "approve", + "nodeType": "MemberAccess", + "referencedDeclaration": 77, + "src": "3127:34:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$_t_bool_$", + "typeString": "function (address,uint256) external returns (bool)" } }, - "src": "8760:147:25", + "id": 5434, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "3127:124:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_bool", + "typeString": "bool" } }, - "id": 5599, + "id": 5435, "nodeType": "ExpressionStatement", - "src": "8760:147:25" - } - ] - }, - "id": 5601, - "nodeType": "IfStatement", - "src": "8563:355:25", - "trueBody": { - "id": 5588, - "nodeType": "Block", - "src": "8620:64:25", - "statements": [ + "src": "3127:124:25" + }, { "expression": { "argumentTypes": null, - "id": 5586, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5584, - "name": "ethDebtAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5577, - "src": "8634:13:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "arguments": [ + { + "argumentTypes": null, + "id": 5437, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5383, + "src": "3307:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5438, + "name": "oldTokenUnderlyingAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5422, + "src": "3325:24:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "id": 5585, - "name": "oldTokenUnderlyingDelta", + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5436, + "name": "repayBorrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5565, - "src": "8650:23:25", + "referencedDeclaration": 2605, + "src": "3295:11:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" } }, - "src": "8634:39:25", + "id": 5439, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "3295:55:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" } }, - "id": 5587, + "id": 5440, "nodeType": "ExpressionStatement", - "src": "8634:39:25" + "src": "3295:55:25" } ] - } - }, - { - "assignments": [ - 5603 - ], - "declarations": [ - { - "constant": false, - "id": 5603, - "name": "addressAndExecuteOperationCalldataParams", - "nodeType": "VariableDeclaration", - "scope": 5650, - "src": "9067:53:25", - "stateVariable": false, - "storageLocation": "memory", - "typeDescriptions": { - "typeIdentifier": "t_bytes_memory_ptr", - "typeString": "bytes" - }, - "typeName": { - "id": 5602, - "name": "bytes", - "nodeType": "ElementaryTypeName", - "src": "9067:5:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes_storage_ptr", - "typeString": "bytes" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5612, - "initialValue": { - "argumentTypes": null, - "arguments": [ + }, + "id": 5442, + "nodeType": "IfStatement", + "src": "2656:705:25", + "trueBody": { + "id": 5412, + "nodeType": "Block", + "src": "2713:67:25", + "statements": [ { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5608, - "name": "dedgeCompoundManagerAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5557, - "src": "9164:27:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], "expression": { - "argumentTypes": [ + "argumentTypes": null, + "arguments": [ { - "typeIdentifier": "t_address", - "typeString": "address" + "argumentTypes": null, + "id": 5408, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5383, + "src": "2739:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5409, + "name": "_loanAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5357, + "src": "2757:11:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } } ], "expression": { - "argumentTypes": null, - "id": 5606, - "name": "abi", + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5407, + "name": "repayBorrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, - "src": "9153:3:25", + "referencedDeclaration": 2605, + "src": "2727:11:25", "typeDescriptions": { - "typeIdentifier": "t_magic_abi", - "typeString": "abi" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" } }, - "id": 5607, + "id": 5410, "isConstant": false, "isLValue": false, - "isPure": true, + "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "memberName": "encode", - "nodeType": "MemberAccess", - "referencedDeclaration": null, - "src": "9153:10:25", + "names": [], + "nodeType": "FunctionCall", + "src": "2727:42:25", "typeDescriptions": { - "typeIdentifier": "t_function_abiencode_pure$__$returns$_t_bytes_memory_ptr_$", - "typeString": "function () pure returns (bytes memory)" + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5411, + "nodeType": "ExpressionStatement", + "src": "2727:42:25" + } + ] + } + }, + { + "condition": { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "id": 5447, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "id": 5443, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5388, + "src": "3505:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "BinaryOperation", + "operator": "==", + "rightExpression": { + "argumentTypes": null, + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "id": 5444, + "name": "addressRegistry", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5376, + "src": "3525:15:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_AddressRegistry_$7541", + "typeString": "contract AddressRegistry" } }, - "id": 5609, + "id": 5445, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "9153:39:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes_memory_ptr", - "typeString": "bytes memory" - } - }, - { - "argumentTypes": null, - "id": 5610, - "name": "executeOperationCalldataParams", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5567, - "src": "9206:30:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes_calldata_ptr", - "typeString": "bytes calldata" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_bytes_memory_ptr", - "typeString": "bytes memory" - }, - { - "typeIdentifier": "t_bytes_calldata_ptr", - "typeString": "bytes calldata" - } - ], - "expression": { - "argumentTypes": null, - "id": 5604, - "name": "abi", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 7814, - "src": "9123:3:25", + "memberName": "CEtherAddress", + "nodeType": "MemberAccess", + "referencedDeclaration": 7501, + "src": "3525:29:25", "typeDescriptions": { - "typeIdentifier": "t_magic_abi", - "typeString": "abi" + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" } }, - "id": 5605, + "id": 5446, "isConstant": false, "isLValue": false, - "isPure": true, + "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "memberName": "encodePacked", - "nodeType": "MemberAccess", - "referencedDeclaration": null, - "src": "9123:16:25", + "names": [], + "nodeType": "FunctionCall", + "src": "3525:31:25", "typeDescriptions": { - "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", - "typeString": "function () pure returns (bytes memory)" + "typeIdentifier": "t_address", + "typeString": "address" } }, - "id": 5611, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "9123:123:25", + "src": "3505:51:25", "typeDescriptions": { - "typeIdentifier": "t_bytes_memory_ptr", - "typeString": "bytes memory" + "typeIdentifier": "t_bool", + "typeString": "bool" } }, - "nodeType": "VariableDeclarationStatement", - "src": "9067:179:25" - }, - { - "assignments": [ - 5614 - ], - "declarations": [ - { - "constant": false, - "id": 5614, - "name": "lendingPool", - "nodeType": "VariableDeclaration", - "scope": 5650, - "src": "9257:24:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ILendingPool_$546", - "typeString": "contract ILendingPool" - }, - "typeName": { - "contractScope": null, - "id": 5613, - "name": "ILendingPool", - "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 546, - "src": "9257:12:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ILendingPool_$546", - "typeString": "contract ILendingPool" - } - }, - "value": null, - "visibility": "internal" - } - ], - "id": 5624, - "initialValue": { - "argumentTypes": null, - "arguments": [ + "falseBody": { + "id": 5480, + "nodeType": "Block", + "src": "3625:780:25", + "statements": [ { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], + "assignments": [ + 5455 + ], + "declarations": [ + { + "constant": false, + "id": 5455, + "name": "newTokenUnderlying", + "nodeType": "VariableDeclaration", + "scope": 5480, + "src": "3680:26:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5454, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "3680:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5461, + "initialValue": { + "argumentTypes": null, + "arguments": [], "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "id": 5617, - "name": "addressRegistry", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5571, - "src": "9357:15:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" - } - }, - "id": 5618, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "AaveLendingPoolAddressProviderAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 7495, - "src": "9357:53:25", + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5457, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5388, + "src": "3717:16:25", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" + "typeIdentifier": "t_address", + "typeString": "address" } - }, - "id": 5619, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "9357:55:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5456, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "3709:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" } - ], - "id": 5616, - "name": "ILendingPoolAddressesProvider", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 659, - "src": "9310:29:25", + }, + "id": 5458, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "3709:25:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ILendingPoolAddressesProvider_$659_$", - "typeString": "type(contract ILendingPoolAddressesProvider)" + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" } }, - "id": 5620, + "id": 5459, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "typeConversion", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "9310:116:25", + "memberName": "underlying", + "nodeType": "MemberAccess", + "referencedDeclaration": 835, + "src": "3709:36:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ILendingPoolAddressesProvider_$659", - "typeString": "contract ILendingPoolAddressesProvider" + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" } }, - "id": 5621, + "id": 5460, "isConstant": false, "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "memberName": "getLendingPool", - "nodeType": "MemberAccess", - "referencedDeclaration": 553, - "src": "9310:131:25", + "names": [], + "nodeType": "FunctionCall", + "src": "3709:38:25", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" + "typeIdentifier": "t_address", + "typeString": "address" } }, - "id": 5622, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "9310:133:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5615, - "name": "ILendingPool", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 546, - "src": "9284:12:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ILendingPool_$546_$", - "typeString": "type(contract ILendingPool)" - } - }, - "id": 5623, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "9284:169:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ILendingPool_$546", - "typeString": "contract ILendingPool" - } - }, - "nodeType": "VariableDeclarationStatement", - "src": "9257:196:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5626, - "name": "dacProxyAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5559, - "src": "9527:15:25", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - } + "nodeType": "VariableDeclarationStatement", + "src": "3680:67:25" }, { - "argumentTypes": null, - "arguments": [ + "assignments": [ + 5463 + ], + "declarations": [ { - "argumentTypes": null, - "id": 5628, - "name": "lendingPool", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5614, - "src": "9552:11:25", + "constant": false, + "id": 5463, + "name": "newTokenUnderlyingAmount", + "nodeType": "VariableDeclaration", + "scope": 5480, + "src": "3875:32:25", + "stateVariable": false, + "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_ILendingPool_$546", - "typeString": "contract ILendingPool" - } + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5462, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "3875:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" } ], - "expression": { - "argumentTypes": [ + "id": 5468, + "initialValue": { + "argumentTypes": null, + "arguments": [ { - "typeIdentifier": "t_contract$_ILendingPool_$546", - "typeString": "contract ILendingPool" + "argumentTypes": null, + "id": 5465, + "name": "newTokenUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5455, + "src": "3948:18:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5466, + "name": "debtAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5393, + "src": "3984:10:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } } ], - "id": 5627, + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5464, + "name": "_getTokenToEthOutput", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5202, + "src": "3910:20:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,uint256) view returns (uint256)" + } + }, + "id": 5467, "isConstant": false, "isLValue": false, - "isPure": true, + "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "9544:7:25", + "names": [], + "nodeType": "FunctionCall", + "src": "3910:98:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_address_$", - "typeString": "type(address)" - }, - "typeName": "address" - }, - "id": 5629, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "9544:20:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } }, - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5625, - "name": "_proxyGuardPermit", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5266, - "src": "9509:17:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", - "typeString": "function (address payable,address)" - } - }, - "id": 5630, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "9509:56:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5631, - "nodeType": "ExpressionStatement", - "src": "9509:56:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5635, - "name": "dacProxyAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5559, - "src": "9658:15:25", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - } + "nodeType": "VariableDeclarationStatement", + "src": "3875:133:25" }, { - "argumentTypes": null, - "arguments": [], "expression": { - "argumentTypes": [], + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5470, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5388, + "src": "4062:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5471, + "name": "newTokenUnderlyingAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5463, + "src": "4080:24:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], "expression": { - "argumentTypes": null, - "id": 5636, - "name": "addressRegistry", + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5469, + "name": "borrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5571, - "src": "9687:15:25", + "referencedDeclaration": 2527, + "src": "4055:6:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" } }, - "id": 5637, + "id": 5472, "isConstant": false, "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "memberName": "AaveEthAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 7498, - "src": "9687:30:25", + "names": [], + "nodeType": "FunctionCall", + "src": "4055:50:25", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" } }, - "id": 5638, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "9687:32:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5639, - "name": "ethDebtAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5577, - "src": "9733:13:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } + "id": 5473, + "nodeType": "ExpressionStatement", + "src": "4055:50:25" }, { - "argumentTypes": null, - "id": 5640, - "name": "addressAndExecuteOperationCalldataParams", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5603, - "src": "9760:40:25", - "typeDescriptions": { - "typeIdentifier": "t_bytes_memory_ptr", - "typeString": "bytes memory" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - }, - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5475, + "name": "newTokenUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5455, + "src": "4292:18:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5476, + "name": "newTokenUnderlyingAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5463, + "src": "4328:24:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + { + "argumentTypes": null, + "id": 5477, + "name": "debtAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5393, + "src": "4370:10:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5474, + "name": "_tokenToEth", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 5058, + 5097 + ], + "referencedDeclaration": 5097, + "src": "4263:11:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,uint256,uint256) returns (uint256)" + } + }, + "id": 5478, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "4263:131:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } }, - { - "typeIdentifier": "t_bytes_memory_ptr", - "typeString": "bytes memory" - } - ], - "expression": { - "argumentTypes": null, - "id": 5632, - "name": "lendingPool", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5614, - "src": "9623:11:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ILendingPool_$546", - "typeString": "contract ILendingPool" - } - }, - "id": 5634, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "flashLoan", - "nodeType": "MemberAccess", - "referencedDeclaration": 442, - "src": "9623:21:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$_t_bytes_memory_ptr_$returns$__$", - "typeString": "function (address,address,uint256,bytes memory) external" + "id": 5479, + "nodeType": "ExpressionStatement", + "src": "4263:131:25" } - }, - "id": 5641, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "9623:187:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } + ] }, - "id": 5642, - "nodeType": "ExpressionStatement", - "src": "9623:187:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5644, - "name": "dacProxyAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5559, - "src": "9884:15:25", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - } - }, + "id": 5481, + "nodeType": "IfStatement", + "src": "3501:904:25", + "trueBody": { + "id": 5453, + "nodeType": "Block", + "src": "3558:61:25", + "statements": [ { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5646, - "name": "lendingPool", + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5449, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5388, + "src": "3579:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5450, + "name": "debtAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5393, + "src": "3597:10:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5448, + "name": "borrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5614, - "src": "9909:11:25", + "referencedDeclaration": 2527, + "src": "3572:6:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ILendingPool_$546", - "typeString": "contract ILendingPool" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_contract$_ILendingPool_$546", - "typeString": "contract ILendingPool" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" } - ], - "id": 5645, + }, + "id": 5451, "isConstant": false, "isLValue": false, - "isPure": true, + "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "nodeType": "ElementaryTypeNameExpression", - "src": "9901:7:25", + "names": [], + "nodeType": "FunctionCall", + "src": "3572:36:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_address_$", - "typeString": "type(address)" - }, - "typeName": "address" - }, - "id": 5647, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "9901:20:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } }, - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5643, - "name": "_proxyGuardForbid", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5307, - "src": "9866:17:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", - "typeString": "function (address payable,address)" + "id": 5452, + "nodeType": "ExpressionStatement", + "src": "3572:36:25" } - }, - "id": 5648, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "9866:56:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5649, - "nodeType": "ExpressionStatement", - "src": "9866:56:25" + ] + } } ] }, "documentation": null, - "id": 5651, + "id": 5483, "implemented": true, "kind": "function", "modifiers": [], - "name": "swapOperation", + "name": "swapDebtPostLoan", "nodeType": "FunctionDefinition", "parameters": { - "id": 5568, + "id": 5364, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5557, - "name": "dedgeCompoundManagerAddress", - "nodeType": "VariableDeclaration", - "scope": 5651, - "src": "7750:35:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "typeName": { - "id": 5556, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "7750:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5559, - "name": "dacProxyAddress", - "nodeType": "VariableDeclaration", - "scope": 5651, - "src": "7795:31:25", - "stateVariable": false, - "storageLocation": "default", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - }, - "typeName": { - "id": 5558, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "7795:15:25", - "stateMutability": "payable", - "typeDescriptions": { - "typeIdentifier": "t_address_payable", - "typeString": "address payable" - } - }, - "value": null, - "visibility": "internal" - }, - { - "constant": false, - "id": 5561, - "name": "addressRegistryAddress", + "id": 5357, + "name": "_loanAmount", "nodeType": "VariableDeclaration", - "scope": 5651, - "src": "7836:30:25", + "scope": 5483, + "src": "1596:19:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" }, "typeName": { - "id": 5560, - "name": "address", + "id": 5356, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "7836:7:25", - "stateMutability": "nonpayable", + "src": "1596:7:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, "value": null, @@ -16844,26 +12953,25 @@ }, { "constant": false, - "id": 5563, - "name": "oldCTokenAddress", + "id": 5359, + "name": "_aaveFee", "nodeType": "VariableDeclaration", - "scope": 5651, - "src": "7876:24:25", + "scope": 5483, + "src": "1625:16:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" }, "typeName": { - "id": 5562, - "name": "address", + "id": 5358, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "7876:7:25", - "stateMutability": "nonpayable", + "src": "1625:7:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, "value": null, @@ -16871,11 +12979,11 @@ }, { "constant": false, - "id": 5565, - "name": "oldTokenUnderlyingDelta", + "id": 5361, + "name": "_protocolFee", "nodeType": "VariableDeclaration", - "scope": 5651, - "src": "7965:28:25", + "scope": 5483, + "src": "1651:20:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -16883,10 +12991,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5564, - "name": "uint", + "id": 5360, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "7965:4:25", + "src": "1651:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -16897,11 +13005,11 @@ }, { "constant": false, - "id": 5567, - "name": "executeOperationCalldataParams", + "id": 5363, + "name": "_data", "nodeType": "VariableDeclaration", - "scope": 5651, - "src": "8056:45:25", + "scope": 5483, + "src": "1681:20:25", "stateVariable": false, "storageLocation": "calldata", "typeDescriptions": { @@ -16909,10 +13017,10 @@ "typeString": "bytes" }, "typeName": { - "id": 5566, + "id": 5362, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "8056:5:25", + "src": "1681:5:25", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -16922,120 +13030,147 @@ "visibility": "internal" } ], - "src": "7740:367:25" + "src": "1586:121:25" }, "returnParameters": { - "id": 5569, + "id": 5365, "nodeType": "ParameterList", "parameters": [], - "src": "8117:0:25" + "src": "1717:0:25" }, - "scope": 5896, - "src": "7718:2211:25", + "scope": 5887, + "src": "1561:2850:25", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 5803, + "id": 5602, "nodeType": "Block", - "src": "10189:2546:25", + "src": "4579:2238:25", "statements": [ { - "expression": { + "assignments": [ + 5495 + ], + "declarations": [ + { + "constant": false, + "id": 5495, + "name": "soCalldata", + "nodeType": "VariableDeclaration", + "scope": 5602, + "src": "4589:39:25", + "stateVariable": false, + "storageLocation": "memory", + "typeDescriptions": { + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", + "typeString": "struct DedgeCompoundManager.SwapOperationCalldata" + }, + "typeName": { + "contractScope": null, + "id": 5494, + "name": "SwapOperationCalldata", + "nodeType": "UserDefinedTypeName", + "referencedDeclaration": 5273, + "src": "4589:21:25", + "typeDescriptions": { + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_storage_ptr", + "typeString": "struct DedgeCompoundManager.SwapOperationCalldata" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5502, + "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "id": 5665, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 5663, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5655, - "src": "10513:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "BinaryOperation", - "operator": "!=", - "rightExpression": { - "argumentTypes": null, - "id": 5664, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "10533:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "src": "10513:36:25", + "id": 5498, + "name": "_data", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5491, + "src": "4655:5:25", "typeDescriptions": { - "typeIdentifier": "t_bool", - "typeString": "bool" + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" } }, { "argumentTypes": null, - "hexValue": "636c6561722d646562742d73616d652d61646472657373", - "id": 5666, + "components": [ + { + "argumentTypes": null, + "id": 5499, + "name": "SwapOperationCalldata", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5273, + "src": "4675:21:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5273_storage_ptr_$", + "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" + } + } + ], + "id": 5500, "isConstant": false, + "isInlineArray": false, "isLValue": false, "isPure": true, - "kind": "string", "lValueRequested": false, - "nodeType": "Literal", - "src": "10551:25:25", - "subdenomination": null, + "nodeType": "TupleExpression", + "src": "4674:23:25", "typeDescriptions": { - "typeIdentifier": "t_stringliteral_f60d97a51de4aac3bfa13da6812001977cdeeeb11eaeb3d4289c176513ce2776", - "typeString": "literal_string \"clear-debt-same-address\"" - }, - "value": "clear-debt-same-address" + "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5273_storage_ptr_$", + "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" + } } ], "expression": { "argumentTypes": [ { - "typeIdentifier": "t_bool", - "typeString": "bool" + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" }, { - "typeIdentifier": "t_stringliteral_f60d97a51de4aac3bfa13da6812001977cdeeeb11eaeb3d4289c176513ce2776", - "typeString": "literal_string \"clear-debt-same-address\"" + "typeIdentifier": "t_type$_t_struct$_SwapOperationCalldata_$5273_storage_ptr_$", + "typeString": "type(struct DedgeCompoundManager.SwapOperationCalldata storage pointer)" } ], - "id": 5662, - "name": "require", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 7830, - 7831 - ], - "referencedDeclaration": 7831, - "src": "10505:7:25", + "expression": { + "argumentTypes": null, + "id": 5496, + "name": "abi", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 7805, + "src": "4631:3:25", + "typeDescriptions": { + "typeIdentifier": "t_magic_abi", + "typeString": "abi" + } + }, + "id": 5497, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "memberName": "decode", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "4631:10:25", "typeDescriptions": { - "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", - "typeString": "function (bool,string memory) pure" + "typeIdentifier": "t_function_abidecode_pure$__$returns$__$", + "typeString": "function () pure" } }, - "id": 5667, + "id": 5501, "isConstant": false, "isLValue": false, "isPure": false, @@ -17043,43 +13178,42 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10505:72:25", + "src": "4631:76:25", "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory", + "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" } }, - "id": 5668, - "nodeType": "ExpressionStatement", - "src": "10505:72:25" + "nodeType": "VariableDeclarationStatement", + "src": "4589:118:25" }, { "assignments": [ - 5670 + 5504 ], "declarations": [ { "constant": false, - "id": 5670, + "id": 5504, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 5803, - "src": "10588:31:25", + "scope": 5602, + "src": "4718:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 5669, + "id": 5503, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, - "src": "10588:15:25", + "referencedDeclaration": 7541, + "src": "4718:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -17087,18 +13221,34 @@ "visibility": "internal" } ], - "id": 5674, + "id": 5509, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5672, - "name": "addressRegistryAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5653, - "src": "10638:22:25", + "expression": { + "argumentTypes": null, + "id": 5506, + "name": "soCalldata", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5495, + "src": "4781:10:25", + "typeDescriptions": { + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", + "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" + } + }, + "id": 5507, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "addressRegistryAddress", + "nodeType": "MemberAccess", + "referencedDeclaration": 5268, + "src": "4781:33:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17112,18 +13262,18 @@ "typeString": "address" } ], - "id": 5671, + "id": 5505, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, - "src": "10622:15:25", + "referencedDeclaration": 7541, + "src": "4752:15:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 5673, + "id": 5508, "isConstant": false, "isLValue": false, "isPure": false, @@ -17131,127 +13281,762 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10622:39:25", + "src": "4752:72:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, "nodeType": "VariableDeclarationStatement", - "src": "10588:73:25" + "src": "4718:106:25" }, { "assignments": [ - 5676 + 5511 ], "declarations": [ { "constant": false, - "id": 5676, - "name": "borrowAmount", + "id": 5511, + "name": "oldCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 5803, - "src": "10672:17:25", + "scope": 5602, + "src": "4835:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" }, "typeName": { - "id": 5675, - "name": "uint", + "id": 5510, + "name": "address", "nodeType": "ElementaryTypeName", - "src": "10672:4:25", + "src": "4835:7:25", + "stateMutability": "nonpayable", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } }, "value": null, "visibility": "internal" } ], - "id": 5677, - "initialValue": null, + "id": 5514, + "initialValue": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 5512, + "name": "soCalldata", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5495, + "src": "4862:10:25", + "typeDescriptions": { + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", + "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" + } + }, + "id": 5513, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "oldCTokenAddress", + "nodeType": "MemberAccess", + "referencedDeclaration": 5270, + "src": "4862:27:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "4835:54:25" + }, + { + "assignments": [ + 5516 + ], + "declarations": [ + { + "constant": false, + "id": 5516, + "name": "newCTokenAddress", + "nodeType": "VariableDeclaration", + "scope": 5602, + "src": "4899:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5515, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "4899:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5519, + "initialValue": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 5517, + "name": "soCalldata", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5495, + "src": "4926:10:25", + "typeDescriptions": { + "typeIdentifier": "t_struct$_SwapOperationCalldata_$5273_memory_ptr", + "typeString": "struct DedgeCompoundManager.SwapOperationCalldata memory" + } + }, + "id": 5518, + "isConstant": false, + "isLValue": true, + "isPure": false, + "lValueRequested": false, + "memberName": "newCTokenAddress", + "nodeType": "MemberAccess", + "referencedDeclaration": 5272, + "src": "4926:27:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, "nodeType": "VariableDeclarationStatement", - "src": "10672:17:25" + "src": "4899:54:25" }, { "assignments": [ - 5679 + 5521 ], "declarations": [ { "constant": false, - "id": 5679, - "name": "oldTokenUnderlying", + "id": 5521, + "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 5803, - "src": "10699:26:25", + "scope": 5602, + "src": "5382:19:25", "stateVariable": false, "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5520, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "5382:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5529, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5527, + "name": "_protocolFee", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5489, + "src": "5434:12:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5524, + "name": "_aaveFee", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5487, + "src": "5420:8:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "id": 5522, + "name": "_loanAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5485, + "src": "5404:11:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5523, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 7584, + "src": "5404:15:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 5525, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5404:25:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5526, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 7584, + "src": "5404:29:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 5528, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5404:43:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "5382:65:25" + }, + { + "condition": { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "id": 5534, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "id": 5530, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5516, + "src": "5462:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" - }, - "typeName": { - "id": 5678, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "10699:7:25", - "stateMutability": "nonpayable", + } + }, + "nodeType": "BinaryOperation", + "operator": "==", + "rightExpression": { + "argumentTypes": null, + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "id": 5531, + "name": "addressRegistry", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5504, + "src": "5482:15:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_AddressRegistry_$7541", + "typeString": "contract AddressRegistry" + } + }, + "id": 5532, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "CEtherAddress", + "nodeType": "MemberAccess", + "referencedDeclaration": 7501, + "src": "5482:29:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" } }, - "value": null, - "visibility": "internal" - } - ], - "id": 5680, - "initialValue": null, - "nodeType": "VariableDeclarationStatement", - "src": "10699:26:25" - }, - { - "assignments": [ - 5682 - ], - "declarations": [ - { - "constant": false, - "id": 5682, - "name": "newTokenUnderlying", - "nodeType": "VariableDeclaration", - "scope": 5803, - "src": "10735:26:25", - "stateVariable": false, - "storageLocation": "default", + "id": 5533, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5482:31:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" + } + }, + "src": "5462:51:25", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + "falseBody": { + "id": 5561, + "nodeType": "Block", + "src": "5583:416:25", + "statements": [ + { + "assignments": [ + 5542 + ], + "declarations": [ + { + "constant": false, + "id": 5542, + "name": "newTokenUnderlying", + "nodeType": "VariableDeclaration", + "scope": 5561, + "src": "5681:26:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5541, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "5681:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5548, + "initialValue": { + "argumentTypes": null, + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5544, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5516, + "src": "5718:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5543, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "5710:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" + } + }, + "id": 5545, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5710:25:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" + } + }, + "id": 5546, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "underlying", + "nodeType": "MemberAccess", + "referencedDeclaration": 835, + "src": "5710:36:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" + } + }, + "id": 5547, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5710:38:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "5681:67:25" }, - "typeName": { - "id": 5681, - "name": "address", - "nodeType": "ElementaryTypeName", - "src": "10735:7:25", - "stateMutability": "nonpayable", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } + { + "assignments": [ + 5550 + ], + "declarations": [ + { + "constant": false, + "id": 5550, + "name": "newTokenUnderlyingAmount", + "nodeType": "VariableDeclaration", + "scope": 5561, + "src": "5762:32:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5549, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "5762:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5555, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5552, + "name": "newTokenUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5542, + "src": "5826:18:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5553, + "name": "repayAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5521, + "src": "5862:11:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5551, + "name": "_ethToToken", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 5011, + 5040 + ], + "referencedDeclaration": 5011, + "src": "5797:11:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,uint256) returns (uint256)" + } + }, + "id": 5554, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5797:90:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "5762:125:25" }, - "value": null, - "visibility": "internal" - } - ], - "id": 5683, - "initialValue": null, - "nodeType": "VariableDeclarationStatement", - "src": "10735:26:25" + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5557, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5516, + "src": "5945:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5558, + "name": "newTokenUnderlyingAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5550, + "src": "5963:24:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5556, + "name": "supply", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2507, + "src": "5938:6:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" + } + }, + "id": 5559, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5938:50:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5560, + "nodeType": "ExpressionStatement", + "src": "5938:50:25" + } + ] + }, + "id": 5562, + "nodeType": "IfStatement", + "src": "5458:541:25", + "trueBody": { + "id": 5540, + "nodeType": "Block", + "src": "5515:62:25", + "statements": [ + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5536, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5516, + "src": "5536:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5537, + "name": "repayAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5521, + "src": "5554:11:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5535, + "name": "supply", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2507, + "src": "5529:6:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" + } + }, + "id": 5538, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5529:37:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5539, + "nodeType": "ExpressionStatement", + "src": "5529:37:25" + } + ] + } }, { "condition": { @@ -17260,19 +14045,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5688, + "id": 5567, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5684, + "id": 5563, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5655, - "src": "10776:16:25", + "referencedDeclaration": 5511, + "src": "6071:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -17287,1055 +14072,1083 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5685, + "id": 5564, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5670, - "src": "10796:15:25", + "referencedDeclaration": 5504, + "src": "6091:15:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_AddressRegistry_$7541", + "typeString": "contract AddressRegistry" + } + }, + "id": 5565, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "CEtherAddress", + "nodeType": "MemberAccess", + "referencedDeclaration": 7501, + "src": "6091:29:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" + } + }, + "id": 5566, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "6091:31:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "src": "6071:51:25", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + "falseBody": { + "id": 5600, + "nodeType": "Block", + "src": "6202:609:25", + "statements": [ + { + "assignments": [ + 5575 + ], + "declarations": [ + { + "constant": false, + "id": 5575, + "name": "oldTokenUnderlying", + "nodeType": "VariableDeclaration", + "scope": 5600, + "src": "6297:26:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5574, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "6297:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5581, + "initialValue": { + "argumentTypes": null, + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5577, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5511, + "src": "6334:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5576, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "6326:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" + } + }, + "id": 5578, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "6326:25:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" + } + }, + "id": 5579, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "underlying", + "nodeType": "MemberAccess", + "referencedDeclaration": 835, + "src": "6326:36:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" + } + }, + "id": 5580, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "6326:38:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" + "typeIdentifier": "t_address", + "typeString": "address" } }, - "id": 5686, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "CEtherAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "10796:29:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5687, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "10796:31:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "src": "10776:51:25", - "typeDescriptions": { - "typeIdentifier": "t_bool", - "typeString": "bool" - } - }, - "falseBody": { - "condition": { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_address", - "typeString": "address" - }, - "id": 5720, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 5716, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "11325:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } + "nodeType": "VariableDeclarationStatement", + "src": "6297:67:25" }, - "nodeType": "BinaryOperation", - "operator": "==", - "rightExpression": { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], + { + "assignments": [ + 5583 + ], + "declarations": [ + { + "constant": false, + "id": 5583, + "name": "oldTokenUnderlyingAmount", + "nodeType": "VariableDeclaration", + "scope": 5600, + "src": "6378:32:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5582, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "6378:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5588, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5585, + "name": "oldTokenUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5575, + "src": "6451:18:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5586, + "name": "_loanAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5485, + "src": "6487:11:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], "expression": { - "argumentTypes": null, - "id": 5717, - "name": "addressRegistry", + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5584, + "name": "_getTokenToEthOutput", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5670, - "src": "11345:15:25", + "referencedDeclaration": 5202, + "src": "6413:20:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", - "typeString": "contract AddressRegistry" + "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 5718, + "id": 5587, "isConstant": false, "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "memberName": "CEtherAddress", - "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "11345:29:25", + "names": [], + "nodeType": "FunctionCall", + "src": "6413:99:25", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 5719, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11345:31:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } + "nodeType": "VariableDeclarationStatement", + "src": "6378:134:25" }, - "src": "11325:51:25", - "typeDescriptions": { - "typeIdentifier": "t_bool", - "typeString": "bool" - } - }, - "falseBody": { - "id": 5795, - "nodeType": "Block", - "src": "11868:764:25", - "statements": [ - { - "expression": { - "argumentTypes": null, - "id": 5754, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { + { + "expression": { + "argumentTypes": null, + "arguments": [ + { "argumentTypes": null, - "id": 5748, - "name": "oldTokenUnderlying", + "id": 5590, + "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5679, - "src": "11912:18:25", + "referencedDeclaration": 5511, + "src": "6572:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { + { "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5750, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5655, - "src": "11941:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5749, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "11933:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5751, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11933:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5752, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "11933:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5753, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11933:38:25", + "id": 5591, + "name": "oldTokenUnderlyingAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5583, + "src": "6590:24:25", "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { "typeIdentifier": "t_address", "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - }, - "src": "11912:59:25", + ], + "id": 5589, + "name": "redeemUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2689, + "src": "6555:16:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" } }, - "id": 5755, - "nodeType": "ExpressionStatement", - "src": "11912:59:25" + "id": 5592, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "6555:60:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } }, - { - "expression": { - "argumentTypes": null, - "id": 5762, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { + "id": 5593, + "nodeType": "ExpressionStatement", + "src": "6555:60:25" + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { "argumentTypes": null, - "id": 5756, - "name": "newTokenUnderlying", + "id": 5595, + "name": "oldTokenUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5682, - "src": "11985:18:25", + "referencedDeclaration": 5575, + "src": "6697:18:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { + { "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5758, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "12014:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5757, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "12006:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5759, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12006:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5760, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "12006:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5761, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12006:38:25", + "id": 5596, + "name": "oldTokenUnderlyingAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5583, + "src": "6733:24:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "src": "11985:59:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "id": 5763, - "nodeType": "ExpressionStatement", - "src": "11985:59:25" - }, - { - "assignments": [ - 5765 - ], - "declarations": [ { - "constant": false, - "id": 5765, - "name": "ethAmount", - "nodeType": "VariableDeclaration", - "scope": 5795, - "src": "12103:14:25", - "stateVariable": false, - "storageLocation": "default", + "argumentTypes": null, + "id": 5597, + "name": "_loanAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5485, + "src": "6775:11:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" - }, - "typeName": { - "id": 5764, - "name": "uint", - "nodeType": "ElementaryTypeName", - "src": "12103:4:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "value": null, - "visibility": "internal" + } } ], - "id": 5770, - "initialValue": { - "argumentTypes": null, - "arguments": [ + "expression": { + "argumentTypes": [ { - "argumentTypes": null, - "id": 5767, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5679, - "src": "12141:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } + "typeIdentifier": "t_address", + "typeString": "address" }, { - "argumentTypes": null, - "id": 5768, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "12161:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5766, - "name": "_getEthToTokenOutput", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5169, - "src": "12120:20:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) view returns (uint256)" - } - }, - "id": 5769, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12120:70:25", + "id": 5594, + "name": "_tokenToEth", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 5058, + 5097 + ], + "referencedDeclaration": 5097, + "src": "6668:11:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,uint256,uint256) returns (uint256)" } }, - "nodeType": "VariableDeclarationStatement", - "src": "12103:87:25" + "id": 5598, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "6668:132:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } }, - { - "expression": { - "argumentTypes": null, - "id": 5776, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { + "id": 5599, + "nodeType": "ExpressionStatement", + "src": "6668:132:25" + } + ] + }, + "id": 5601, + "nodeType": "IfStatement", + "src": "6067:744:25", + "trueBody": { + "id": 5573, + "nodeType": "Block", + "src": "6124:72:25", + "statements": [ + { + "expression": { + "argumentTypes": null, + "arguments": [ + { "argumentTypes": null, - "id": 5771, - "name": "borrowAmount", + "id": 5569, + "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "12251:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5773, - "name": "newTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5682, - "src": "12287:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5774, - "name": "ethAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5765, - "src": "12307:9:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5772, - "name": "_getTokenToEthOutput", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5150, - "src": "12266:20:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) view returns (uint256)" - } - }, - "id": 5775, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12266:51:25", + "referencedDeclaration": 5511, + "src": "6155:16:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } }, - "src": "12251:66:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5777, - "nodeType": "ExpressionStatement", - "src": "12251:66:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5779, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "12383:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5780, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "12401:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5778, - "name": "borrow", + { + "argumentTypes": null, + "id": 5570, + "name": "_loanAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "12376:6:25", + "referencedDeclaration": 5485, + "src": "6173:11:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - }, - "id": 5781, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12376:38:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" } - }, - "id": 5782, - "nodeType": "ExpressionStatement", - "src": "12376:38:25" - }, - { + ], "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5784, - "name": "newTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5682, - "src": "12491:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, + "argumentTypes": [ { - "argumentTypes": null, - "id": 5785, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "12511:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } + "typeIdentifier": "t_address", + "typeString": "address" }, { - "argumentTypes": null, - "id": 5786, - "name": "ethAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5765, - "src": "12525:9:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } + "typeIdentifier": "t_uint256", + "typeString": "uint256" } ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5783, - "name": "_tokenToEth", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 5006, - 5045 - ], - "referencedDeclaration": 5045, - "src": "12479:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256,uint256) returns (uint256)" - } - }, - "id": 5787, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12479:56:25", + "id": 5568, + "name": "redeemUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2689, + "src": "6138:16:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" } }, - "id": 5788, - "nodeType": "ExpressionStatement", - "src": "12479:56:25" + "id": 5571, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "6138:47:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5572, + "nodeType": "ExpressionStatement", + "src": "6138:47:25" + } + ] + } + } + ] + }, + "documentation": null, + "id": 5603, + "implemented": true, + "kind": "function", + "modifiers": [], + "name": "swapCollateralPostLoan", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 5492, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 5485, + "name": "_loanAmount", + "nodeType": "VariableDeclaration", + "scope": 5603, + "src": "4458:19:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5484, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "4458:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5487, + "name": "_aaveFee", + "nodeType": "VariableDeclaration", + "scope": 5603, + "src": "4487:16:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5486, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "4487:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5489, + "name": "_protocolFee", + "nodeType": "VariableDeclaration", + "scope": 5603, + "src": "4513:20:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5488, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "4513:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5491, + "name": "_data", + "nodeType": "VariableDeclaration", + "scope": 5603, + "src": "4543:20:25", + "stateVariable": false, + "storageLocation": "calldata", + "typeDescriptions": { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes" + }, + "typeName": { + "id": 5490, + "name": "bytes", + "nodeType": "ElementaryTypeName", + "src": "4543:5:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes_storage_ptr", + "typeString": "bytes" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "4448:121:25" + }, + "returnParameters": { + "id": 5493, + "nodeType": "ParameterList", + "parameters": [], + "src": "4579:0:25" + }, + "scope": 5887, + "src": "4417:2400:25", + "stateMutability": "nonpayable", + "superFunction": null, + "visibility": "external" + }, + { + "body": { + "id": 5707, + "nodeType": "Block", + "src": "8428:1988:25", + "statements": [ + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "id": 5623, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "id": 5621, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5611, + "src": "8459:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "BinaryOperation", + "operator": "!=", + "rightExpression": { + "argumentTypes": null, + "id": 5622, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5615, + "src": "8479:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } }, + "src": "8459:36:25", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + { + "argumentTypes": null, + "hexValue": "737761702d6f7065726174696f6e2d73616d652d61646472657373", + "id": 5624, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "8509:29:25", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_d3720a05a3789543893b88b135380c4cdf28a9da35d1c10271d675f5bcc08f5f", + "typeString": "literal_string \"swap-operation-same-address\"" + }, + "value": "swap-operation-same-address" + } + ], + "expression": { + "argumentTypes": [ { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5790, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5679, - "src": "12561:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5791, - "name": "ethAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5765, - "src": "12581:9:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - { - "argumentTypes": null, - "id": 5792, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "12592:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5789, - "name": "_ethToToken", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 4959, - 4988 - ], - "referencedDeclaration": 4988, - "src": "12549:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256,uint256) returns (uint256)" - } - }, - "id": 5793, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "12549:72:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5794, - "nodeType": "ExpressionStatement", - "src": "12549:72:25" + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_d3720a05a3789543893b88b135380c4cdf28a9da35d1c10271d675f5bcc08f5f", + "typeString": "literal_string \"swap-operation-same-address\"" } - ] + ], + "id": 5620, + "name": "require", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 7821, + 7822 + ], + "referencedDeclaration": 7822, + "src": "8438:7:25", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 5625, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "8438:110:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5626, + "nodeType": "ExpressionStatement", + "src": "8438:110:25" + }, + { + "assignments": [ + 5628 + ], + "declarations": [ + { + "constant": false, + "id": 5628, + "name": "addressRegistry", + "nodeType": "VariableDeclaration", + "scope": 5707, + "src": "8764:31:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_contract$_AddressRegistry_$7541", + "typeString": "contract AddressRegistry" + }, + "typeName": { + "contractScope": null, + "id": 5627, + "name": "AddressRegistry", + "nodeType": "UserDefinedTypeName", + "referencedDeclaration": 7541, + "src": "8764:15:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_AddressRegistry_$7541", + "typeString": "contract AddressRegistry" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5632, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5630, + "name": "addressRegistryAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5609, + "src": "8827:22:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5629, + "name": "AddressRegistry", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 7541, + "src": "8798:15:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", + "typeString": "type(contract AddressRegistry)" + } + }, + "id": 5631, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "8798:61:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_AddressRegistry_$7541", + "typeString": "contract AddressRegistry" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "8764:95:25" + }, + { + "assignments": [ + 5634 + ], + "declarations": [ + { + "constant": false, + "id": 5634, + "name": "ethDebtAmount", + "nodeType": "VariableDeclaration", + "scope": 5707, + "src": "8988:21:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5633, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "8988:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5635, + "initialValue": null, + "nodeType": "VariableDeclarationStatement", + "src": "8988:21:25" + }, + { + "condition": { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "id": 5640, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "id": 5636, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5611, + "src": "9024:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } }, - "id": 5796, - "nodeType": "IfStatement", - "src": "11321:1311:25", - "trueBody": { - "id": 5747, - "nodeType": "Block", - "src": "11378:484:25", - "statements": [ - { - "expression": { - "argumentTypes": null, - "id": 5727, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5721, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5679, - "src": "11420:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5723, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5655, - "src": "11449:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5722, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "11441:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5724, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11441:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5725, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "11441:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5726, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11441:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "src": "11420:59:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "id": 5728, - "nodeType": "ExpressionStatement", - "src": "11420:59:25" + "nodeType": "BinaryOperation", + "operator": "==", + "rightExpression": { + "argumentTypes": null, + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "id": 5637, + "name": "addressRegistry", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5628, + "src": "9044:15:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_AddressRegistry_$7541", + "typeString": "contract AddressRegistry" + } }, - { - "expression": { + "id": 5638, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "CEtherAddress", + "nodeType": "MemberAccess", + "referencedDeclaration": 7501, + "src": "9044:29:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" + } + }, + "id": 5639, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9044:31:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "src": "9024:51:25", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + "falseBody": { + "id": 5657, + "nodeType": "Block", + "src": "9147:228:25", + "statements": [ + { + "expression": { + "argumentTypes": null, + "id": 5655, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftHandSide": { "argumentTypes": null, - "id": 5734, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5729, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "11544:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5731, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5679, - "src": "11580:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5732, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "11600:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5730, - "name": "_getEthToTokenOutput", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5169, - "src": "11559:20:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) view returns (uint256)" - } - }, - "id": 5733, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11559:70:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "11544:85:25", + "id": 5646, + "name": "ethDebtAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5634, + "src": "9217:13:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5735, - "nodeType": "ExpressionStatement", - "src": "11544:85:25" - }, - { - "expression": { + "nodeType": "Assignment", + "operator": "=", + "rightHandSide": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5737, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "11693:16:25", + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5649, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5611, + "src": "9279:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5648, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "9271:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" + } + }, + "id": 5650, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9271:25:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" + } + }, + "id": 5651, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "underlying", + "nodeType": "MemberAccess", + "referencedDeclaration": 835, + "src": "9271:36:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" + } + }, + "id": 5652, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9271:38:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -18343,12 +15156,12 @@ }, { "argumentTypes": null, - "id": 5738, - "name": "borrowAmount", + "id": 5653, + "name": "oldTokenUnderlyingDelta", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "11711:12:25", + "referencedDeclaration": 5613, + "src": "9327:23:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -18366,18 +15179,18 @@ "typeString": "uint256" } ], - "id": 5736, - "name": "borrow", + "id": 5647, + "name": "_getEthToTokenOutput", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "11686:6:25", + "referencedDeclaration": 5221, + "src": "9233:20:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" + "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 5739, + "id": 5654, "isConstant": false, "isLValue": false, "isPure": false, @@ -18385,284 +15198,342 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "11686:38:25", + "src": "9233:131:25", "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 5740, - "nodeType": "ExpressionStatement", - "src": "11686:38:25" + "src": "9217:147:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } }, - { - "expression": { + "id": 5656, + "nodeType": "ExpressionStatement", + "src": "9217:147:25" + } + ] + }, + "id": 5658, + "nodeType": "IfStatement", + "src": "9020:355:25", + "trueBody": { + "id": 5645, + "nodeType": "Block", + "src": "9077:64:25", + "statements": [ + { + "expression": { + "argumentTypes": null, + "id": 5643, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftHandSide": { "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5742, - "name": "oldTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5679, - "src": "11788:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5743, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "11808:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - { - "argumentTypes": null, - "id": 5744, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "11822:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5741, - "name": "_ethToToken", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 4959, - 4988 - ], - "referencedDeclaration": 4988, - "src": "11776:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256,uint256) returns (uint256)" - } - }, - "id": 5745, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11776:75:25", + "id": 5641, + "name": "ethDebtAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5634, + "src": "9091:13:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5746, - "nodeType": "ExpressionStatement", - "src": "11776:75:25" + "nodeType": "Assignment", + "operator": "=", + "rightHandSide": { + "argumentTypes": null, + "id": 5642, + "name": "oldTokenUnderlyingDelta", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5613, + "src": "9107:23:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "src": "9091:39:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5644, + "nodeType": "ExpressionStatement", + "src": "9091:39:25" + } + ] + } + }, + { + "assignments": [ + 5660 + ], + "declarations": [ + { + "constant": false, + "id": 5660, + "name": "addressAndExecuteOperationCalldataParams", + "nodeType": "VariableDeclaration", + "scope": 5707, + "src": "9524:53:25", + "stateVariable": false, + "storageLocation": "memory", + "typeDescriptions": { + "typeIdentifier": "t_bytes_memory_ptr", + "typeString": "bytes" + }, + "typeName": { + "id": 5659, + "name": "bytes", + "nodeType": "ElementaryTypeName", + "src": "9524:5:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes_storage_ptr", + "typeString": "bytes" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5669, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5665, + "name": "dedgeCompoundManagerAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5605, + "src": "9634:27:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "expression": { + "argumentTypes": null, + "id": 5663, + "name": "abi", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 7805, + "src": "9623:3:25", + "typeDescriptions": { + "typeIdentifier": "t_magic_abi", + "typeString": "abi" + } + }, + "id": 5664, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "memberName": "encode", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "9623:10:25", + "typeDescriptions": { + "typeIdentifier": "t_function_abiencode_pure$__$returns$_t_bytes_memory_ptr_$", + "typeString": "function () pure returns (bytes memory)" + } + }, + "id": 5666, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9623:39:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes_memory_ptr", + "typeString": "bytes memory" + } + }, + { + "argumentTypes": null, + "id": 5667, + "name": "executeOperationCalldataParams", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5617, + "src": "9676:30:25", + "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, + "id": 5661, + "name": "abi", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 7805, + "src": "9580:3:25", + "typeDescriptions": { + "typeIdentifier": "t_magic_abi", + "typeString": "abi" } - ] + }, + "id": 5662, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "memberName": "encodePacked", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "9580:29:25", + "typeDescriptions": { + "typeIdentifier": "t_function_abiencodepacked_pure$__$returns$_t_bytes_memory_ptr_$", + "typeString": "function () pure returns (bytes memory)" + } + }, + "id": 5668, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9580:136:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes_memory_ptr", + "typeString": "bytes memory" } }, - "id": 5797, - "nodeType": "IfStatement", - "src": "10772:1860:25", - "trueBody": { - "id": 5715, - "nodeType": "Block", - "src": "10829:486:25", - "statements": [ + "nodeType": "VariableDeclarationStatement", + "src": "9524:192:25" + }, + { + "assignments": [ + 5671 + ], + "declarations": [ + { + "constant": false, + "id": 5671, + "name": "lendingPool", + "nodeType": "VariableDeclaration", + "scope": 5707, + "src": "9727:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ILendingPool_$546", + "typeString": "contract ILendingPool" + }, + "typeName": { + "contractScope": null, + "id": 5670, + "name": "ILendingPool", + "nodeType": "UserDefinedTypeName", + "referencedDeclaration": 546, + "src": "9727:12:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ILendingPool_$546", + "typeString": "contract ILendingPool" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5681, + "initialValue": { + "argumentTypes": null, + "arguments": [ { + "argumentTypes": null, + "arguments": [], "expression": { - "argumentTypes": null, - "id": 5695, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5689, - "name": "newTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5682, - "src": "10871:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { + "argumentTypes": [], + "expression": { "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { + "arguments": [ + { "argumentTypes": null, - "arguments": [ - { + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { "argumentTypes": null, - "id": 5691, - "name": "newCTokenAddress", + "id": 5674, + "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "10900:16:25", + "referencedDeclaration": 5628, + "src": "9827:15:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_contract$_AddressRegistry_$7541", + "typeString": "contract AddressRegistry" } - ], - "id": 5690, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "10892:7:25", + }, + "id": 5675, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "AaveLendingPoolAddressProviderAddress", + "nodeType": "MemberAccess", + "referencedDeclaration": 7486, + "src": "9827:53:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" } }, - "id": 5692, + "id": 5676, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "typeConversion", + "kind": "functionCall", "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "10892:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5693, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "10892:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5694, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "10892:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "src": "10871:59:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - "id": 5696, - "nodeType": "ExpressionStatement", - "src": "10871:59:25" - }, - { - "expression": { - "argumentTypes": null, - "id": 5702, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5697, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "10995:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5699, - "name": "newTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5682, - "src": "11031:18:25", + "src": "9827:55:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } - }, - { - "argumentTypes": null, - "id": 5700, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "11051:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } } ], "expression": { @@ -18670,211 +15541,359 @@ { "typeIdentifier": "t_address", "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5698, - "name": "_getTokenToEthOutput", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5150, - "src": "11010:20:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) view returns (uint256)" - } - }, - "id": 5701, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11010:70:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "10995:85:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 5703, - "nodeType": "ExpressionStatement", - "src": "10995:85:25" - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5705, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5659, - "src": "11146:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5706, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "11164:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + } + ], + "id": 5673, + "name": "ILendingPoolAddressesProvider", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 659, + "src": "9780:29:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ILendingPoolAddressesProvider_$659_$", + "typeString": "type(contract ILendingPoolAddressesProvider)" } - ], - "id": 5704, - "name": "borrow", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2443, - "src": "11139:6:25", + }, + "id": 5677, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9780:116:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" + "typeIdentifier": "t_contract$_ILendingPoolAddressesProvider_$659", + "typeString": "contract ILendingPoolAddressesProvider" } }, - "id": 5707, + "id": 5678, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11139:38:25", + "memberName": "getLendingPool", + "nodeType": "MemberAccess", + "referencedDeclaration": 553, + "src": "9780:148:25", "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" } }, - "id": 5708, - "nodeType": "ExpressionStatement", - "src": "11139:38:25" + "id": 5679, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9780:150:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5672, + "name": "ILendingPool", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 546, + "src": "9754:12:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ILendingPool_$546_$", + "typeString": "type(contract ILendingPool)" + } + }, + "id": 5680, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9754:186:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ILendingPool_$546", + "typeString": "contract ILendingPool" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "9727:213:25" + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5683, + "name": "dacProxyAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5607, + "src": "10014:15:25", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } }, { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5685, + "name": "lendingPool", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5671, + "src": "10039:11:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ILendingPool_$546", + "typeString": "contract ILendingPool" + } + } + ], "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5710, - "name": "newTokenUnderlying", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5682, - "src": "11241:18:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5711, - "name": "borrowAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5676, - "src": "11261:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, + "argumentTypes": [ { - "argumentTypes": null, - "id": 5712, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "11275:28:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } + "typeIdentifier": "t_contract$_ILendingPool_$546", + "typeString": "contract ILendingPool" } ], + "id": 5684, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "10031:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_address_$", + "typeString": "type(address)" + }, + "typeName": "address" + }, + "id": 5686, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10031:20:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5682, + "name": "_proxyGuardPermit", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5314, + "src": "9996:17:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", + "typeString": "function (address payable,address)" + } + }, + "id": 5687, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "9996:56:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5688, + "nodeType": "ExpressionStatement", + "src": "9996:56:25" + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5692, + "name": "dacProxyAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5607, + "src": "10145:15:25", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + }, + { + "argumentTypes": null, + "arguments": [], + "expression": { + "argumentTypes": [], "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5709, - "name": "_tokenToEth", + "argumentTypes": null, + "id": 5693, + "name": "addressRegistry", "nodeType": "Identifier", - "overloadedDeclarations": [ - 5006, - 5045 - ], - "referencedDeclaration": 5045, - "src": "11229:11:25", + "overloadedDeclarations": [], + "referencedDeclaration": 5628, + "src": "10174:15:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256,uint256) returns (uint256)" + "typeIdentifier": "t_contract$_AddressRegistry_$7541", + "typeString": "contract AddressRegistry" } }, - "id": 5713, + "id": 5694, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "11229:75:25", + "memberName": "AaveEthAddress", + "nodeType": "MemberAccess", + "referencedDeclaration": 7489, + "src": "10174:30:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" } }, - "id": 5714, - "nodeType": "ExpressionStatement", - "src": "11229:75:25" + "id": 5695, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10174:32:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5696, + "name": "ethDebtAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5634, + "src": "10220:13:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + { + "argumentTypes": null, + "id": 5697, + "name": "addressAndExecuteOperationCalldataParams", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5660, + "src": "10247:40:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes_memory_ptr", + "typeString": "bytes memory" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + { + "typeIdentifier": "t_bytes_memory_ptr", + "typeString": "bytes memory" + } + ], + "expression": { + "argumentTypes": null, + "id": 5689, + "name": "lendingPool", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5671, + "src": "10110:11:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ILendingPool_$546", + "typeString": "contract ILendingPool" + } + }, + "id": 5691, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "flashLoan", + "nodeType": "MemberAccess", + "referencedDeclaration": 442, + "src": "10110:21:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_address_$_t_uint256_$_t_bytes_memory_ptr_$returns$__$", + "typeString": "function (address,address,uint256,bytes memory) external" } - ] - } + }, + "id": 5698, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10110:187:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5699, + "nodeType": "ExpressionStatement", + "src": "10110:187:25" }, { "expression": { @@ -18882,54 +15901,92 @@ "arguments": [ { "argumentTypes": null, - "id": 5799, - "name": "oldCTokenAddress", + "id": 5701, + "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5655, - "src": "12681:16:25", + "referencedDeclaration": 5607, + "src": "10371:15:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_address_payable", + "typeString": "address payable" } }, { "argumentTypes": null, - "id": 5800, - "name": "oldTokenUnderlyingDustAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5657, - "src": "12699:28:25", + "arguments": [ + { + "argumentTypes": null, + "id": 5703, + "name": "lendingPool", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5671, + "src": "10396:11:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ILendingPool_$546", + "typeString": "contract ILendingPool" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_contract$_ILendingPool_$546", + "typeString": "contract ILendingPool" + } + ], + "id": 5702, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "10388:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_address_$", + "typeString": "type(address)" + }, + "typeName": "address" + }, + "id": 5704, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "10388:20:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } } ], "expression": { "argumentTypes": [ { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_address_payable", + "typeString": "address payable" }, { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_address", + "typeString": "address" } ], - "id": 5798, - "name": "repayBorrow", + "id": 5700, + "name": "_proxyGuardForbid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2521, - "src": "12669:11:25", + "referencedDeclaration": 5355, + "src": "10353:17:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", + "typeString": "function (address payable,address)" } }, - "id": 5801, + "id": 5705, "isConstant": false, "isLValue": false, "isPure": false, @@ -18937,36 +15994,90 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "12669:59:25", + "src": "10353:56:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5802, + "id": 5706, "nodeType": "ExpressionStatement", - "src": "12669:59:25" + "src": "10353:56:25" } ] }, "documentation": null, - "id": 5804, + "id": 5708, "implemented": true, "kind": "function", "modifiers": [], - "name": "clearDebtDust", + "name": "swapOperation", "nodeType": "FunctionDefinition", "parameters": { - "id": 5660, + "id": 5618, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5653, + "id": 5605, + "name": "dedgeCompoundManagerAddress", + "nodeType": "VariableDeclaration", + "scope": 5708, + "src": "8038:35:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5604, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "8038:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5607, + "name": "dacProxyAddress", + "nodeType": "VariableDeclaration", + "scope": 5708, + "src": "8083:31:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + "typeName": { + "id": 5606, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "8083:15:25", + "stateMutability": "payable", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5609, "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 5804, - "src": "10026:30:25", + "scope": 5708, + "src": "8124:30:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -18974,10 +16085,10 @@ "typeString": "address" }, "typeName": { - "id": 5652, + "id": 5608, "name": "address", "nodeType": "ElementaryTypeName", - "src": "10026:7:25", + "src": "8124:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18989,11 +16100,11 @@ }, { "constant": false, - "id": 5655, + "id": 5611, "name": "oldCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 5804, - "src": "10066:24:25", + "scope": 5708, + "src": "8164:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19001,10 +16112,10 @@ "typeString": "address" }, "typeName": { - "id": 5654, + "id": 5610, "name": "address", "nodeType": "ElementaryTypeName", - "src": "10066:7:25", + "src": "8164:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19016,11 +16127,11 @@ }, { "constant": false, - "id": 5657, - "name": "oldTokenUnderlyingDustAmount", + "id": 5613, + "name": "oldTokenUnderlyingDelta", "nodeType": "VariableDeclaration", - "scope": 5804, - "src": "10100:33:25", + "scope": 5708, + "src": "8242:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19028,10 +16139,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5656, - "name": "uint", + "id": 5612, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "10100:4:25", + "src": "8242:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19042,11 +16153,11 @@ }, { "constant": false, - "id": 5659, + "id": 5615, "name": "newCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 5804, - "src": "10143:24:25", + "scope": 5708, + "src": "8329:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19054,10 +16165,10 @@ "typeString": "address" }, "typeName": { - "id": 5658, + "id": 5614, "name": "address", "nodeType": "ElementaryTypeName", - "src": "10143:7:25", + "src": "8329:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19066,27 +16177,53 @@ }, "value": null, "visibility": "internal" + }, + { + "constant": false, + "id": 5617, + "name": "executeOperationCalldataParams", + "nodeType": "VariableDeclaration", + "scope": 5708, + "src": "8363:43:25", + "stateVariable": false, + "storageLocation": "memory", + "typeDescriptions": { + "typeIdentifier": "t_bytes_memory_ptr", + "typeString": "bytes" + }, + "typeName": { + "id": 5616, + "name": "bytes", + "nodeType": "ElementaryTypeName", + "src": "8363:5:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes_storage_ptr", + "typeString": "bytes" + } + }, + "value": null, + "visibility": "internal" } ], - "src": "10016:157:25" + "src": "8028:384:25" }, "returnParameters": { - "id": 5661, + "id": 5619, "nodeType": "ParameterList", "parameters": [], - "src": "10189:0:25" + "src": "8428:0:25" }, - "scope": 5896, - "src": "9994:2741:25", + "scope": 5887, + "src": "8006:2410:25", "stateMutability": "payable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 5894, + "id": 5798, "nodeType": "Block", - "src": "12938:1492:25", + "src": "10702:1551:25", "statements": [ { "expression": { @@ -19098,19 +16235,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5818, + "id": 5722, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5816, + "id": 5720, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5808, - "src": "13292:16:25", + "referencedDeclaration": 5712, + "src": "11069:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19120,18 +16257,18 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 5817, + "id": 5721, "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5812, - "src": "13312:16:25", + "referencedDeclaration": 5716, + "src": "11089:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "13292:36:25", + "src": "11069:36:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -19140,14 +16277,14 @@ { "argumentTypes": null, "hexValue": "636c6561722d636f6c6c61746572616c2d73616d652d61646472657373", - "id": 5819, + "id": 5723, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "13330:31:25", + "src": "11119:31:25", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_edcd146ca03620acad0398928a21180b949d6d0e47fbb0206aa2e50ad659e735", @@ -19167,21 +16304,21 @@ "typeString": "literal_string \"clear-collateral-same-address\"" } ], - "id": 5815, + "id": 5719, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, - "src": "13284:7:25", + "referencedDeclaration": 7822, + "src": "11048:7:25", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 5820, + "id": 5724, "isConstant": false, "isLValue": false, "isPure": false, @@ -19189,28 +16326,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13284:78:25", + "src": "11048:112:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5821, + "id": 5725, "nodeType": "ExpressionStatement", - "src": "13284:78:25" + "src": "11048:112:25" }, { "assignments": [ - 5823 + 5727 ], "declarations": [ { "constant": false, - "id": 5823, + "id": 5727, "name": "supplyAmount", "nodeType": "VariableDeclaration", - "scope": 5894, - "src": "13373:17:25", + "scope": 5798, + "src": "11171:20:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -19218,10 +16355,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5822, - "name": "uint", + "id": 5726, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "13373:4:25", + "src": "11171:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19231,38 +16368,38 @@ "visibility": "internal" } ], - "id": 5824, + "id": 5728, "initialValue": null, "nodeType": "VariableDeclarationStatement", - "src": "13373:17:25" + "src": "11171:20:25" }, { "assignments": [ - 5826 + 5730 ], "declarations": [ { "constant": false, - "id": 5826, + "id": 5730, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 5894, - "src": "13400:31:25", + "scope": 5798, + "src": "11201:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 5825, + "id": 5729, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, - "src": "13400:15:25", + "referencedDeclaration": 7541, + "src": "11201:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -19270,18 +16407,18 @@ "visibility": "internal" } ], - "id": 5830, + "id": 5734, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5828, + "id": 5732, "name": "addressRegistryAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5806, - "src": "13450:22:25", + "referencedDeclaration": 5710, + "src": "11264:22:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19295,18 +16432,18 @@ "typeString": "address" } ], - "id": 5827, + "id": 5731, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, - "src": "13434:15:25", + "referencedDeclaration": 7541, + "src": "11235:15:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 5829, + "id": 5733, "isConstant": false, "isLValue": false, "isPure": false, @@ -19314,14 +16451,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13434:39:25", + "src": "11235:61:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, "nodeType": "VariableDeclarationStatement", - "src": "13400:73:25" + "src": "11201:95:25" }, { "expression": { @@ -19329,12 +16466,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5832, + "id": 5736, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5808, - "src": "13531:16:25", + "referencedDeclaration": 5712, + "src": "11354:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19342,12 +16479,12 @@ }, { "argumentTypes": null, - "id": 5833, + "id": 5737, "name": "oldTokenUnderlyingAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5810, - "src": "13549:24:25", + "referencedDeclaration": 5714, + "src": "11372:24:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19365,18 +16502,18 @@ "typeString": "uint256" } ], - "id": 5831, + "id": 5735, "name": "redeemUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2605, - "src": "13514:16:25", + "referencedDeclaration": 2689, + "src": "11337:16:25", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 5834, + "id": 5738, "isConstant": false, "isLValue": false, "isPure": false, @@ -19384,15 +16521,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13514:60:25", + "src": "11337:60:25", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 5835, + "id": 5739, "nodeType": "ExpressionStatement", - "src": "13514:60:25" + "src": "11337:60:25" }, { "condition": { @@ -19401,19 +16538,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5840, + "id": 5744, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5836, + "id": 5740, "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5808, - "src": "13589:16:25", + "referencedDeclaration": 5712, + "src": "11412:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19428,32 +16565,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5837, + "id": 5741, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5826, - "src": "13609:15:25", + "referencedDeclaration": 5730, + "src": "11432:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 5838, + "id": 5742, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "13609:29:25", + "referencedDeclaration": 7501, + "src": "11432:29:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5839, + "id": 5743, "isConstant": false, "isLValue": false, "isPure": false, @@ -19461,13 +16598,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13609:31:25", + "src": "11432:31:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "13589:51:25", + "src": "11412:51:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -19480,19 +16617,19 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 5857, + "id": 5761, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5853, + "id": 5757, "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5812, - "src": "13843:16:25", + "referencedDeclaration": 5716, + "src": "11666:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19507,32 +16644,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 5854, + "id": 5758, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5826, - "src": "13863:15:25", + "referencedDeclaration": 5730, + "src": "11686:15:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 5855, + "id": 5759, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, - "src": "13863:29:25", + "referencedDeclaration": 7501, + "src": "11686:29:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5856, + "id": 5760, "isConstant": false, "isLValue": false, "isPure": false, @@ -19540,39 +16677,39 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "13863:31:25", + "src": "11686:31:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "13843:51:25", + "src": "11666:51:25", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": { - "id": 5886, + "id": 5790, "nodeType": "Block", - "src": "14093:251:25", + "src": "11916:251:25", "statements": [ { "expression": { "argumentTypes": null, - "id": 5884, + "id": 5788, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 5870, + "id": 5774, "name": "supplyAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5823, - "src": "14137:12:25", + "referencedDeclaration": 5727, + "src": "11960:12:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19593,12 +16730,94 @@ "arguments": [ { "argumentTypes": null, - "id": 5873, - "name": "oldCTokenAddress", + "id": 5777, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5712, + "src": "12014:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5776, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "12006:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" + } + }, + "id": 5778, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "12006:25:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" + } + }, + "id": 5779, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "underlying", + "nodeType": "MemberAccess", + "referencedDeclaration": 835, + "src": "12006:36:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" + } + }, + "id": 5780, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "12006:38:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5782, + "name": "newCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5808, - "src": "14191:16:25", + "referencedDeclaration": 5716, + "src": "12070:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19612,18 +16831,18 @@ "typeString": "address" } ], - "id": 5872, + "id": 5781, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "14183:7:25", + "referencedDeclaration": 884, + "src": "12062:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 5874, + "id": 5783, "isConstant": false, "isLValue": false, "isPure": false, @@ -19631,27 +16850,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14183:25:25", + "src": "12062:25:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 5875, + "id": 5784, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "14183:36:25", + "referencedDeclaration": 835, + "src": "12062:36:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5876, + "id": 5785, "isConstant": false, "isLValue": false, "isPure": false, @@ -19659,12 +16878,115 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14183:38:25", + "src": "12062:38:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, + { + "argumentTypes": null, + "id": 5786, + "name": "oldTokenUnderlyingAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5714, + "src": "12118:24:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5775, + "name": "_tokenToToken", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 5124, + 5145 + ], + "referencedDeclaration": 5145, + "src": "11975:13:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,address,uint256) returns (uint256)" + } + }, + "id": 5787, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "11975:181:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "src": "11960:196:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5789, + "nodeType": "ExpressionStatement", + "src": "11960:196:25" + } + ] + }, + "id": 5791, + "nodeType": "IfStatement", + "src": "11662:505:25", + "trueBody": { + "id": 5773, + "nodeType": "Block", + "src": "11719:191:25", + "statements": [ + { + "expression": { + "argumentTypes": null, + "id": 5771, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftHandSide": { + "argumentTypes": null, + "id": 5762, + "name": "supplyAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5727, + "src": "11761:12:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "Assignment", + "operator": "=", + "rightHandSide": { + "argumentTypes": null, + "arguments": [ { "argumentTypes": null, "arguments": [], @@ -19675,12 +16997,12 @@ "arguments": [ { "argumentTypes": null, - "id": 5878, - "name": "newCTokenAddress", + "id": 5765, + "name": "oldCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5812, - "src": "14247:16:25", + "referencedDeclaration": 5712, + "src": "11813:16:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19694,18 +17016,18 @@ "typeString": "address" } ], - "id": 5877, + "id": 5764, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "14239:7:25", + "referencedDeclaration": 884, + "src": "11805:7:25", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 5879, + "id": 5766, "isConstant": false, "isLValue": false, "isPure": false, @@ -19713,27 +17035,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14239:25:25", + "src": "11805:25:25", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 5880, + "id": 5767, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "14239:36:25", + "referencedDeclaration": 835, + "src": "11805:36:25", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 5881, + "id": 5768, "isConstant": false, "isLValue": false, "isPure": false, @@ -19741,7 +17063,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14239:38:25", + "src": "11805:38:25", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -19749,12 +17071,12 @@ }, { "argumentTypes": null, - "id": 5882, + "id": 5769, "name": "oldTokenUnderlyingAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5810, - "src": "14295:24:25", + "referencedDeclaration": 5714, + "src": "11861:24:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -19763,10 +17085,6 @@ ], "expression": { "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, { "typeIdentifier": "t_address", "typeString": "address" @@ -19776,21 +17094,21 @@ "typeString": "uint256" } ], - "id": 5871, - "name": "_tokenToToken", + "id": 5763, + "name": "_tokenToEth", "nodeType": "Identifier", "overloadedDeclarations": [ - 5072, - 5093 + 5058, + 5097 ], - "referencedDeclaration": 5093, - "src": "14152:13:25", + "referencedDeclaration": 5058, + "src": "11776:11:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,address,uint256) returns (uint256)" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 5883, + "id": 5770, "isConstant": false, "isLValue": false, "isPure": false, @@ -19798,479 +17116,1485 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "14152:181:25", + "src": "11776:123:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "src": "11761:138:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5772, + "nodeType": "ExpressionStatement", + "src": "11761:138:25" + } + ] + } + }, + "id": 5792, + "nodeType": "IfStatement", + "src": "11408:759:25", + "trueBody": { + "id": 5756, + "nodeType": "Block", + "src": "11465:191:25", + "statements": [ + { + "expression": { + "argumentTypes": null, + "id": 5754, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftHandSide": { + "argumentTypes": null, + "id": 5745, + "name": "supplyAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5727, + "src": "11507:12:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "Assignment", + "operator": "=", + "rightHandSide": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "arguments": [], + "expression": { + "argumentTypes": [], + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5748, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5716, + "src": "11559:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5747, + "name": "ICToken", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 884, + "src": "11551:7:25", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", + "typeString": "type(contract ICToken)" + } + }, + "id": 5749, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "11551:25:25", + "typeDescriptions": { + "typeIdentifier": "t_contract$_ICToken_$884", + "typeString": "contract ICToken" + } + }, + "id": 5750, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "underlying", + "nodeType": "MemberAccess", + "referencedDeclaration": 835, + "src": "11551:36:25", + "typeDescriptions": { + "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", + "typeString": "function () view external returns (address)" + } + }, + "id": 5751, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "11551:38:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5752, + "name": "oldTokenUnderlyingAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5714, + "src": "11607:24:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5746, + "name": "_ethToToken", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 5011, + 5040 + ], + "referencedDeclaration": 5011, + "src": "11522:11:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (address,uint256) returns (uint256)" } }, - "src": "14137:196:25", + "id": 5753, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "11522:123:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5885, - "nodeType": "ExpressionStatement", - "src": "14137:196:25" + "src": "11507:138:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5755, + "nodeType": "ExpressionStatement", + "src": "11507:138:25" + } + ] + } + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5794, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5716, + "src": "12215:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" } - ] + }, + { + "argumentTypes": null, + "id": 5795, + "name": "supplyAmount", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5727, + "src": "12233:12:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "id": 5793, + "name": "supply", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2507, + "src": "12208:6:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", + "typeString": "function (address,uint256)" + } + }, + "id": 5796, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "12208:38:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5797, + "nodeType": "ExpressionStatement", + "src": "12208:38:25" + } + ] + }, + "documentation": null, + "id": 5799, + "implemented": true, + "kind": "function", + "modifiers": [], + "name": "_clearCollateralDust", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 5717, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 5710, + "name": "addressRegistryAddress", + "nodeType": "VariableDeclaration", + "scope": 5799, + "src": "10546:30:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5709, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "10546:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5712, + "name": "oldCTokenAddress", + "nodeType": "VariableDeclaration", + "scope": 5799, + "src": "10586:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5711, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "10586:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5714, + "name": "oldTokenUnderlyingAmount", + "nodeType": "VariableDeclaration", + "scope": 5799, + "src": "10620:32:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5713, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "10620:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5716, + "name": "newCTokenAddress", + "nodeType": "VariableDeclaration", + "scope": 5799, + "src": "10662:24:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5715, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "10662:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "10536:156:25" + }, + "returnParameters": { + "id": 5718, + "nodeType": "ParameterList", + "parameters": [], + "src": "10702:0:25" + }, + "scope": 5887, + "src": "10507:1746:25", + "stateMutability": "nonpayable", + "superFunction": null, + "visibility": "internal" + }, + { + "body": { + "id": 5885, + "nodeType": "Block", + "src": "13024:1924:25", + "statements": [ + { + "assignments": [ + 5817 + ], + "declarations": [ + { + "constant": false, + "id": 5817, + "name": "initialBorrowBalanceUnderlying", + "nodeType": "VariableDeclaration", + "scope": 5885, + "src": "13034:38:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5816, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "13034:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5822, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5819, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5807, + "src": "13115:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5820, + "name": "dacProxyAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5803, + "src": "13145:15:25", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + ], + "id": 5818, + "name": "getBorrowBalanceUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2238, + "src": "13075:26:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$returns$_t_uint256_$", + "typeString": "function (address,address) view returns (uint256)" + } }, - "id": 5887, - "nodeType": "IfStatement", - "src": "13839:505:25", - "trueBody": { - "id": 5869, - "nodeType": "Block", - "src": "13896:191:25", - "statements": [ + "id": 5821, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "13075:95:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "13034:136:25" + }, + { + "assignments": [ + 5824 + ], + "declarations": [ + { + "constant": false, + "id": 5824, + "name": "oldTokenUnderlyingDeltaFixed", + "nodeType": "VariableDeclaration", + "scope": 5885, + "src": "13375:36:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5823, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "13375:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5826, + "initialValue": { + "argumentTypes": null, + "id": 5825, + "name": "oldTokenUnderlyingDelta", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5809, + "src": "13414:23:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "13375:62:25" + }, + { + "assignments": [ + 5828 + ], + "declarations": [ + { + "constant": false, + "id": 5828, + "name": "oldTokenUnderlyingDeltaThreshold", + "nodeType": "VariableDeclaration", + "scope": 5885, + "src": "13447:40:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5827, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "13447:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5836, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "313030", + "id": 5834, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "13533:3:25", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + }, + "value": "100" + } + ], + "expression": { + "argumentTypes": [ { - "expression": { + "typeIdentifier": "t_rational_100_by_1", + "typeString": "int_const 100" + } + ], + "expression": { + "argumentTypes": null, + "arguments": [ + { "argumentTypes": null, - "id": 5867, + "hexValue": "3935", + "id": 5831, "isConstant": false, "isLValue": false, - "isPure": false, + "isPure": true, + "kind": "number", "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5858, - "name": "supplyAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5823, - "src": "13938:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5861, - "name": "oldCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5808, - "src": "13990:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5860, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "13982:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5862, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13982:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5863, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "13982:36:25", - "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" - } - }, - "id": 5864, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13982:38:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5865, - "name": "oldTokenUnderlyingAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5810, - "src": "14038:24:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5859, - "name": "_tokenToEth", - "nodeType": "Identifier", - "overloadedDeclarations": [ - 5006, - 5045 - ], - "referencedDeclaration": 5006, - "src": "13953:11:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) returns (uint256)" - } - }, - "id": 5866, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13953:123:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } + "nodeType": "Literal", + "src": "13525:2:25", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_95_by_1", + "typeString": "int_const 95" }, - "src": "13938:138:25", + "value": "95" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_95_by_1", + "typeString": "int_const 95" + } + ], + "expression": { + "argumentTypes": null, + "id": 5829, + "name": "initialBorrowBalanceUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5817, + "src": "13490:30:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5830, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "mul", + "nodeType": "MemberAccess", + "referencedDeclaration": 7645, + "src": "13490:34:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 5832, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "13490:38:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5833, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "div", + "nodeType": "MemberAccess", + "referencedDeclaration": 7661, + "src": "13490:42:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 5835, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "13490:47:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "13447:90:25" + }, + { + "condition": { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "id": 5839, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "id": 5837, + "name": "oldTokenUnderlyingDelta", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5809, + "src": "13560:23:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "BinaryOperation", + "operator": ">", + "rightExpression": { + "argumentTypes": null, + "id": 5838, + "name": "oldTokenUnderlyingDeltaThreshold", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5828, + "src": "13586:32:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "src": "13560:58:25", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + "falseBody": null, + "id": 5845, + "nodeType": "IfStatement", + "src": "13556:152:25", + "trueBody": { + "id": 5844, + "nodeType": "Block", + "src": "13620:88:25", + "statements": [ + { + "expression": { + "argumentTypes": null, + "id": 5842, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftHandSide": { + "argumentTypes": null, + "id": 5840, + "name": "oldTokenUnderlyingDeltaFixed", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5824, + "src": "13634:28:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 5868, - "nodeType": "ExpressionStatement", - "src": "13938:138:25" + "nodeType": "Assignment", + "operator": "=", + "rightHandSide": { + "argumentTypes": null, + "id": 5841, + "name": "oldTokenUnderlyingDeltaThreshold", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5828, + "src": "13665:32:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "src": "13634:63:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5843, + "nodeType": "ExpressionStatement", + "src": "13634:63:25" + } + ] + } + }, + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5847, + "name": "dedgeCompoundManagerAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5801, + "src": "13783:27:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5848, + "name": "dacProxyAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5803, + "src": "13824:15:25", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + }, + { + "argumentTypes": null, + "id": 5849, + "name": "addressRegistryAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5805, + "src": "13853:22:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5850, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5807, + "src": "13889:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5851, + "name": "oldTokenUnderlyingDeltaFixed", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5824, + "src": "13919:28:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + { + "argumentTypes": null, + "id": 5852, + "name": "newCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5811, + "src": "13961:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5853, + "name": "executeOperationCalldataParams", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5813, + "src": "13991:30:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + ], + "id": 5846, + "name": "swapOperation", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5708, + "src": "13756:13:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_payable_$_t_address_$_t_address_$_t_uint256_$_t_address_$_t_bytes_memory_ptr_$returns$__$", + "typeString": "function (address,address payable,address,address,uint256,address,bytes memory)" + } + }, + "id": 5854, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "13756:275:25", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 5855, + "nodeType": "ExpressionStatement", + "src": "13756:275:25" + }, + { + "assignments": [ + 5857 + ], + "declarations": [ + { + "constant": false, + "id": 5857, + "name": "postSwapBorrowBalanceUnderlying", + "nodeType": "VariableDeclaration", + "scope": 5885, + "src": "14092:39:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5856, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "14092:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5862, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5859, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5807, + "src": "14174:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" } - ] + }, + { + "argumentTypes": null, + "id": 5860, + "name": "dacProxyAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5803, + "src": "14204:15:25", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + ], + "id": 5858, + "name": "getBorrowBalanceUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 2238, + "src": "14134:26:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$returns$_t_uint256_$", + "typeString": "function (address,address) view returns (uint256)" + } + }, + "id": 5861, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "14134:95:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "14092:137:25" + }, + { + "assignments": [ + 5864 + ], + "declarations": [ + { + "constant": false, + "id": 5864, + "name": "oldTokenSwappedDelta", + "nodeType": "VariableDeclaration", + "scope": 5885, + "src": "14273:28:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 5863, + "name": "uint256", + "nodeType": "ElementaryTypeName", + "src": "14273:7:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "id": 5869, + "initialValue": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5867, + "name": "postSwapBorrowBalanceUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5857, + "src": "14352:31:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "id": 5865, + "name": "initialBorrowBalanceUnderlying", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5817, + "src": "14304:30:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 5866, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 7584, + "src": "14304:34:25", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 5868, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "14304:89:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "VariableDeclarationStatement", + "src": "14273:120:25" + }, + { + "condition": { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "id": 5872, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "id": 5870, + "name": "oldTokenSwappedDelta", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5864, + "src": "14660:20:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "BinaryOperation", + "operator": "<", + "rightExpression": { + "argumentTypes": null, + "id": 5871, + "name": "oldTokenUnderlyingDelta", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5809, + "src": "14683:23:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "src": "14660:46:25", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" } }, - "id": 5888, + "falseBody": null, + "id": 5884, "nodeType": "IfStatement", - "src": "13585:759:25", + "src": "14656:286:25", "trueBody": { - "id": 5852, + "id": 5883, "nodeType": "Block", - "src": "13642:191:25", + "src": "14708:234:25", "statements": [ { "expression": { "argumentTypes": null, - "id": 5850, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 5841, - "name": "supplyAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5823, - "src": "13684:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "arguments": [], - "expression": { - "argumentTypes": [], - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5844, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5812, - "src": "13736:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - } - ], - "id": 5843, - "name": "ICToken", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 858, - "src": "13728:7:25", - "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", - "typeString": "type(contract ICToken)" - } - }, - "id": 5845, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "typeConversion", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13728:25:25", - "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", - "typeString": "contract ICToken" - } - }, - "id": 5846, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "memberName": "underlying", - "nodeType": "MemberAccess", - "referencedDeclaration": 809, - "src": "13728:36:25", + "arguments": [ + { + "argumentTypes": null, + "id": 5874, + "name": "addressRegistryAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5805, + "src": "14760:22:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 5875, + "name": "oldCTokenAddress", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5807, + "src": "14800:16:25", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 5878, + "name": "oldTokenSwappedDelta", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5864, + "src": "14862:20:25", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", - "typeString": "function () view external returns (address)" + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "id": 5876, + "name": "oldTokenUnderlyingDelta", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5809, + "src": "14834:23:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } }, - "id": 5847, + "id": 5877, "isConstant": false, "isLValue": false, "isPure": false, - "kind": "functionCall", "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13728:38:25", + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 7584, + "src": "14834:27:25", "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - { - "argumentTypes": null, - "id": 5848, - "name": "oldTokenUnderlyingAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5810, - "src": "13784:24:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } + "id": 5879, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "14834:49:25", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5842, - "name": "_ethToToken", + }, + { + "argumentTypes": null, + "id": 5880, + "name": "newCTokenAddress", "nodeType": "Identifier", - "overloadedDeclarations": [ - 4959, - 4988 - ], - "referencedDeclaration": 4959, - "src": "13699:11:25", + "overloadedDeclarations": [], + "referencedDeclaration": 5811, + "src": "14901:16:25", "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", - "typeString": "function (address,uint256) returns (uint256)" + "typeIdentifier": "t_address", + "typeString": "address" } - }, - "id": 5849, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "13699:123:25", + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 5873, + "name": "_clearCollateralDust", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 5799, + "src": "14722:20:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$_t_address_$returns$__$", + "typeString": "function (address,address,uint256,address)" } }, - "src": "13684:138:25", + "id": 5881, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "14722:209:25", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" } }, - "id": 5851, + "id": 5882, "nodeType": "ExpressionStatement", - "src": "13684:138:25" + "src": "14722:209:25" } ] } - }, - { - "expression": { - "argumentTypes": null, - "arguments": [ - { - "argumentTypes": null, - "id": 5890, - "name": "newCTokenAddress", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5812, - "src": "14392:16:25", - "typeDescriptions": { - "typeIdentifier": "t_address", - "typeString": "address" - } - }, - { - "argumentTypes": null, - "id": 5891, - "name": "supplyAmount", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 5823, - "src": "14410:12:25", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - } - ], - "expression": { - "argumentTypes": [ - { - "typeIdentifier": "t_address", - "typeString": "address" - }, - { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - ], - "id": 5889, - "name": "supply", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 2423, - "src": "14385:6:25", - "typeDescriptions": { - "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", - "typeString": "function (address,uint256)" - } - }, - "id": 5892, - "isConstant": false, - "isLValue": false, - "isPure": false, - "kind": "functionCall", - "lValueRequested": false, - "names": [], - "nodeType": "FunctionCall", - "src": "14385:38:25", - "typeDescriptions": { - "typeIdentifier": "t_tuple$__$", - "typeString": "tuple()" - } - }, - "id": 5893, - "nodeType": "ExpressionStatement", - "src": "14385:38:25" } ] }, "documentation": null, - "id": 5895, + "id": 5886, "implemented": true, "kind": "function", "modifiers": [], - "name": "clearCollateralDust", + "name": "swapOperationAndClearCollateralDust", "nodeType": "FunctionDefinition", "parameters": { - "id": 5813, + "id": 5814, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5806, + "id": 5801, + "name": "dedgeCompoundManagerAddress", + "nodeType": "VariableDeclaration", + "scope": 5886, + "src": "12638:35:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 5800, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "12638:7:25", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5803, + "name": "dacProxyAddress", + "nodeType": "VariableDeclaration", + "scope": 5886, + "src": "12683:31:25", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + "typeName": { + "id": 5802, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "12683:15:25", + "stateMutability": "payable", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 5805, "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 5895, - "src": "12779:30:25", + "scope": 5886, + "src": "12724:30:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20278,10 +18602,10 @@ "typeString": "address" }, "typeName": { - "id": 5805, + "id": 5804, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12779:7:25", + "src": "12724:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20293,11 +18617,11 @@ }, { "constant": false, - "id": 5808, + "id": 5807, "name": "oldCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 5895, - "src": "12819:24:25", + "scope": 5886, + "src": "12764:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20305,10 +18629,10 @@ "typeString": "address" }, "typeName": { - "id": 5807, + "id": 5806, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12819:7:25", + "src": "12764:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20320,11 +18644,11 @@ }, { "constant": false, - "id": 5810, - "name": "oldTokenUnderlyingAmount", + "id": 5809, + "name": "oldTokenUnderlyingDelta", "nodeType": "VariableDeclaration", - "scope": 5895, - "src": "12853:29:25", + "scope": 5886, + "src": "12842:31:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20332,10 +18656,10 @@ "typeString": "uint256" }, "typeName": { - "id": 5809, - "name": "uint", + "id": 5808, + "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "12853:4:25", + "src": "12842:7:25", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -20346,11 +18670,11 @@ }, { "constant": false, - "id": 5812, + "id": 5811, "name": "newCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 5895, - "src": "12892:24:25", + "scope": 5886, + "src": "12929:24:25", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -20358,10 +18682,10 @@ "typeString": "address" }, "typeName": { - "id": 5811, + "id": 5810, "name": "address", "nodeType": "ElementaryTypeName", - "src": "12892:7:25", + "src": "12929:7:25", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20370,28 +18694,54 @@ }, "value": null, "visibility": "internal" + }, + { + "constant": false, + "id": 5813, + "name": "executeOperationCalldataParams", + "nodeType": "VariableDeclaration", + "scope": 5886, + "src": "12963:45:25", + "stateVariable": false, + "storageLocation": "calldata", + "typeDescriptions": { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes" + }, + "typeName": { + "id": 5812, + "name": "bytes", + "nodeType": "ElementaryTypeName", + "src": "12963:5:25", + "typeDescriptions": { + "typeIdentifier": "t_bytes_storage_ptr", + "typeString": "bytes" + } + }, + "value": null, + "visibility": "internal" } ], - "src": "12769:153:25" + "src": "12628:386:25" }, "returnParameters": { - "id": 5814, + "id": 5815, "nodeType": "ParameterList", "parameters": [], - "src": "12938:0:25" + "src": "13024:0:25" }, - "scope": 5896, - "src": "12741:1689:25", - "stateMutability": "payable", + "scope": 5887, + "src": "12584:2364:25", + "stateMutability": "nonpayable", "superFunction": null, - "visibility": "public" + "visibility": "external" } ], - "scope": 5897, - "src": "773:13659:25" + "scope": 5888, + "src": "720:14230:25" } ], - "src": "45:14388:25" + "src": "45:14906:25" }, "compiler": { "name": "solc", @@ -20401,12 +18751,12 @@ "1": { "events": {}, "links": {}, - "address": "0xd219e1cad8cde8c46f2d923ace35a8e5b729a683", - "transactionHash": "0xfcdabce2ffc0b4b892e7338140eff3da4e6575bdfd2e8375f7064434767cedd4" + "address": "0xF011fB91DA4db968E8723f3459162ab9723Bb760", + "transactionHash": "0xf33f7cc238bdb658bdf452f8a5c899e88839b34bbe7f5521f539ee88b4e10aa5" } }, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:28:59.320Z", + "updatedAt": "2020-04-08T12:22:38.621Z", "networkType": "ethereum", "devdoc": { "methods": {} diff --git a/packages/smart-contracts/artifacts/DedgeExitManager.json b/packages/smart-contracts/artifacts/DedgeExitManager.json index abf86f4..3cc40b6 100644 --- a/packages/smart-contracts/artifacts/DedgeExitManager.json +++ b/packages/smart-contracts/artifacts/DedgeExitManager.json @@ -98,9 +98,9 @@ "type": "function" } ], - "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"fallback\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"_approve\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"totalEthDebtAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"dedgeExitManagerAddress\",\"type\":\"address\"},{\"internalType\":\"address payable\",\"name\":\"dacProxyAddress\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"addressRegistryAddress\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"executeOperationCalldataParams\",\"type\":\"bytes\"}],\"name\":\"exitPositions\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_protocolFee\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_params\",\"type\":\"bytes\"}],\"name\":\"exitPositionsPostLoan\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeExitManager.sol\":\"DedgeExitManager\"},\"evmVersion\":\"constantinople\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol\":{\"keccak256\":\"0xe3762e63e74657a066e6fe281ec694e366ca86f6378470304c646b4e785e09f3\",\"urls\":[\"bzz-raw://67607850cbce7ffa66356dd28412e64ff58f62fa7c709f5fa28306b8be9050a7\",\"dweb:/ipfs/QmUaFhH5a6rQ8yJG2A6zJJ1ds9txqxr8ytxd2s7bhiNX35\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/ISafeERC20.sol\":{\"keccak256\":\"0xec78efb83d1275fbeb9d431938447eaabbff72deea196deea04b4873ee5a9f54\",\"urls\":[\"bzz-raw://7b50edf0121dc6286c5b93fd7ddc85edfbb719c91faf3ffd22957436c5b4763c\",\"dweb:/ipfs/QmSRUJaEp3QP71SG1V668qzXAzEj7YezhJ6AKdNqunH6dj\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/IFlashLoanReceiver.sol\":{\"keccak256\":\"0xbd9ee17614d720229da04b4d481b2e6669b5fd9217bc278a93b39a62e2383fde\",\"urls\":[\"bzz-raw://4827232c7582d13c0237ae80b47e2f3dd85499372d80a15c0f31599bb99e26a5\",\"dweb:/ipfs/QmX3mCBdQcCvL9WF5FwToZZpj6VBtkaoN9aZ1tszp7oVjt\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol\":{\"keccak256\":\"0xe1a1b1bbf6dc92e86a23b8af9cf04e3e527b766ed1147cce041080d01ede5a24\",\"urls\":[\"bzz-raw://c0a7bf8948392f8f7249a99d39ac0722840faea5767c2f97939657e281d318f5\",\"dweb:/ipfs/QmRmSmKfgegjtAnpQ6t3ucEiq9GUrfYPpi7XucjREHjYFd\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol\":{\"keccak256\":\"0x0b99a26eeba60b8201f6ffd0d9d00bc5562ace9e7998534fd3887d7ba72b7d88\",\"urls\":[\"bzz-raw://9a36c107f3471548d6a13d28e995cb71ef42bafd55bf759b7c1b0ba0fda7170c\",\"dweb:/ipfs/Qme6SJJ3A9MwVwzk6CJC9gN8jAWLkgWQUwzZU4k6eD4BNy\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolParametersProvider.sol\":{\"keccak256\":\"0x90ace0fd5238a92b39b3fad095c046c2707c3027116c7d5f7e80863ca74eb00d\",\"urls\":[\"bzz-raw://068f20bedbbe8f4faff599106162f7c7ede426a689f22c16dc9643bd17268755\",\"dweb:/ipfs/QmVSCkLZ8JD17DvsWtYMBcuZdF3JZpZM9khMbvYFarYGTs\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol\":{\"keccak256\":\"0xa65d6eb1f4bae0350a65a2148fc83c6cab8952d11b19c39e4ab5c27d1d48773e\",\"urls\":[\"bzz-raw://84d98fe4bf18381ad57769601c6b53135c0e5ff5f191a62cd129cb5a815efc79\",\"dweb:/ipfs/QmaoXTSmkuT5u2HkEkggYzEE4mBA1MZp5yDrDKWU6Y8jgm\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol\":{\"keccak256\":\"0xd07da3ef9345ec40b090ea93df6d5a9ff7a03996a3c55f51aabee4d50ccdc201\",\"urls\":[\"bzz-raw://21c88532f770e244133c240d448092d8ea0e5a47dcf951522aa66106e15758e3\",\"dweb:/ipfs/QmXFkrbfpgcCFvoziSR3FnptBPf79og2tSR8deQGmViAkg\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol\":{\"keccak256\":\"0xc69ade89655263aaffac1183c0e842ea95294171280f2c5ab755286a66de3ff9\",\"urls\":[\"bzz-raw://742ca904eaf238a83270e315410b35e83048ee0c6529190be2ae9f9bc20e6187\",\"dweb:/ipfs/QmPW3WFbHZjsGQ6vMgPRPWHCNJLNxyEbR4w1DAvd466N51\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol\":{\"keccak256\":\"0xde1a310030b2b654b9c1e7782e94d7f00be0172c32dc4e99a7c168dd53d72843\",\"urls\":[\"bzz-raw://6a8b12cff637c3a1b025bd90a3c75524e53207c457b770bf22800df883fff45d\",\"dweb:/ipfs/QmSJXJDH5jiCkU11Xn7KeVTMoS64xg2XQ5hWGqQhMEnrmX\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol\":{\"keccak256\":\"0x0d2a2e2c0811bd1e9e757a1a804366cef39120f7eec3bffbcd8802afbf5d6f4b\",\"urls\":[\"bzz-raw://f5d9e36f7f3c6a0771d3656a1b1088f27d82f1f242579fe71e10b2d49aaac5b9\",\"dweb:/ipfs/QmZTjArdX13p6EGRD7fZuros5Wjs52usvNbxSavbLoRgZn\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/BytesLib.sol\":{\"keccak256\":\"0x2127d94e9d0443c4f0a5a8ebd8fd8746c7ea4e4d3849e3a45c41943019571ea7\",\"urls\":[\"bzz-raw://dbe24f863129a5062658ec1e6bc2695d7427dd8783aec86903125867f6343a4f\",\"dweb:/ipfs/QmfX7eArFhPnTa1bwjpfse3ni6EapoHfzuhdXxMxKU8kNb\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/aave/FlashLoanReceiverBase.sol\":{\"keccak256\":\"0x0a3802a7d1bf99d7ccb8046f2632f0a3fa42ebea5e1033cc13eb843b32cbf4c3\",\"urls\":[\"bzz-raw://68a6bcf9ccfe8d72448c3d3dadd328b14a741ba9d24e5aa20ad82b72c7108a7b\",\"dweb:/ipfs/QmeprLqp3jFqbxmNwuZ8Vm2EdeKp5idQZi4VSCLQZa28qY\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol\":{\"keccak256\":\"0x7636abae52593354ed288e67b6c2e5e1df218f753f6c253ae691cb5252274cf1\",\"urls\":[\"bzz-raw://d66e47ce74476c103bb8a1b11d618232276d4b57badfd7d96a45e9c881e83543\",\"dweb:/ipfs/QmXMWVNLRdiBHmnTx1c2DFvidnXpFuiy4CMh2T2avWEQ2h\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol\":{\"keccak256\":\"0xf38f1b725d7568da1b3a210190566e00daa3f241accba9fd6a906ae48e62b151\",\"urls\":[\"bzz-raw://83abf26fe875dd5599abfa2c9b387cb3ce7e70b4fe3ae0b3e2127f807b708ea1\",\"dweb:/ipfs/QmRntwBkLrh8SosWWsM1aC2cP7wMswCPuBKLmJzgQB1xeY\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol\":{\"keccak256\":\"0xc1440658c9e69c115e90b60f1a3b424155d9f0fa495a689bce0a202d8daf1df7\",\"urls\":[\"bzz-raw://dc3c2c615db44839d9353908fa2935cab29e0739ef559f00397724b904e5187f\",\"dweb:/ipfs/Qma5uk2NoqVnZgZF3fCXPRfkZMbxfEKuYo6NABq79We1t1\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol\":{\"keccak256\":\"0x36bff82bc9233b5ee86b50df83efb4915c50d3c5716e9bc463b290ab87a4b6bb\",\"urls\":[\"bzz-raw://486f7dfeaa00779677f8e139c54fb3f7f8043f66fe344ec35bd5d3873205f77e\",\"dweb:/ipfs/QmUVwqSEod9L97Cqz1fPv9jXPescnR4vNXAm4zdf2gZmgv\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapLiteBase.sol\":{\"keccak256\":\"0x1058669a50e9c5b2dce70aae66723a01e68e167deb9c3b89ea371cc0038d5dc4\",\"urls\":[\"bzz-raw://3bfffd813909b4322374f3a1b179b10469669ad71fdb6c37f081784453febe05\",\"dweb:/ipfs/QmUFhAH2JxQGdYHRmjVMALuC9e17bZEGKMK7XwGWQwsqn7\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeExitManager.sol\":{\"keccak256\":\"0x98f7835be71453686e6bef2dae399bb08be4cfb6dfce3ead2e1d29c29df91d51\",\"urls\":[\"bzz-raw://3ffe31654a7be90ea4a7966fc387c47444bfe52cd29cfdc72bcfc84854096b70\",\"dweb:/ipfs/QmWKWZdeaTkS4LbdD9S26UHU13ki3Svq2zjMiNRwHpR4AH\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol\":{\"keccak256\":\"0xfcd524540f6e01a5ef58192d42d87d296fad5a0d13dd883c1b5b604435befd97\",\"urls\":[\"bzz-raw://398eb7da5785008a974d476886bf95ed1793b4e5f19b56735dba4f998217ad75\",\"dweb:/ipfs/QmQtViYpthTUNzdgv4AEhSW6wMFneE5AdLerMf4q5eWWzN\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol\":{\"keccak256\":\"0x0f9a1a23e6eabb0a3cd78e2e2a0b23b15f8d175ab02d71aac63eb6e38fb82657\",\"urls\":[\"bzz-raw://6cdf61439a849257726d6fe87cc5455c008763485170f2609ed477a3f3dc0d68\",\"dweb:/ipfs/QmbLvvK3AmCaSKPXSnHNsd5iWMFzCr9HEd4cPmbPLZxZKs\"]},\"@openzeppelin/contracts/math/SafeMath.sol\":{\"keccak256\":\"0x640b6dee7a4b830bdfd52b5031a07fc2b12209f5b2e29e5d364a7d37f69d8076\",\"urls\":[\"bzz-raw://31113152e1ddb78fe7a4197f247591ca894e93f916867beb708d8e747b6cc74f\",\"dweb:/ipfs/QmbZaJyXdpsYGykVhHH9qpVGQg9DGCxE2QufbCUy3daTgq\"]},\"@openzeppelin/contracts/utils/Address.sol\":{\"keccak256\":\"0x1a8e5072509c5ea7365eb1d48030b9be865140c8fb779968da0a459a0e174a11\",\"urls\":[\"bzz-raw://03335b7b07c7c8c8d613cfdd8ec39a0b5ec133ee510bf2fe6cc5a496767bef4b\",\"dweb:/ipfs/Qmebp4nzPja645c9yXSdJkGq96oU3am3LUnG2K3R7XxyKf\"]}},\"version\":1}", - "bytecode": "0x608060405234801561001057600080fd5b5061171b806100206000396000f3fe6080604052600436106100345760003560e01c8063642c3dfa146100365780636889dfe1146100565780637b7d722514610076575b005b34801561004257600080fd5b50610034610051366004611233565b610096565b34801561006257600080fd5b506100346100713660046112c3565b6102b6565b34801561008257600080fd5b5061003461009136600461116a565b61048c565b60405183906060906100ac9088906020016114df565b60408051601f19818403018152908290526100cd91869086906020016114b2565b60405160208183030381529060405290506000826001600160a01b0316633f6dc33b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561011957600080fd5b505afa15801561012d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610151919081019061114c565b6001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561018957600080fd5b505afa15801561019d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506101c1919081019061114c565b90506101cd87826105b1565b806001600160a01b0316635cffe9de88856001600160a01b03166356cc94a26040518163ffffffff1660e01b815260040160206040518083038186803b15801561021657600080fd5b505afa15801561022a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061024e919081019061114c565b8c866040518563ffffffff1660e01b815260040161026f94939291906114ed565b600060405180830381600087803b15801561028957600080fd5b505af115801561029d573d6000803e3d6000fd5b505050506102ab878261077f565b505050505050505050565b6102be610ec2565b6102ca828401846111fe565b90506000816020015190506000816001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561031057600080fd5b505afa158015610324573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610348919081019061114c565b905060005b8360400151518110156103a35761039b828560400151838151811061036e57fe5b6020026020010151600001518660400151848151811061038a57fe5b60200260200101516020015161084f565b60010161034d565b506000805b846060015151811015610402576103f683866060015183815181106103c957fe5b602002602001015160000151876060015184815181106103e557fe5b602002602001015160200151610904565b909101906001016103a8565b5083516001600160a01b0316610430886104248b81868f63ffffffff6109bb16565b9063ffffffff6109bb16565b60405161043c906114d4565b60006040518083038185875af1925050503d8060008114610479576040519150601f19603f3d011682016040523d82523d6000602084013e61047e565b606091505b505050505050505050505050565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156104c757600080fd5b505afa1580156104db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104ff919081019061114c565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b3906105309086908690600401611531565b602060405180830381600087803b15801561054a57600080fd5b505af115801561055e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061058291908101906111a4565b15156001146105ac5760405162461bcd60e51b81526004016105a3906115a5565b60405180910390fd5b505050565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156105ec57600080fd5b505afa158015610600573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061062491908101906111e0565b9050806001600160a01b031663f0217ce58360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561068157600080fd5b505afa158015610695573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506106b991908101906111c2565b846001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b1580156106f257600080fd5b505afa158015610706573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061072a91908101906111c2565b6040518463ffffffff1660e01b81526004016107489392919061154c565b600060405180830381600087803b15801561076257600080fd5b505af1158015610776573d6000803e3d6000fd5b50505050505050565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156107ba57600080fd5b505afa1580156107ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107f291908101906111e0565b9050806001600160a01b03166379d88d878360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561068157600080fd5b826001600160a01b0316826001600160a01b0316146108f9576000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156108a357600080fd5b505afa1580156108b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506108db919081019061114c565b905060006108e98284610a06565b90506108f58282610a8c565b5050505b6105ac838383610a9a565b60006109108383610bb2565b836001600160a01b0316836001600160a01b031614156109315750806109b4565b6000836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561096c57600080fd5b505afa158015610980573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109a4919081019061114c565b90506109b08184610c53565b9150505b9392505050565b60006109fd83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610c61565b90505b92915050565b6000610a1183610c8d565b6001600160a01b03166359e94862836040518263ffffffff1660e01b8152600401610a3c91906115b5565b60206040518083038186803b158015610a5457600080fd5b505afa158015610a68573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109fd91908101906111c2565b60006109fd83836001610d17565b826001600160a01b0316826001600160a01b03161415610b0d57816001600160a01b0316634e4d9fea826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610aef57600080fd5b505af1158015610b03573d6000803e3d6000fd5b50505050506105ac565b610b17828261048c565b60405163073a938160e11b81526001600160a01b03831690630e75270290610b439084906004016115b5565b602060405180830381600087803b158015610b5d57600080fd5b505af1158015610b71573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b9591908101906111c2565b156105ac5760405162461bcd60e51b81526004016105a390611595565b60405163852a12e360e01b81526000906001600160a01b0384169063852a12e390610be19085906004016115b5565b602060405180830381600087803b158015610bfb57600080fd5b505af1158015610c0f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610c3391908101906111c2565b905080156105ac5760405162461bcd60e51b81526004016105a390611585565b60006109fd83836001610dad565b60008184841115610c855760405162461bcd60e51b81526004016105a39190611574565b505050900390565b6040516303795fb160e11b815260009073c0a47dfe034b400b47bdad5fecda2621de6c4d95906306f2bf6290610cc79085906004016114df565b60206040518083038186803b158015610cdf57600080fd5b505afa158015610cf3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610a00919081019061114c565b6000610d2284610c8d565b6001600160a01b031663f39b5b9b848442603c016040518463ffffffff1660e01b8152600401610d539291906115c3565b6020604051808303818588803b158015610d6c57600080fd5b505af1158015610d80573d6000803e3d6000fd5b50505050506040513d601f19601f82011682018060405250610da591908101906111c2565b949350505050565b600080610db985610c8d565b60405163095ea7b360e01b81529091506001600160a01b0386169063095ea7b390610dea9084908890600401611531565b602060405180830381600087803b158015610e0457600080fd5b505af1158015610e18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610e3c91908101906111a4565b506040516395e3c50b60e01b81526001600160a01b038216906395e3c50b90610e709087908790603c42019060040161154c565b602060405180830381600087803b158015610e8a57600080fd5b505af1158015610e9e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109b091908101906111c2565b604080516080810182526000808252602082015260609181018290528181019190915290565b8035610a00816116a6565b8051610a00816116a6565b600082601f830112610f0f57600080fd5b8135610f22610f1d826115f8565b6115d1565b91508181835260208401935060208101905083856040840282011115610f4757600080fd5b60005b83811015610f755781610f5d888261105b565b84525060209092019160409190910190600101610f4a565b5050505092915050565b600082601f830112610f9057600080fd5b8135610f9e610f1d826115f8565b91508181835260208401935060208101905083856040840282011115610fc357600080fd5b60005b83811015610f755781610fd9888261105b565b84525060209092019160409190910190600101610fc6565b8051610a00816116bd565b8051610a00816116c6565b60008083601f84011261101957600080fd5b50813567ffffffffffffffff81111561103157600080fd5b60208301915083600182028301111561104957600080fd5b9250929050565b8051610a00816116cf565b60006040828403121561106d57600080fd5b61107760406115d1565b905060006110858484610ee8565b825250602061109684848301611141565b60208301525092915050565b6000608082840312156110b457600080fd5b6110be60806115d1565b905060006110cc8484610ee8565b82525060206110dd84848301610ee8565b602083015250604082013567ffffffffffffffff8111156110fd57600080fd5b61110984828501610f7f565b604083015250606082013567ffffffffffffffff81111561112957600080fd5b61113584828501610efe565b60608301525092915050565b8035610a00816116c6565b60006020828403121561115e57600080fd5b6000610da58484610ef3565b6000806040838503121561117d57600080fd5b60006111898585610ee8565b925050602061119a85828601611141565b9150509250929050565b6000602082840312156111b657600080fd5b6000610da58484610ff1565b6000602082840312156111d457600080fd5b6000610da58484610ffc565b6000602082840312156111f257600080fd5b6000610da58484611050565b60006020828403121561121057600080fd5b813567ffffffffffffffff81111561122757600080fd5b610da5848285016110a2565b60008060008060008060a0878903121561124c57600080fd5b60006112588989611141565b965050602061126989828a01610ee8565b955050604061127a89828a01610ee8565b945050606061128b89828a01610ee8565b935050608087013567ffffffffffffffff8111156112a857600080fd5b6112b489828a01611007565b92509250509295509295509295565b6000806000806000608086880312156112db57600080fd5b60006112e78888611141565b95505060206112f888828901611141565b945050604061130988828901611141565b935050606086013567ffffffffffffffff81111561132657600080fd5b61133288828901611007565b92509250509295509295909350565b61134a81611655565b82525050565b61134a8161162b565b61134a8161163b565b600061136e8385611626565b935061137b838584611660565b50500190565b600061138c82611619565b611396818561161d565b93506113a681856020860161166c565b6113af8161169c565b9093019392505050565b60006113c482611619565b6113ce8185611626565b93506113de81856020860161166c565b9290920192915050565b60006113f560298361161d565b7f636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79698152681b99cb59985a5b195960ba1b602082015260400192915050565b6000611440601d8361161d565b7f636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564000000815260200192915050565b6000610a00600083611626565b600061148660208361161d565b7f636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564815260200192915050565b60006114be82866113b9565b91506114cb828486611362565b95945050505050565b6000610a008261146c565b60208101610a008284611350565b608081016114fb8287611341565b6115086020830186611350565b6115156040830185611359565b81810360608301526115278184611381565b9695505050505050565b6040810161153f8285611350565b6109b46020830184611359565b6060810161155a8286611359565b6115676020830185611359565b610da56040830184611359565b602080825281016109fd8184611381565b60208082528101610a00816113e8565b60208082528101610a0081611433565b60208082528101610a0081611479565b60208101610a008284611359565b6040810161153f8285611359565b60405181810167ffffffffffffffff811182821017156115f057600080fd5b604052919050565b600067ffffffffffffffff82111561160f57600080fd5b5060209081020190565b5190565b90815260200190565b919050565b6000610a0082611649565b151590565b90565b6000610a008261162b565b6001600160a01b031690565b6000610a008261163e565b82818337506000910152565b60005b8381101561168757818101518382015260200161166f565b83811115611696576000848401525b50505050565b601f01601f191690565b6116af8161162b565b81146116ba57600080fd5b50565b6116af81611636565b6116af8161163b565b6116af8161163e56fea365627a7a72315820470ce374b8b00747e926b02d6dae92adb5bada691d038455d0fbbe36377d4adc6c6578706572696d656e74616cf564736f6c63430005100040", - "deployedBytecode": "0x6080604052600436106100345760003560e01c8063642c3dfa146100365780636889dfe1146100565780637b7d722514610076575b005b34801561004257600080fd5b50610034610051366004611233565b610096565b34801561006257600080fd5b506100346100713660046112c3565b6102b6565b34801561008257600080fd5b5061003461009136600461116a565b61048c565b60405183906060906100ac9088906020016114df565b60408051601f19818403018152908290526100cd91869086906020016114b2565b60405160208183030381529060405290506000826001600160a01b0316633f6dc33b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561011957600080fd5b505afa15801561012d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610151919081019061114c565b6001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561018957600080fd5b505afa15801561019d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506101c1919081019061114c565b90506101cd87826105b1565b806001600160a01b0316635cffe9de88856001600160a01b03166356cc94a26040518163ffffffff1660e01b815260040160206040518083038186803b15801561021657600080fd5b505afa15801561022a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061024e919081019061114c565b8c866040518563ffffffff1660e01b815260040161026f94939291906114ed565b600060405180830381600087803b15801561028957600080fd5b505af115801561029d573d6000803e3d6000fd5b505050506102ab878261077f565b505050505050505050565b6102be610ec2565b6102ca828401846111fe565b90506000816020015190506000816001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561031057600080fd5b505afa158015610324573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610348919081019061114c565b905060005b8360400151518110156103a35761039b828560400151838151811061036e57fe5b6020026020010151600001518660400151848151811061038a57fe5b60200260200101516020015161084f565b60010161034d565b506000805b846060015151811015610402576103f683866060015183815181106103c957fe5b602002602001015160000151876060015184815181106103e557fe5b602002602001015160200151610904565b909101906001016103a8565b5083516001600160a01b0316610430886104248b81868f63ffffffff6109bb16565b9063ffffffff6109bb16565b60405161043c906114d4565b60006040518083038185875af1925050503d8060008114610479576040519150601f19603f3d011682016040523d82523d6000602084013e61047e565b606091505b505050505050505050505050565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156104c757600080fd5b505afa1580156104db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104ff919081019061114c565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b3906105309086908690600401611531565b602060405180830381600087803b15801561054a57600080fd5b505af115801561055e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061058291908101906111a4565b15156001146105ac5760405162461bcd60e51b81526004016105a3906115a5565b60405180910390fd5b505050565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156105ec57600080fd5b505afa158015610600573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061062491908101906111e0565b9050806001600160a01b031663f0217ce58360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561068157600080fd5b505afa158015610695573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506106b991908101906111c2565b846001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b1580156106f257600080fd5b505afa158015610706573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061072a91908101906111c2565b6040518463ffffffff1660e01b81526004016107489392919061154c565b600060405180830381600087803b15801561076257600080fd5b505af1158015610776573d6000803e3d6000fd5b50505050505050565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156107ba57600080fd5b505afa1580156107ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107f291908101906111e0565b9050806001600160a01b03166379d88d878360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561068157600080fd5b826001600160a01b0316826001600160a01b0316146108f9576000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156108a357600080fd5b505afa1580156108b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506108db919081019061114c565b905060006108e98284610a06565b90506108f58282610a8c565b5050505b6105ac838383610a9a565b60006109108383610bb2565b836001600160a01b0316836001600160a01b031614156109315750806109b4565b6000836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561096c57600080fd5b505afa158015610980573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109a4919081019061114c565b90506109b08184610c53565b9150505b9392505050565b60006109fd83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610c61565b90505b92915050565b6000610a1183610c8d565b6001600160a01b03166359e94862836040518263ffffffff1660e01b8152600401610a3c91906115b5565b60206040518083038186803b158015610a5457600080fd5b505afa158015610a68573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109fd91908101906111c2565b60006109fd83836001610d17565b826001600160a01b0316826001600160a01b03161415610b0d57816001600160a01b0316634e4d9fea826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610aef57600080fd5b505af1158015610b03573d6000803e3d6000fd5b50505050506105ac565b610b17828261048c565b60405163073a938160e11b81526001600160a01b03831690630e75270290610b439084906004016115b5565b602060405180830381600087803b158015610b5d57600080fd5b505af1158015610b71573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b9591908101906111c2565b156105ac5760405162461bcd60e51b81526004016105a390611595565b60405163852a12e360e01b81526000906001600160a01b0384169063852a12e390610be19085906004016115b5565b602060405180830381600087803b158015610bfb57600080fd5b505af1158015610c0f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610c3391908101906111c2565b905080156105ac5760405162461bcd60e51b81526004016105a390611585565b60006109fd83836001610dad565b60008184841115610c855760405162461bcd60e51b81526004016105a39190611574565b505050900390565b6040516303795fb160e11b815260009073c0a47dfe034b400b47bdad5fecda2621de6c4d95906306f2bf6290610cc79085906004016114df565b60206040518083038186803b158015610cdf57600080fd5b505afa158015610cf3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610a00919081019061114c565b6000610d2284610c8d565b6001600160a01b031663f39b5b9b848442603c016040518463ffffffff1660e01b8152600401610d539291906115c3565b6020604051808303818588803b158015610d6c57600080fd5b505af1158015610d80573d6000803e3d6000fd5b50505050506040513d601f19601f82011682018060405250610da591908101906111c2565b949350505050565b600080610db985610c8d565b60405163095ea7b360e01b81529091506001600160a01b0386169063095ea7b390610dea9084908890600401611531565b602060405180830381600087803b158015610e0457600080fd5b505af1158015610e18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610e3c91908101906111a4565b506040516395e3c50b60e01b81526001600160a01b038216906395e3c50b90610e709087908790603c42019060040161154c565b602060405180830381600087803b158015610e8a57600080fd5b505af1158015610e9e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109b091908101906111c2565b604080516080810182526000808252602082015260609181018290528181019190915290565b8035610a00816116a6565b8051610a00816116a6565b600082601f830112610f0f57600080fd5b8135610f22610f1d826115f8565b6115d1565b91508181835260208401935060208101905083856040840282011115610f4757600080fd5b60005b83811015610f755781610f5d888261105b565b84525060209092019160409190910190600101610f4a565b5050505092915050565b600082601f830112610f9057600080fd5b8135610f9e610f1d826115f8565b91508181835260208401935060208101905083856040840282011115610fc357600080fd5b60005b83811015610f755781610fd9888261105b565b84525060209092019160409190910190600101610fc6565b8051610a00816116bd565b8051610a00816116c6565b60008083601f84011261101957600080fd5b50813567ffffffffffffffff81111561103157600080fd5b60208301915083600182028301111561104957600080fd5b9250929050565b8051610a00816116cf565b60006040828403121561106d57600080fd5b61107760406115d1565b905060006110858484610ee8565b825250602061109684848301611141565b60208301525092915050565b6000608082840312156110b457600080fd5b6110be60806115d1565b905060006110cc8484610ee8565b82525060206110dd84848301610ee8565b602083015250604082013567ffffffffffffffff8111156110fd57600080fd5b61110984828501610f7f565b604083015250606082013567ffffffffffffffff81111561112957600080fd5b61113584828501610efe565b60608301525092915050565b8035610a00816116c6565b60006020828403121561115e57600080fd5b6000610da58484610ef3565b6000806040838503121561117d57600080fd5b60006111898585610ee8565b925050602061119a85828601611141565b9150509250929050565b6000602082840312156111b657600080fd5b6000610da58484610ff1565b6000602082840312156111d457600080fd5b6000610da58484610ffc565b6000602082840312156111f257600080fd5b6000610da58484611050565b60006020828403121561121057600080fd5b813567ffffffffffffffff81111561122757600080fd5b610da5848285016110a2565b60008060008060008060a0878903121561124c57600080fd5b60006112588989611141565b965050602061126989828a01610ee8565b955050604061127a89828a01610ee8565b945050606061128b89828a01610ee8565b935050608087013567ffffffffffffffff8111156112a857600080fd5b6112b489828a01611007565b92509250509295509295509295565b6000806000806000608086880312156112db57600080fd5b60006112e78888611141565b95505060206112f888828901611141565b945050604061130988828901611141565b935050606086013567ffffffffffffffff81111561132657600080fd5b61133288828901611007565b92509250509295509295909350565b61134a81611655565b82525050565b61134a8161162b565b61134a8161163b565b600061136e8385611626565b935061137b838584611660565b50500190565b600061138c82611619565b611396818561161d565b93506113a681856020860161166c565b6113af8161169c565b9093019392505050565b60006113c482611619565b6113ce8185611626565b93506113de81856020860161166c565b9290920192915050565b60006113f560298361161d565b7f636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79698152681b99cb59985a5b195960ba1b602082015260400192915050565b6000611440601d8361161d565b7f636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564000000815260200192915050565b6000610a00600083611626565b600061148660208361161d565b7f636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564815260200192915050565b60006114be82866113b9565b91506114cb828486611362565b95945050505050565b6000610a008261146c565b60208101610a008284611350565b608081016114fb8287611341565b6115086020830186611350565b6115156040830185611359565b81810360608301526115278184611381565b9695505050505050565b6040810161153f8285611350565b6109b46020830184611359565b6060810161155a8286611359565b6115676020830185611359565b610da56040830184611359565b602080825281016109fd8184611381565b60208082528101610a00816113e8565b60208082528101610a0081611433565b60208082528101610a0081611479565b60208101610a008284611359565b6040810161153f8285611359565b60405181810167ffffffffffffffff811182821017156115f057600080fd5b604052919050565b600067ffffffffffffffff82111561160f57600080fd5b5060209081020190565b5190565b90815260200190565b919050565b6000610a0082611649565b151590565b90565b6000610a008261162b565b6001600160a01b031690565b6000610a008261163e565b82818337506000910152565b60005b8381101561168757818101518382015260200161166f565b83811115611696576000848401525b50505050565b601f01601f191690565b6116af8161162b565b81146116ba57600080fd5b50565b6116af81611636565b6116af8161163b565b6116af8161163e56fea365627a7a72315820470ce374b8b00747e926b02d6dae92adb5bada691d038455d0fbbe36377d4adc6c6578706572696d656e74616cf564736f6c63430005100040", + "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"fallback\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"cToken\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"_approve\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"totalEthDebtAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"dedgeExitManagerAddress\",\"type\":\"address\"},{\"internalType\":\"address payable\",\"name\":\"dacProxyAddress\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"addressRegistryAddress\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"executeOperationCalldataParams\",\"type\":\"bytes\"}],\"name\":\"exitPositions\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_protocolFee\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_params\",\"type\":\"bytes\"}],\"name\":\"exitPositionsPostLoan\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeExitManager.sol\":\"DedgeExitManager\"},\"evmVersion\":\"constantinople\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol\":{\"keccak256\":\"0xe3762e63e74657a066e6fe281ec694e366ca86f6378470304c646b4e785e09f3\",\"urls\":[\"bzz-raw://67607850cbce7ffa66356dd28412e64ff58f62fa7c709f5fa28306b8be9050a7\",\"dweb:/ipfs/QmUaFhH5a6rQ8yJG2A6zJJ1ds9txqxr8ytxd2s7bhiNX35\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/ISafeERC20.sol\":{\"keccak256\":\"0xec78efb83d1275fbeb9d431938447eaabbff72deea196deea04b4873ee5a9f54\",\"urls\":[\"bzz-raw://7b50edf0121dc6286c5b93fd7ddc85edfbb719c91faf3ffd22957436c5b4763c\",\"dweb:/ipfs/QmSRUJaEp3QP71SG1V668qzXAzEj7YezhJ6AKdNqunH6dj\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/IFlashLoanReceiver.sol\":{\"keccak256\":\"0xbd9ee17614d720229da04b4d481b2e6669b5fd9217bc278a93b39a62e2383fde\",\"urls\":[\"bzz-raw://4827232c7582d13c0237ae80b47e2f3dd85499372d80a15c0f31599bb99e26a5\",\"dweb:/ipfs/QmX3mCBdQcCvL9WF5FwToZZpj6VBtkaoN9aZ1tszp7oVjt\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol\":{\"keccak256\":\"0xe1a1b1bbf6dc92e86a23b8af9cf04e3e527b766ed1147cce041080d01ede5a24\",\"urls\":[\"bzz-raw://c0a7bf8948392f8f7249a99d39ac0722840faea5767c2f97939657e281d318f5\",\"dweb:/ipfs/QmRmSmKfgegjtAnpQ6t3ucEiq9GUrfYPpi7XucjREHjYFd\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol\":{\"keccak256\":\"0x0b99a26eeba60b8201f6ffd0d9d00bc5562ace9e7998534fd3887d7ba72b7d88\",\"urls\":[\"bzz-raw://9a36c107f3471548d6a13d28e995cb71ef42bafd55bf759b7c1b0ba0fda7170c\",\"dweb:/ipfs/Qme6SJJ3A9MwVwzk6CJC9gN8jAWLkgWQUwzZU4k6eD4BNy\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolParametersProvider.sol\":{\"keccak256\":\"0x90ace0fd5238a92b39b3fad095c046c2707c3027116c7d5f7e80863ca74eb00d\",\"urls\":[\"bzz-raw://068f20bedbbe8f4faff599106162f7c7ede426a689f22c16dc9643bd17268755\",\"dweb:/ipfs/QmVSCkLZ8JD17DvsWtYMBcuZdF3JZpZM9khMbvYFarYGTs\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol\":{\"keccak256\":\"0x309afa791633faf166083968588cc12d10b511fea04522d9645cbd6469a6bcbe\",\"urls\":[\"bzz-raw://6ae438b67af64e89c742848ede981932ebc2b7238e2f147c8620d4048fd75885\",\"dweb:/ipfs/QmYZmAKfjvY3hS27hn1qcPBtegrQPELgc5YMXwybm5vBra\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol\":{\"keccak256\":\"0xf2fc635f3c28b641fa8dc95be41b6d7ab7f7d2bacfe9c2c37c1c0d22aac0afad\",\"urls\":[\"bzz-raw://767766022c3d3e172a71bd781eff9d92e938efc3e2d5708a90929491f2e0af15\",\"dweb:/ipfs/QmSkT4Jy2X54hYvDJG6PrX2tzdPvbK6WYtpBSJF7PDyVdp\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol\":{\"keccak256\":\"0xc69ade89655263aaffac1183c0e842ea95294171280f2c5ab755286a66de3ff9\",\"urls\":[\"bzz-raw://742ca904eaf238a83270e315410b35e83048ee0c6529190be2ae9f9bc20e6187\",\"dweb:/ipfs/QmPW3WFbHZjsGQ6vMgPRPWHCNJLNxyEbR4w1DAvd466N51\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol\":{\"keccak256\":\"0xde1a310030b2b654b9c1e7782e94d7f00be0172c32dc4e99a7c168dd53d72843\",\"urls\":[\"bzz-raw://6a8b12cff637c3a1b025bd90a3c75524e53207c457b770bf22800df883fff45d\",\"dweb:/ipfs/QmSJXJDH5jiCkU11Xn7KeVTMoS64xg2XQ5hWGqQhMEnrmX\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol\":{\"keccak256\":\"0x0d2a2e2c0811bd1e9e757a1a804366cef39120f7eec3bffbcd8802afbf5d6f4b\",\"urls\":[\"bzz-raw://f5d9e36f7f3c6a0771d3656a1b1088f27d82f1f242579fe71e10b2d49aaac5b9\",\"dweb:/ipfs/QmZTjArdX13p6EGRD7fZuros5Wjs52usvNbxSavbLoRgZn\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/BytesLib.sol\":{\"keccak256\":\"0x2127d94e9d0443c4f0a5a8ebd8fd8746c7ea4e4d3849e3a45c41943019571ea7\",\"urls\":[\"bzz-raw://dbe24f863129a5062658ec1e6bc2695d7427dd8783aec86903125867f6343a4f\",\"dweb:/ipfs/QmfX7eArFhPnTa1bwjpfse3ni6EapoHfzuhdXxMxKU8kNb\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/aave/FlashLoanReceiverBase.sol\":{\"keccak256\":\"0x0a3802a7d1bf99d7ccb8046f2632f0a3fa42ebea5e1033cc13eb843b32cbf4c3\",\"urls\":[\"bzz-raw://68a6bcf9ccfe8d72448c3d3dadd328b14a741ba9d24e5aa20ad82b72c7108a7b\",\"dweb:/ipfs/QmeprLqp3jFqbxmNwuZ8Vm2EdeKp5idQZi4VSCLQZa28qY\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol\":{\"keccak256\":\"0x7636abae52593354ed288e67b6c2e5e1df218f753f6c253ae691cb5252274cf1\",\"urls\":[\"bzz-raw://d66e47ce74476c103bb8a1b11d618232276d4b57badfd7d96a45e9c881e83543\",\"dweb:/ipfs/QmXMWVNLRdiBHmnTx1c2DFvidnXpFuiy4CMh2T2avWEQ2h\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol\":{\"keccak256\":\"0xf38f1b725d7568da1b3a210190566e00daa3f241accba9fd6a906ae48e62b151\",\"urls\":[\"bzz-raw://83abf26fe875dd5599abfa2c9b387cb3ce7e70b4fe3ae0b3e2127f807b708ea1\",\"dweb:/ipfs/QmRntwBkLrh8SosWWsM1aC2cP7wMswCPuBKLmJzgQB1xeY\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol\":{\"keccak256\":\"0xc1440658c9e69c115e90b60f1a3b424155d9f0fa495a689bce0a202d8daf1df7\",\"urls\":[\"bzz-raw://dc3c2c615db44839d9353908fa2935cab29e0739ef559f00397724b904e5187f\",\"dweb:/ipfs/Qma5uk2NoqVnZgZF3fCXPRfkZMbxfEKuYo6NABq79We1t1\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol\":{\"keccak256\":\"0x36bff82bc9233b5ee86b50df83efb4915c50d3c5716e9bc463b290ab87a4b6bb\",\"urls\":[\"bzz-raw://486f7dfeaa00779677f8e139c54fb3f7f8043f66fe344ec35bd5d3873205f77e\",\"dweb:/ipfs/QmUVwqSEod9L97Cqz1fPv9jXPescnR4vNXAm4zdf2gZmgv\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapLiteBase.sol\":{\"keccak256\":\"0x1058669a50e9c5b2dce70aae66723a01e68e167deb9c3b89ea371cc0038d5dc4\",\"urls\":[\"bzz-raw://3bfffd813909b4322374f3a1b179b10469669ad71fdb6c37f081784453febe05\",\"dweb:/ipfs/QmUFhAH2JxQGdYHRmjVMALuC9e17bZEGKMK7XwGWQwsqn7\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeExitManager.sol\":{\"keccak256\":\"0x98f7835be71453686e6bef2dae399bb08be4cfb6dfce3ead2e1d29c29df91d51\",\"urls\":[\"bzz-raw://3ffe31654a7be90ea4a7966fc387c47444bfe52cd29cfdc72bcfc84854096b70\",\"dweb:/ipfs/QmWKWZdeaTkS4LbdD9S26UHU13ki3Svq2zjMiNRwHpR4AH\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol\":{\"keccak256\":\"0xfcd524540f6e01a5ef58192d42d87d296fad5a0d13dd883c1b5b604435befd97\",\"urls\":[\"bzz-raw://398eb7da5785008a974d476886bf95ed1793b4e5f19b56735dba4f998217ad75\",\"dweb:/ipfs/QmQtViYpthTUNzdgv4AEhSW6wMFneE5AdLerMf4q5eWWzN\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol\":{\"keccak256\":\"0x0f9a1a23e6eabb0a3cd78e2e2a0b23b15f8d175ab02d71aac63eb6e38fb82657\",\"urls\":[\"bzz-raw://6cdf61439a849257726d6fe87cc5455c008763485170f2609ed477a3f3dc0d68\",\"dweb:/ipfs/QmbLvvK3AmCaSKPXSnHNsd5iWMFzCr9HEd4cPmbPLZxZKs\"]},\"@openzeppelin/contracts/math/SafeMath.sol\":{\"keccak256\":\"0x640b6dee7a4b830bdfd52b5031a07fc2b12209f5b2e29e5d364a7d37f69d8076\",\"urls\":[\"bzz-raw://31113152e1ddb78fe7a4197f247591ca894e93f916867beb708d8e747b6cc74f\",\"dweb:/ipfs/QmbZaJyXdpsYGykVhHH9qpVGQg9DGCxE2QufbCUy3daTgq\"]},\"@openzeppelin/contracts/utils/Address.sol\":{\"keccak256\":\"0x1a8e5072509c5ea7365eb1d48030b9be865140c8fb779968da0a459a0e174a11\",\"urls\":[\"bzz-raw://03335b7b07c7c8c8d613cfdd8ec39a0b5ec133ee510bf2fe6cc5a496767bef4b\",\"dweb:/ipfs/Qmebp4nzPja645c9yXSdJkGq96oU3am3LUnG2K3R7XxyKf\"]}},\"version\":1}", + "bytecode": "0x608060405234801561001057600080fd5b5061171b806100206000396000f3fe6080604052600436106100345760003560e01c8063642c3dfa146100365780636889dfe1146100565780637b7d722514610076575b005b34801561004257600080fd5b50610034610051366004611233565b610096565b34801561006257600080fd5b506100346100713660046112c3565b6102b6565b34801561008257600080fd5b5061003461009136600461116a565b61048c565b60405183906060906100ac9088906020016114df565b60408051601f19818403018152908290526100cd91869086906020016114b2565b60405160208183030381529060405290506000826001600160a01b0316633f6dc33b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561011957600080fd5b505afa15801561012d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610151919081019061114c565b6001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561018957600080fd5b505afa15801561019d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506101c1919081019061114c565b90506101cd87826105b1565b806001600160a01b0316635cffe9de88856001600160a01b03166356cc94a26040518163ffffffff1660e01b815260040160206040518083038186803b15801561021657600080fd5b505afa15801561022a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061024e919081019061114c565b8c866040518563ffffffff1660e01b815260040161026f94939291906114ed565b600060405180830381600087803b15801561028957600080fd5b505af115801561029d573d6000803e3d6000fd5b505050506102ab878261077f565b505050505050505050565b6102be610ec2565b6102ca828401846111fe565b90506000816020015190506000816001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561031057600080fd5b505afa158015610324573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610348919081019061114c565b905060005b8360400151518110156103a35761039b828560400151838151811061036e57fe5b6020026020010151600001518660400151848151811061038a57fe5b60200260200101516020015161084f565b60010161034d565b506000805b846060015151811015610402576103f683866060015183815181106103c957fe5b602002602001015160000151876060015184815181106103e557fe5b602002602001015160200151610904565b909101906001016103a8565b5083516001600160a01b0316610430886104248b81868f63ffffffff6109bb16565b9063ffffffff6109bb16565b60405161043c906114d4565b60006040518083038185875af1925050503d8060008114610479576040519150601f19603f3d011682016040523d82523d6000602084013e61047e565b606091505b505050505050505050505050565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156104c757600080fd5b505afa1580156104db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104ff919081019061114c565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b3906105309086908690600401611531565b602060405180830381600087803b15801561054a57600080fd5b505af115801561055e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061058291908101906111a4565b15156001146105ac5760405162461bcd60e51b81526004016105a3906115a5565b60405180910390fd5b505050565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156105ec57600080fd5b505afa158015610600573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061062491908101906111e0565b9050806001600160a01b031663f0217ce58360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561068157600080fd5b505afa158015610695573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506106b991908101906111c2565b846001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b1580156106f257600080fd5b505afa158015610706573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061072a91908101906111c2565b6040518463ffffffff1660e01b81526004016107489392919061154c565b600060405180830381600087803b15801561076257600080fd5b505af1158015610776573d6000803e3d6000fd5b50505050505050565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156107ba57600080fd5b505afa1580156107ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107f291908101906111e0565b9050806001600160a01b03166379d88d878360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561068157600080fd5b826001600160a01b0316826001600160a01b0316146108f9576000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156108a357600080fd5b505afa1580156108b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506108db919081019061114c565b905060006108e98284610a06565b90506108f58282610a8c565b5050505b6105ac838383610a9a565b60006109108383610bb2565b836001600160a01b0316836001600160a01b031614156109315750806109b4565b6000836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561096c57600080fd5b505afa158015610980573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109a4919081019061114c565b90506109b08184610c53565b9150505b9392505050565b60006109fd83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610c61565b90505b92915050565b6000610a1183610c8d565b6001600160a01b03166359e94862836040518263ffffffff1660e01b8152600401610a3c91906115b5565b60206040518083038186803b158015610a5457600080fd5b505afa158015610a68573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109fd91908101906111c2565b60006109fd83836001610d17565b826001600160a01b0316826001600160a01b03161415610b0d57816001600160a01b0316634e4d9fea826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610aef57600080fd5b505af1158015610b03573d6000803e3d6000fd5b50505050506105ac565b610b17828261048c565b60405163073a938160e11b81526001600160a01b03831690630e75270290610b439084906004016115b5565b602060405180830381600087803b158015610b5d57600080fd5b505af1158015610b71573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b9591908101906111c2565b156105ac5760405162461bcd60e51b81526004016105a390611595565b60405163852a12e360e01b81526000906001600160a01b0384169063852a12e390610be19085906004016115b5565b602060405180830381600087803b158015610bfb57600080fd5b505af1158015610c0f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610c3391908101906111c2565b905080156105ac5760405162461bcd60e51b81526004016105a390611585565b60006109fd83836001610dad565b60008184841115610c855760405162461bcd60e51b81526004016105a39190611574565b505050900390565b6040516303795fb160e11b815260009073c0a47dfe034b400b47bdad5fecda2621de6c4d95906306f2bf6290610cc79085906004016114df565b60206040518083038186803b158015610cdf57600080fd5b505afa158015610cf3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610a00919081019061114c565b6000610d2284610c8d565b6001600160a01b031663f39b5b9b848442603c016040518463ffffffff1660e01b8152600401610d539291906115c3565b6020604051808303818588803b158015610d6c57600080fd5b505af1158015610d80573d6000803e3d6000fd5b50505050506040513d601f19601f82011682018060405250610da591908101906111c2565b949350505050565b600080610db985610c8d565b60405163095ea7b360e01b81529091506001600160a01b0386169063095ea7b390610dea9084908890600401611531565b602060405180830381600087803b158015610e0457600080fd5b505af1158015610e18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610e3c91908101906111a4565b506040516395e3c50b60e01b81526001600160a01b038216906395e3c50b90610e709087908790603c42019060040161154c565b602060405180830381600087803b158015610e8a57600080fd5b505af1158015610e9e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109b091908101906111c2565b604080516080810182526000808252602082015260609181018290528181019190915290565b8035610a00816116a6565b8051610a00816116a6565b600082601f830112610f0f57600080fd5b8135610f22610f1d826115f8565b6115d1565b91508181835260208401935060208101905083856040840282011115610f4757600080fd5b60005b83811015610f755781610f5d888261105b565b84525060209092019160409190910190600101610f4a565b5050505092915050565b600082601f830112610f9057600080fd5b8135610f9e610f1d826115f8565b91508181835260208401935060208101905083856040840282011115610fc357600080fd5b60005b83811015610f755781610fd9888261105b565b84525060209092019160409190910190600101610fc6565b8051610a00816116bd565b8051610a00816116c6565b60008083601f84011261101957600080fd5b50813567ffffffffffffffff81111561103157600080fd5b60208301915083600182028301111561104957600080fd5b9250929050565b8051610a00816116cf565b60006040828403121561106d57600080fd5b61107760406115d1565b905060006110858484610ee8565b825250602061109684848301611141565b60208301525092915050565b6000608082840312156110b457600080fd5b6110be60806115d1565b905060006110cc8484610ee8565b82525060206110dd84848301610ee8565b602083015250604082013567ffffffffffffffff8111156110fd57600080fd5b61110984828501610f7f565b604083015250606082013567ffffffffffffffff81111561112957600080fd5b61113584828501610efe565b60608301525092915050565b8035610a00816116c6565b60006020828403121561115e57600080fd5b6000610da58484610ef3565b6000806040838503121561117d57600080fd5b60006111898585610ee8565b925050602061119a85828601611141565b9150509250929050565b6000602082840312156111b657600080fd5b6000610da58484610ff1565b6000602082840312156111d457600080fd5b6000610da58484610ffc565b6000602082840312156111f257600080fd5b6000610da58484611050565b60006020828403121561121057600080fd5b813567ffffffffffffffff81111561122757600080fd5b610da5848285016110a2565b60008060008060008060a0878903121561124c57600080fd5b60006112588989611141565b965050602061126989828a01610ee8565b955050604061127a89828a01610ee8565b945050606061128b89828a01610ee8565b935050608087013567ffffffffffffffff8111156112a857600080fd5b6112b489828a01611007565b92509250509295509295509295565b6000806000806000608086880312156112db57600080fd5b60006112e78888611141565b95505060206112f888828901611141565b945050604061130988828901611141565b935050606086013567ffffffffffffffff81111561132657600080fd5b61133288828901611007565b92509250509295509295909350565b61134a81611655565b82525050565b61134a8161162b565b61134a8161163b565b600061136e8385611626565b935061137b838584611660565b50500190565b600061138c82611619565b611396818561161d565b93506113a681856020860161166c565b6113af8161169c565b9093019392505050565b60006113c482611619565b6113ce8185611626565b93506113de81856020860161166c565b9290920192915050565b60006113f560298361161d565b7f636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79698152681b99cb59985a5b195960ba1b602082015260400192915050565b6000611440601d8361161d565b7f636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564000000815260200192915050565b6000610a00600083611626565b600061148660208361161d565b7f636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564815260200192915050565b60006114be82866113b9565b91506114cb828486611362565b95945050505050565b6000610a008261146c565b60208101610a008284611350565b608081016114fb8287611341565b6115086020830186611350565b6115156040830185611359565b81810360608301526115278184611381565b9695505050505050565b6040810161153f8285611350565b6109b46020830184611359565b6060810161155a8286611359565b6115676020830185611359565b610da56040830184611359565b602080825281016109fd8184611381565b60208082528101610a00816113e8565b60208082528101610a0081611433565b60208082528101610a0081611479565b60208101610a008284611359565b6040810161153f8285611359565b60405181810167ffffffffffffffff811182821017156115f057600080fd5b604052919050565b600067ffffffffffffffff82111561160f57600080fd5b5060209081020190565b5190565b90815260200190565b919050565b6000610a0082611649565b151590565b90565b6000610a008261162b565b6001600160a01b031690565b6000610a008261163e565b82818337506000910152565b60005b8381101561168757818101518382015260200161166f565b83811115611696576000848401525b50505050565b601f01601f191690565b6116af8161162b565b81146116ba57600080fd5b50565b6116af81611636565b6116af8161163b565b6116af8161163e56fea365627a7a723158200d264ac00bbc3bad06ceecc4d1b3b42d190503f57ea54faa855581c818dec20c6c6578706572696d656e74616cf564736f6c63430005100040", + "deployedBytecode": "0x6080604052600436106100345760003560e01c8063642c3dfa146100365780636889dfe1146100565780637b7d722514610076575b005b34801561004257600080fd5b50610034610051366004611233565b610096565b34801561006257600080fd5b506100346100713660046112c3565b6102b6565b34801561008257600080fd5b5061003461009136600461116a565b61048c565b60405183906060906100ac9088906020016114df565b60408051601f19818403018152908290526100cd91869086906020016114b2565b60405160208183030381529060405290506000826001600160a01b0316633f6dc33b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561011957600080fd5b505afa15801561012d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610151919081019061114c565b6001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561018957600080fd5b505afa15801561019d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506101c1919081019061114c565b90506101cd87826105b1565b806001600160a01b0316635cffe9de88856001600160a01b03166356cc94a26040518163ffffffff1660e01b815260040160206040518083038186803b15801561021657600080fd5b505afa15801561022a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061024e919081019061114c565b8c866040518563ffffffff1660e01b815260040161026f94939291906114ed565b600060405180830381600087803b15801561028957600080fd5b505af115801561029d573d6000803e3d6000fd5b505050506102ab878261077f565b505050505050505050565b6102be610ec2565b6102ca828401846111fe565b90506000816020015190506000816001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561031057600080fd5b505afa158015610324573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610348919081019061114c565b905060005b8360400151518110156103a35761039b828560400151838151811061036e57fe5b6020026020010151600001518660400151848151811061038a57fe5b60200260200101516020015161084f565b60010161034d565b506000805b846060015151811015610402576103f683866060015183815181106103c957fe5b602002602001015160000151876060015184815181106103e557fe5b602002602001015160200151610904565b909101906001016103a8565b5083516001600160a01b0316610430886104248b81868f63ffffffff6109bb16565b9063ffffffff6109bb16565b60405161043c906114d4565b60006040518083038185875af1925050503d8060008114610479576040519150601f19603f3d011682016040523d82523d6000602084013e61047e565b606091505b505050505050505050505050565b6000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156104c757600080fd5b505afa1580156104db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104ff919081019061114c565b60405163095ea7b360e01b81529091506001600160a01b0382169063095ea7b3906105309086908690600401611531565b602060405180830381600087803b15801561054a57600080fd5b505af115801561055e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061058291908101906111a4565b15156001146105ac5760405162461bcd60e51b81526004016105a3906115a5565b60405180910390fd5b505050565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156105ec57600080fd5b505afa158015610600573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061062491908101906111e0565b9050806001600160a01b031663f0217ce58360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561068157600080fd5b505afa158015610695573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506106b991908101906111c2565b846001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b1580156106f257600080fd5b505afa158015610706573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061072a91908101906111c2565b6040518463ffffffff1660e01b81526004016107489392919061154c565b600060405180830381600087803b15801561076257600080fd5b505af1158015610776573d6000803e3d6000fd5b50505050505050565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b1580156107ba57600080fd5b505afa1580156107ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107f291908101906111e0565b9050806001600160a01b03166379d88d878360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b15801561068157600080fd5b826001600160a01b0316826001600160a01b0316146108f9576000826001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156108a357600080fd5b505afa1580156108b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506108db919081019061114c565b905060006108e98284610a06565b90506108f58282610a8c565b5050505b6105ac838383610a9a565b60006109108383610bb2565b836001600160a01b0316836001600160a01b031614156109315750806109b4565b6000836001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b15801561096c57600080fd5b505afa158015610980573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109a4919081019061114c565b90506109b08184610c53565b9150505b9392505050565b60006109fd83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f770000815250610c61565b90505b92915050565b6000610a1183610c8d565b6001600160a01b03166359e94862836040518263ffffffff1660e01b8152600401610a3c91906115b5565b60206040518083038186803b158015610a5457600080fd5b505afa158015610a68573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109fd91908101906111c2565b60006109fd83836001610d17565b826001600160a01b0316826001600160a01b03161415610b0d57816001600160a01b0316634e4d9fea826040518263ffffffff1660e01b81526004016000604051808303818588803b158015610aef57600080fd5b505af1158015610b03573d6000803e3d6000fd5b50505050506105ac565b610b17828261048c565b60405163073a938160e11b81526001600160a01b03831690630e75270290610b439084906004016115b5565b602060405180830381600087803b158015610b5d57600080fd5b505af1158015610b71573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b9591908101906111c2565b156105ac5760405162461bcd60e51b81526004016105a390611595565b60405163852a12e360e01b81526000906001600160a01b0384169063852a12e390610be19085906004016115b5565b602060405180830381600087803b158015610bfb57600080fd5b505af1158015610c0f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610c3391908101906111c2565b905080156105ac5760405162461bcd60e51b81526004016105a390611585565b60006109fd83836001610dad565b60008184841115610c855760405162461bcd60e51b81526004016105a39190611574565b505050900390565b6040516303795fb160e11b815260009073c0a47dfe034b400b47bdad5fecda2621de6c4d95906306f2bf6290610cc79085906004016114df565b60206040518083038186803b158015610cdf57600080fd5b505afa158015610cf3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610a00919081019061114c565b6000610d2284610c8d565b6001600160a01b031663f39b5b9b848442603c016040518463ffffffff1660e01b8152600401610d539291906115c3565b6020604051808303818588803b158015610d6c57600080fd5b505af1158015610d80573d6000803e3d6000fd5b50505050506040513d601f19601f82011682018060405250610da591908101906111c2565b949350505050565b600080610db985610c8d565b60405163095ea7b360e01b81529091506001600160a01b0386169063095ea7b390610dea9084908890600401611531565b602060405180830381600087803b158015610e0457600080fd5b505af1158015610e18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610e3c91908101906111a4565b506040516395e3c50b60e01b81526001600160a01b038216906395e3c50b90610e709087908790603c42019060040161154c565b602060405180830381600087803b158015610e8a57600080fd5b505af1158015610e9e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109b091908101906111c2565b604080516080810182526000808252602082015260609181018290528181019190915290565b8035610a00816116a6565b8051610a00816116a6565b600082601f830112610f0f57600080fd5b8135610f22610f1d826115f8565b6115d1565b91508181835260208401935060208101905083856040840282011115610f4757600080fd5b60005b83811015610f755781610f5d888261105b565b84525060209092019160409190910190600101610f4a565b5050505092915050565b600082601f830112610f9057600080fd5b8135610f9e610f1d826115f8565b91508181835260208401935060208101905083856040840282011115610fc357600080fd5b60005b83811015610f755781610fd9888261105b565b84525060209092019160409190910190600101610fc6565b8051610a00816116bd565b8051610a00816116c6565b60008083601f84011261101957600080fd5b50813567ffffffffffffffff81111561103157600080fd5b60208301915083600182028301111561104957600080fd5b9250929050565b8051610a00816116cf565b60006040828403121561106d57600080fd5b61107760406115d1565b905060006110858484610ee8565b825250602061109684848301611141565b60208301525092915050565b6000608082840312156110b457600080fd5b6110be60806115d1565b905060006110cc8484610ee8565b82525060206110dd84848301610ee8565b602083015250604082013567ffffffffffffffff8111156110fd57600080fd5b61110984828501610f7f565b604083015250606082013567ffffffffffffffff81111561112957600080fd5b61113584828501610efe565b60608301525092915050565b8035610a00816116c6565b60006020828403121561115e57600080fd5b6000610da58484610ef3565b6000806040838503121561117d57600080fd5b60006111898585610ee8565b925050602061119a85828601611141565b9150509250929050565b6000602082840312156111b657600080fd5b6000610da58484610ff1565b6000602082840312156111d457600080fd5b6000610da58484610ffc565b6000602082840312156111f257600080fd5b6000610da58484611050565b60006020828403121561121057600080fd5b813567ffffffffffffffff81111561122757600080fd5b610da5848285016110a2565b60008060008060008060a0878903121561124c57600080fd5b60006112588989611141565b965050602061126989828a01610ee8565b955050604061127a89828a01610ee8565b945050606061128b89828a01610ee8565b935050608087013567ffffffffffffffff8111156112a857600080fd5b6112b489828a01611007565b92509250509295509295509295565b6000806000806000608086880312156112db57600080fd5b60006112e78888611141565b95505060206112f888828901611141565b945050604061130988828901611141565b935050606086013567ffffffffffffffff81111561132657600080fd5b61133288828901611007565b92509250509295509295909350565b61134a81611655565b82525050565b61134a8161162b565b61134a8161163b565b600061136e8385611626565b935061137b838584611660565b50500190565b600061138c82611619565b611396818561161d565b93506113a681856020860161166c565b6113af8161169c565b9093019392505050565b60006113c482611619565b6113ce8185611626565b93506113de81856020860161166c565b9290920192915050565b60006113f560298361161d565b7f636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79698152681b99cb59985a5b195960ba1b602082015260400192915050565b6000611440601d8361161d565b7f636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564000000815260200192915050565b6000610a00600083611626565b600061148660208361161d565b7f636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564815260200192915050565b60006114be82866113b9565b91506114cb828486611362565b95945050505050565b6000610a008261146c565b60208101610a008284611350565b608081016114fb8287611341565b6115086020830186611350565b6115156040830185611359565b81810360608301526115278184611381565b9695505050505050565b6040810161153f8285611350565b6109b46020830184611359565b6060810161155a8286611359565b6115676020830185611359565b610da56040830184611359565b602080825281016109fd8184611381565b60208082528101610a00816113e8565b60208082528101610a0081611433565b60208082528101610a0081611479565b60208101610a008284611359565b6040810161153f8285611359565b60405181810167ffffffffffffffff811182821017156115f057600080fd5b604052919050565b600067ffffffffffffffff82111561160f57600080fd5b5060209081020190565b5190565b90815260200190565b919050565b6000610a0082611649565b151590565b90565b6000610a008261162b565b6001600160a01b031690565b6000610a008261163e565b82818337506000910152565b60005b8381101561168757818101518382015260200161166f565b83811115611696576000848401525b50505050565b601f01601f191690565b6116af8161162b565b81146116ba57600080fd5b50565b6116af81611636565b6116af8161163b565b6116af8161163e56fea365627a7a723158200d264ac00bbc3bad06ceecc4d1b3b42d190503f57ea54faa855581c818dec20c6c6578706572696d656e74616cf564736f6c63430005100040", "sourceMap": "690:6189:26:-;;;810:23;8:9:-1;5:2;;;30:1;27;20:12;5:2;810:23:26;690:6189;;;;;;", "deployedSourceMap": "690:6189:26:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5563:1314;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5563:1314:26;;;;;;;;:::i;4250:1307::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;4250:1307:26;;;;;;;;:::i;1825:321::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1825:321:26;;;;;;;;:::i;5563:1314::-;6083:35;;5887:22;;5984:53;;6083:35;;6094:23;;6083:35;;;;;;;;-1:-1:-1;;26:21;;;22:32;6:49;;6083:35:26;;;;6040:132;;6132:30;;;;49:4:-1;6040:132:26;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;6040:132:26;;;5984:188;;6183:24;6283:15;-1:-1:-1;;;;;6283:53:26;;:55;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6283:55:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6283:55:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6283:55:26;;;;;;;;;-1:-1:-1;;;;;6236:148:26;;:150;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6236:150:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6236:150:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6236:150:26;;;;;;;;;6183:213;;6452:56;6470:15;6495:11;6452:17;:56::i;:::-;6566:11;-1:-1:-1;;;;;6566:21:26;;6601:15;6630;-1:-1:-1;;;;;6630:30:26;;:32;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6630:32:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6630:32:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6630:32:26;;;;;;;;;6676:18;6708:40;6566:192;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6566:192:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6566:192:26;;;;6814:56;6832:15;6857:11;6814:17;:56::i;:::-;5563:1314;;;;;;;;;:::o;4250:1307::-;4451:38;;:::i;:::-;4492:77;;;;4516:7;4492:77;;;4451:118;;4580:31;4643:10;:33;;;4580:106;;4696:21;4720:15;-1:-1:-1;;;;;4720:29:26;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4720:31:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4720:31:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4720:31:26;;;;;;;;;4696:55;-1:-1:-1;4813:9:26;4808:237;4832:10;:21;;;:28;4828:1;:32;4808:237;;;4881:153;4909:13;4940:10;:21;;;4962:1;4940:24;;;;;;;;;;;;;;:31;;;4989:10;:21;;;5011:1;4989:24;;;;;;;;;;;;;;:31;;;4881:10;:153::i;:::-;4862:3;;4808:237;;;-1:-1:-1;5055:22:26;;5087:282;5111:10;:27;;;:34;5107:1;:38;5087:282;;;5184:174;5221:13;5252:10;:27;;;5280:1;5252:30;;;;;;;;;;;;;;:37;;;5307:10;:27;;;5335:1;5307:30;;;;;;;;;;;;;;:37;;;5184:19;:174::i;:::-;5166:192;;;;5147:3;;5087:282;;;-1:-1:-1;5430:26:26;;-1:-1:-1;;;;;5430:31:26;5481:55;5523:12;5481:37;5513:4;5481:37;:14;5500:7;5481:27;:18;:27;:::i;:::-;:31;:37;:31;:37;:::i;:55::-;5430:120;;;;;;;;;;;;;;;;;;;;;;;14:1:-1;21;16:31;;;;75:4;69:11;64:16;;144:4;140:9;133:4;115:16;111:27;107:43;104:1;100:51;94:4;87:65;169:16;166:1;159:27;225:16;222:1;215:4;212:1;208:12;193:49;7:242;;16:31;36:4;31:9;;7:242;;5430:120:26;;4250:1307;;;;;;;;;:::o;1825:321::-;1951:18;1980:6;-1:-1:-1;;;;;1972:26:26;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1972:28:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1972:28:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1972:28:26;;;;;;;;;2031:42;;-1:-1:-1;;;2031:42:26;;1951:49;;-1:-1:-1;;;;;;2031:26:26;;;;;:42;;2058:6;;2066;;2031:42;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2031:42:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2031:42:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2031:42:26;;;;;;;;;:50;;2077:4;2031:50;2010:129;;;;-1:-1:-1;;;2010:129:26;;;;;;;;;;;;;;;;;1825:321;;;:::o;1203:305::-;1304:9;1333:12;-1:-1:-1;;;;;1324:32:26;;:34;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1324:34:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1324:34:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1324:34:26;;;;;;;;;1304:55;;1378:1;-1:-1:-1;;;;;1370:17:26;;1425:3;1409:21;;1401:30;;;1453:1;-1:-1:-1;;;;;1445:14:26;;:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1445:16:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1445:16:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1445:16:26;;;;;;;;;1483:1;-1:-1:-1;;;;;1475:14:26;;:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1475:16:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1475:16:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1475:16:26;;;;;;;;;1370:131;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1370:131:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1370:131:26;;;;1203:305;;;:::o;1514:::-;1615:9;1644:12;-1:-1:-1;;;;;1635:32:26;;:34;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1635:34:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1635:34:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1635:34:26;;;;;;;;;1615:55;;1689:1;-1:-1:-1;;;;;1681:17:26;;1736:3;1720:21;;1712:30;;;1764:1;-1:-1:-1;;;;;1756:14:26;;:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;3307:530:26;3485:13;-1:-1:-1;;;;;3475:23:26;:6;-1:-1:-1;;;;;3475:23:26;;3471:306;;3514:18;3543:6;-1:-1:-1;;;;;3535:26:26;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3535:28:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3535:28:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3535:28:26;;;;;;;;;3514:49;;3621:17;3641:40;3662:10;3674:6;3641:20;:40::i;:::-;3621:60;;3732:34;3744:10;3756:9;3732:11;:34::i;:::-;;3471:306;;;3787:43;3800:13;3815:6;3823;3787:12;:43::i;3843:401::-;3975:7;4019:33;4037:6;4045;4019:17;:33::i;:::-;4077:13;-1:-1:-1;;;;;4067:23:26;:6;-1:-1:-1;;;;;4067:23:26;;4063:67;;;-1:-1:-1;4113:6:26;4106:13;;4063:67;4140:18;4169:6;-1:-1:-1;;;;;4161:26:26;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4161:28:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4161:28:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4161:28:26;;;;;;;;;4140:49;;4206:31;4218:10;4230:6;4206:11;:31::i;:::-;4199:38;;;3843:401;;;;;;:::o;1274:134:32:-;1332:7;1358:43;1362:1;1365;1358:43;;;;;;;;;;;;;;;;;:3;:43::i;:::-;1351:50;;1274:134;;;;;:::o;2525:212:24:-;2618:4;2658:33;2678:12;2658:19;:33::i;:::-;-1:-1:-1;;;;;2641:76:24;;2718:11;2641:89;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2641:89:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2641:89:24;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2641:89:24;;;;;;;;514:160;599:4;622:45;634:12;648:9;664:1;622:11;:45::i;2637:408:26:-;2759:13;-1:-1:-1;;;;;2749:23:26;:6;-1:-1:-1;;;;;2749:23:26;;2745:294;;;2796:6;-1:-1:-1;;;;;2788:27:26;;2822:6;2788:43;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2788:43:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2788:43:26;;;;;2745:294;;;2862:24;2871:6;2879;2862:8;:24::i;:::-;2925:35;;-1:-1:-1;;;2925:35:26;;-1:-1:-1;;;;;2925:27:26;;;;;:35;;2953:6;;2925:35;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2925:35:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2925:35:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2925:35:26;;;;;;;;;:40;2900:128;;;;-1:-1:-1;;;2900:128:26;;;;;;;;3051:250;3144:46;;-1:-1:-1;;;3144:46:26;;3135:6;;-1:-1:-1;;;;;3144:32:26;;;;;:46;;3177:12;;3144:46;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3144:46:26;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3144:46:26;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3144:46:26;;;;;;;;;3135:55;-1:-1:-1;3221:6:26;;3200:94;;;;-1:-1:-1;;;3200:94:26;;;;;;;;955:156:24;1034:4;1057:47;1069:12;1083:11;1101:1;1057:11;:47::i;1732:187:32:-;1818:7;1853:12;1845:6;;;;1837:29;;;;-1:-1:-1;;;1837:29:32;;;;;;;;;;-1:-1:-1;;;1888:5:32;;;1732:187::o;337:171:24:-;437:64;;-1:-1:-1;;;437:64:24;;411:7;;288:42;;437:50;;:64;;488:12;;437:64;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;437:64:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;437:64:24;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;437:64:24;;;;;;;;680:269;786:4;826:33;846:12;826:19;:33::i;:::-;-1:-1:-1;;;;;809:84:24;;900:9;911:14;932:3;938:2;932:8;809:133;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;809:133:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;809:133:24;;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;809:133:24;;;;;;;;;802:140;680:269;-1:-1:-1;;;;680:269:24:o;1117:355::-;1215:4;1231:16;1250:33;1270:12;1250:19;:33::i;:::-;1294:51;;-1:-1:-1;;;1294:51:24;;1231:52;;-1:-1:-1;;;;;;1294:28:24;;;;;:51;;1231:52;;1333:11;;1294:51;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1294:51:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1294:51:24;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1294:51:24;;;;;;;;;-1:-1:-1;1363:102:24;;-1:-1:-1;;;1363:102:24;;-1:-1:-1;;;;;1363:59:24;;;;;:102;;1423:11;;1436:12;;1461:2;1455:3;:8;;1363:102;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1363:102:24;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1363:102:24;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1363:102:24;;;;;;;;690:6189:26;;;;;;;;;-1:-1:-1;690:6189:26;;;;;;;;;;;;;;;;;;;;;;:::o;5:130:-1:-;72:20;;97:33;72:20;97:33;;142:134;220:13;;238:33;220:13;238:33;;487:789;;630:3;623:4;615:6;611:17;607:27;597:2;;648:1;645;638:12;597:2;685:6;672:20;707:106;722:90;805:6;722:90;;;707:106;;;698:115;;830:5;855:6;848:5;841:21;885:4;877:6;873:17;863:27;;907:4;902:3;898:14;891:21;;960:6;1007:3;999:4;991:6;987:17;982:3;978:27;975:36;972:2;;;1024:1;1021;1014:12;972:2;1049:1;1034:236;1059:6;1056:1;1053:13;1034:236;;;1117:3;1139:67;1202:3;1190:10;1139:67;;;1127:80;;-1:-1;1230:4;1221:14;;;;1258:4;1249:14;;;;;1081:1;1074:9;1034:236;;;1038:14;590:686;;;;;;;;1329:771;;1466:3;1459:4;1451:6;1447:17;1443:27;1433:2;;1484:1;1481;1474:12;1433:2;1521:6;1508:20;1543:100;1558:84;1635:6;1558:84;;1543:100;1534:109;;1660:5;1685:6;1678:5;1671:21;1715:4;1707:6;1703:17;1693:27;;1737:4;1732:3;1728:14;1721:21;;1790:6;1837:3;1829:4;1821:6;1817:17;1812:3;1808:27;1805:36;1802:2;;;1854:1;1851;1844:12;1802:2;1879:1;1864:230;1889:6;1886:1;1883:13;1864:230;;;1947:3;1969:61;2026:3;2014:10;1969:61;;;1957:74;;-1:-1;2054:4;2045:14;;;;2082:4;2073:14;;;;;1911:1;1904:9;1864:230;;2108:128;2183:13;;2201:30;2183:13;2201:30;;2243:134;2321:13;;2339:33;2321:13;2339:33;;2398:336;;;2512:3;2505:4;2497:6;2493:17;2489:27;2479:2;;2530:1;2527;2520:12;2479:2;-1:-1;2550:20;;2590:18;2579:30;;2576:2;;;2622:1;2619;2612:12;2576:2;2656:4;2648:6;2644:17;2632:29;;2707:3;2699:4;2691:6;2687:17;2677:8;2673:32;2670:41;2667:2;;;2724:1;2721;2714:12;2667:2;2472:262;;;;;;2742:174;2840:13;;2858:53;2840:13;2858:53;;2970:476;;3089:4;3077:9;3072:3;3068:19;3064:30;3061:2;;;3107:1;3104;3097:12;3061:2;3125:20;3140:4;3125:20;;;3116:29;-1:-1;3197:1;3229:49;3274:3;3254:9;3229:49;;;3204:75;;-1:-1;3342:2;3375:49;3420:3;3396:22;;;3375:49;;;3368:4;3361:5;3357:16;3350:75;3300:136;3055:391;;;;;4022:1087;;4145:4;4133:9;4128:3;4124:19;4120:30;4117:2;;;4163:1;4160;4153:12;4117:2;4181:20;4196:4;4181:20;;;4172:29;-1:-1;4262:1;4294:57;4347:3;4327:9;4294:57;;;4269:83;;-1:-1;4431:2;4464:49;4509:3;4485:22;;;4464:49;;;4457:4;4450:5;4446:16;4439:75;4373:152;4609:2;4598:9;4594:18;4581:32;4633:18;4625:6;4622:30;4619:2;;;4665:1;4662;4655:12;4619:2;4700:94;4790:3;4781:6;4770:9;4766:22;4700:94;;;4693:4;4686:5;4682:16;4675:120;4535:271;4896:2;4885:9;4881:18;4868:32;4920:18;4912:6;4909:30;4906:2;;;4952:1;4949;4942:12;4906:2;4987:100;5083:3;5074:6;5063:9;5059:22;4987:100;;;4980:4;4973:5;4969:16;4962:126;4816:283;4111:998;;;;;5116:130;5183:20;;5208:33;5183:20;5208:33;;5394:263;;5509:2;5497:9;5488:7;5484:23;5480:32;5477:2;;;5525:1;5522;5515:12;5477:2;5560:1;5577:64;5633:7;5613:9;5577:64;;5664:366;;;5785:2;5773:9;5764:7;5760:23;5756:32;5753:2;;;5801:1;5798;5791:12;5753:2;5836:1;5853:53;5898:7;5878:9;5853:53;;;5843:63;;5815:97;5943:2;5961:53;6006:7;5997:6;5986:9;5982:22;5961:53;;;5951:63;;5922:98;5747:283;;;;;;6037:257;;6149:2;6137:9;6128:7;6124:23;6120:32;6117:2;;;6165:1;6162;6155:12;6117:2;6200:1;6217:61;6270:7;6250:9;6217:61;;6301:263;;6416:2;6404:9;6395:7;6391:23;6387:32;6384:2;;;6432:1;6429;6422:12;6384:2;6467:1;6484:64;6540:7;6520:9;6484:64;;6571:303;;6706:2;6694:9;6685:7;6681:23;6677:32;6674:2;;;6722:1;6719;6712:12;6674:2;6757:1;6774:84;6850:7;6830:9;6774:84;;6881:395;;7019:2;7007:9;6998:7;6994:23;6990:32;6987:2;;;7035:1;7032;7025:12;6987:2;7070:31;;7121:18;7110:30;;7107:2;;;7153:1;7150;7143:12;7107:2;7173:87;7252:7;7243:6;7232:9;7228:22;7173:87;;7553:883;;;;;;;7752:3;7740:9;7731:7;7727:23;7723:33;7720:2;;;7769:1;7766;7759:12;7720:2;7804:1;7821:53;7866:7;7846:9;7821:53;;;7811:63;;7783:97;7911:2;7929:53;7974:7;7965:6;7954:9;7950:22;7929:53;;;7919:63;;7890:98;8019:2;8037:61;8090:7;8081:6;8070:9;8066:22;8037:61;;;8027:71;;7998:106;8135:2;8153:53;8198:7;8189:6;8178:9;8174:22;8153:53;;;8143:63;;8114:98;8271:3;8260:9;8256:19;8243:33;8296:18;8288:6;8285:30;8282:2;;;8328:1;8325;8318:12;8282:2;8356:64;8412:7;8403:6;8392:9;8388:22;8356:64;;;8346:74;;;;8222:204;7714:722;;;;;;;;;8443:741;;;;;;8617:3;8605:9;8596:7;8592:23;8588:33;8585:2;;;8634:1;8631;8624:12;8585:2;8669:1;8686:53;8731:7;8711:9;8686:53;;;8676:63;;8648:97;8776:2;8794:53;8839:7;8830:6;8819:9;8815:22;8794:53;;;8784:63;;8755:98;8884:2;8902:53;8947:7;8938:6;8927:9;8923:22;8902:53;;;8892:63;;8863:98;9020:2;9009:9;9005:18;8992:32;9044:18;9036:6;9033:30;9030:2;;;9076:1;9073;9066:12;9030:2;9104:64;9160:7;9151:6;9140:9;9136:22;9104:64;;;9094:74;;;;8971:203;8579:605;;;;;;;;;9191:142;9282:45;9321:5;9282:45;;;9277:3;9270:58;9264:69;;;9340:113;9423:24;9441:5;9423:24;;9460:113;9543:24;9561:5;9543:24;;9603:310;;9735:88;9816:6;9811:3;9735:88;;;9728:95;;9835:43;9871:6;9866:3;9859:5;9835:43;;;-1:-1;;9891:16;;9721:192;9921:343;;10031:38;10063:5;10031:38;;;10081:70;10144:6;10139:3;10081:70;;;10074:77;;10156:52;10201:6;10196:3;10189:4;10182:5;10178:16;10156:52;;;10229:29;10251:6;10229:29;;;10220:39;;;;10011:253;-1:-1;;;10011:253;10271:356;;10399:38;10431:5;10399:38;;;10449:88;10530:6;10525:3;10449:88;;;10442:95;;10542:52;10587:6;10582:3;10575:4;10568:5;10564:16;10542:52;;;10606:16;;;;;10379:248;-1:-1;;10379:248;10989:378;;11149:67;11213:2;11208:3;11149:67;;;11249:34;11229:55;;-1:-1;;;11313:2;11304:12;;11297:33;11358:2;11349:12;;11135:232;-1:-1;;11135:232;11376:329;;11536:67;11600:2;11595:3;11536:67;;;11636:31;11616:52;;11696:2;11687:12;;11522:183;-1:-1;;11522:183;11714:296;;11891:83;11972:1;11967:3;11891:83;;12019:332;;12179:67;12243:2;12238:3;12179:67;;;12279:34;12259:55;;12342:2;12333:12;;12165:186;-1:-1;;12165:186;12479:439;;12679:93;12768:3;12759:6;12679:93;;;12672:100;;12790:103;12889:3;12880:6;12872;12790:103;;;12783:110;12660:258;-1:-1;;;;;12660:258;12925:370;;13123:147;13266:3;13123:147;;13302:213;13420:2;13405:18;;13434:71;13409:9;13478:6;13434:71;;13522:647;13750:3;13735:19;;13765:79;13739:9;13817:6;13765:79;;;13855:72;13923:2;13912:9;13908:18;13899:6;13855:72;;;13938;14006:2;13995:9;13991:18;13982:6;13938:72;;;14058:9;14052:4;14048:20;14043:2;14032:9;14028:18;14021:48;14083:76;14154:4;14145:6;14083:76;;;14075:84;13721:448;-1:-1;;;;;;13721:448;14176:324;14322:2;14307:18;;14336:71;14311:9;14380:6;14336:71;;;14418:72;14486:2;14475:9;14471:18;14462:6;14418:72;;14507:435;14681:2;14666:18;;14695:71;14670:9;14739:6;14695:71;;;14777:72;14845:2;14834:9;14830:18;14821:6;14777:72;;;14860;14928:2;14917:9;14913:18;14904:6;14860:72;;14949:301;15087:2;15101:47;;;15072:18;;15162:78;15072:18;15226:6;15162:78;;15257:407;15448:2;15462:47;;;15433:18;;15523:131;15433:18;15523:131;;15671:407;15862:2;15876:47;;;15847:18;;15937:131;15847:18;15937:131;;16085:407;16276:2;16290:47;;;16261:18;;16351:131;16261:18;16351:131;;16499:213;16617:2;16602:18;;16631:71;16606:9;16675:6;16631:71;;16719:324;16865:2;16850:18;;16879:71;16854:9;16923:6;16879:71;;17492:256;17554:2;17548:9;17580:17;;;17655:18;17640:34;;17676:22;;;17637:62;17634:2;;;17712:1;17709;17702:12;17634:2;17728;17721:22;17532:216;;-1:-1;17532:216;17755:330;;17940:18;17932:6;17929:30;17926:2;;;17972:1;17969;17962:12;17926:2;-1:-1;18007:4;17995:17;;;18060:15;;17863:222;18423:121;18510:12;;18481:63;18681:162;18783:19;;;18832:4;18823:14;;18776:67;18852:144;18987:3;18965:31;-1:-1;18965:31;19176:91;;19238:24;19256:5;19238:24;;19380:85;19446:13;19439:21;;19422:43;19472:72;19534:5;19517:27;19551:111;;19633:24;19651:5;19633:24;;19669:121;-1:-1;;;;;19731:54;;19714:76;19876:129;;19963:37;19994:5;19963:37;;20256:145;20337:6;20332:3;20327;20314:30;-1:-1;20393:1;20375:16;;20368:27;20307:94;20410:268;20475:1;20482:101;20496:6;20493:1;20490:13;20482:101;;;20563:11;;;20557:18;20544:11;;;20537:39;20518:2;20511:10;20482:101;;;20598:6;20595:1;20592:13;20589:2;;;20663:1;20654:6;20649:3;20645:16;20638:27;20589:2;20459:219;;;;;20686:97;20774:2;20754:14;-1:-1;;20750:28;;20734:49;20791:117;20860:24;20878:5;20860:24;;;20853:5;20850:35;20840:2;;20899:1;20896;20889:12;20840:2;20834:74;;21055:111;21121:21;21136:5;21121:21;;21173:117;21242:24;21260:5;21242:24;;21297:157;21386:44;21424:5;21386:44;", "source": "/*\n A manager to exit all positions (collateral and debt)\n*/\n\npragma solidity 0.5.16;\npragma experimental ABIEncoderV2;\n\nimport \"../interfaces/IERC20.sol\";\n\nimport \"../interfaces/compound/IComptroller.sol\";\nimport \"../interfaces/compound/ICEther.sol\";\nimport \"../interfaces/compound/ICToken.sol\";\n\nimport \"../interfaces/aave/ILendingPoolAddressesProvider.sol\";\nimport \"../interfaces/aave/ILendingPool.sol\";\nimport \"../interfaces/aave/ILendingPoolParametersProvider.sol\";\n\nimport \"../lib/uniswap/UniswapLiteBase.sol\";\nimport \"../lib/dapphub/Guard.sol\";\n\nimport \"../registries/AddressRegistry.sol\";\n\nimport \"../proxies/DACProxy.sol\";\n\nimport \"@openzeppelin/contracts/math/SafeMath.sol\";\n\n\ncontract DedgeExitManager is UniswapLiteBase {\n using SafeMath for uint256;\n\n function() external payable {}\n\n constructor() public {}\n\n struct DebtMarket {\n address cToken;\n uint256 amount;\n }\n\n struct CollateralMarket {\n address cToken;\n uint256 amount;\n }\n\n struct ExitPositionCalldata {\n address payable exitUserAddress;\n address addressRegistryAddress;\n DebtMarket[] debtMarket;\n CollateralMarket[] collateralMarket;\n }\n\n function _proxyGuardPermit(address payable proxyAddress, address src)\n internal\n {\n address g = address(DACProxy(proxyAddress).authority());\n\n DSGuard(g).permit(\n bytes32(bytes20(address(src))),\n DSGuard(g).ANY(),\n DSGuard(g).ANY()\n );\n }\n\n function _proxyGuardForbid(address payable proxyAddress, address src)\n internal\n {\n address g = address(DACProxy(proxyAddress).authority());\n\n DSGuard(g).forbid(\n bytes32(bytes20(address(src))),\n DSGuard(g).ANY(),\n DSGuard(g).ANY()\n );\n }\n\n function _approve(address cToken, uint256 amount) public {\n // Approves CToken contract to call `transferFrom`\n address underlying = ICToken(cToken).underlying();\n require(\n IERC20(underlying).approve(cToken, amount) == true,\n \"cmpnd-mgr-ctoken-approved-failed\"\n );\n }\n\n function _transfer(\n address CEtherAddress,\n address cToken,\n address recipient,\n uint256 amount\n ) internal {\n if (cToken == CEtherAddress) {\n recipient.call.value(amount)(\"\");\n } else {\n require(\n IERC20(ICToken(cToken).underlying()).transfer(\n recipient,\n amount\n ),\n \"cmpnd-mgr-transfer-failed\"\n );\n }\n }\n\n function _repayBorrow(address CEtherAddress, address cToken, uint256 amount)\n internal\n {\n if (cToken == CEtherAddress) {\n ICEther(cToken).repayBorrow.value(amount)();\n } else {\n _approve(cToken, amount);\n require(\n ICToken(cToken).repayBorrow(amount) == 0,\n \"cmpnd-mgr-ctoken-repay-failed\"\n );\n }\n }\n\n function _redeemUnderlying(address cToken, uint256 redeemTokens) internal {\n uint a = ICToken(cToken).redeemUnderlying(redeemTokens);\n require(\n a == 0,\n \"cmpnd-mgr-ctoken-redeem-underlying-failed\"\n );\n }\n\n function _repayDebt(address CEtherAddress, address cToken, uint256 amount)\n internal\n {\n // Always assume we have enough ETH to repay debt\n if (cToken != CEtherAddress) {\n address underlying = ICToken(cToken).underlying();\n\n // Get ETH needed to get ERC20\n uint256 ethAmount = _getEthToTokenOutput(underlying, amount);\n\n // Convert ETH to token\n _ethToToken(underlying, ethAmount);\n }\n\n _repayBorrow(CEtherAddress, cToken, amount);\n }\n\n function _retrieveCollateral(\n address CEtherAddress,\n address cToken,\n uint256 amount\n ) internal returns (uint256) {\n // Redeems token\n _redeemUnderlying(cToken, amount);\n\n if (cToken == CEtherAddress) {\n return amount;\n }\n\n address underlying = ICToken(cToken).underlying();\n return _tokenToEth(underlying, amount);\n }\n\n function exitPositionsPostLoan(\n uint256 _amount,\n uint256 _fee,\n uint256 _protocolFee,\n bytes calldata _params\n ) external {\n // We should now have funds\n ExitPositionCalldata memory epCalldata = abi.decode(\n _params,\n (ExitPositionCalldata)\n );\n\n AddressRegistry addressRegistry = AddressRegistry(\n epCalldata.addressRegistryAddress\n );\n address CEtherAddress = addressRegistry.CEtherAddress();\n\n // Repay debt and retrieve collateral\n for (uint256 i = 0; i < epCalldata.debtMarket.length; i++) {\n _repayDebt(\n CEtherAddress,\n epCalldata.debtMarket[i].cToken,\n epCalldata.debtMarket[i].amount\n );\n }\n\n uint256 totalEthAmount;\n for (uint256 i = 0; i < epCalldata.collateralMarket.length; i++) {\n totalEthAmount += _retrieveCollateral(\n CEtherAddress,\n epCalldata.collateralMarket[i].cToken,\n epCalldata.collateralMarket[i].amount\n );\n }\n\n // Repays (ETH - fees) back to exitAddress\n epCalldata.exitUserAddress.call.value(\n totalEthAmount.sub(_amount).sub(_fee).sub(_protocolFee)\n )(\"\");\n }\n\n function exitPositions(\n uint256 totalEthDebtAmount,\n address dedgeExitManagerAddress,\n address payable dacProxyAddress,\n address addressRegistryAddress,\n bytes calldata executeOperationCalldataParams\n ) external {\n AddressRegistry addressRegistry = AddressRegistry(\n addressRegistryAddress\n );\n\n // Injects target address into calldataParams\n bytes memory addressAndExecuteOperationCalldataParams = abi\n .encodePacked(\n abi.encode(dedgeExitManagerAddress),\n executeOperationCalldataParams\n );\n\n ILendingPool lendingPool = ILendingPool(\n ILendingPoolAddressesProvider(\n addressRegistry.AaveLendingPoolAddressProviderAddress()\n )\n .getLendingPool()\n );\n\n // Approve lendingPool to call proxy\n _proxyGuardPermit(dacProxyAddress, address(lendingPool));\n\n // 3. Flashloan ETH with relevant data\n lendingPool.flashLoan(\n dacProxyAddress,\n addressRegistry.AaveEthAddress(),\n totalEthDebtAmount,\n addressAndExecuteOperationCalldataParams\n );\n\n // Forbids lendingPool to call proxy\n _proxyGuardForbid(dacProxyAddress, address(lendingPool));\n }\n}\n", @@ -109,14 +109,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeExitManager.sol", "exportedSymbols": { "DedgeExitManager": [ - 6428 + 6419 ] }, - "id": 6429, + "id": 6420, "nodeType": "SourceUnit", "nodes": [ { - "id": 5898, + "id": 5889, "literals": [ "solidity", "0.5", @@ -126,7 +126,7 @@ "src": "65:23:26" }, { - "id": 5899, + "id": 5890, "literals": [ "experimental", "ABIEncoderV2" @@ -137,9 +137,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../interfaces/IERC20.sol", - "id": 5900, + "id": 5891, "nodeType": "ImportDirective", - "scope": 6429, + "scope": 6420, "sourceUnit": 121, "src": "124:34:26", "symbolAliases": [], @@ -148,10 +148,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", "file": "../interfaces/compound/IComptroller.sol", - "id": 5901, + "id": 5892, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 1097, + "scope": 6420, + "sourceUnit": 1123, "src": "160:49:26", "symbolAliases": [], "unitAlias": "" @@ -159,10 +159,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol", "file": "../interfaces/compound/ICEther.sol", - "id": 5902, + "id": 5893, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 733, + "scope": 6420, + "sourceUnit": 746, "src": "210:44:26", "symbolAliases": [], "unitAlias": "" @@ -170,10 +170,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol", "file": "../interfaces/compound/ICToken.sol", - "id": 5903, + "id": 5894, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 859, + "scope": 6420, + "sourceUnit": 885, "src": "255:44:26", "symbolAliases": [], "unitAlias": "" @@ -181,9 +181,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol", "file": "../interfaces/aave/ILendingPoolAddressesProvider.sol", - "id": 5904, + "id": 5895, "nodeType": "ImportDirective", - "scope": 6429, + "scope": 6420, "sourceUnit": 660, "src": "301:62:26", "symbolAliases": [], @@ -192,9 +192,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol", "file": "../interfaces/aave/ILendingPool.sol", - "id": 5905, + "id": 5896, "nodeType": "ImportDirective", - "scope": 6429, + "scope": 6420, "sourceUnit": 547, "src": "364:45:26", "symbolAliases": [], @@ -203,9 +203,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolParametersProvider.sol", "file": "../interfaces/aave/ILendingPoolParametersProvider.sol", - "id": 5906, + "id": 5897, "nodeType": "ImportDirective", - "scope": 6429, + "scope": 6420, "sourceUnit": 670, "src": "410:63:26", "symbolAliases": [], @@ -214,10 +214,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapLiteBase.sol", "file": "../lib/uniswap/UniswapLiteBase.sol", - "id": 5907, + "id": 5898, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 5195, + "scope": 6420, + "sourceUnit": 5247, "src": "475:44:26", "symbolAliases": [], "unitAlias": "" @@ -225,10 +225,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "file": "../lib/dapphub/Guard.sol", - "id": 5908, + "id": 5899, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 3196, + "scope": 6420, + "sourceUnit": 3248, "src": "520:34:26", "symbolAliases": [], "unitAlias": "" @@ -236,10 +236,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol", "file": "../registries/AddressRegistry.sol", - "id": 5909, + "id": 5900, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 7551, + "scope": 6420, + "sourceUnit": 7542, "src": "556:43:26", "symbolAliases": [], "unitAlias": "" @@ -247,10 +247,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol", "file": "../proxies/DACProxy.sol", - "id": 5910, + "id": 5901, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 7245, + "scope": 6420, + "sourceUnit": 7236, "src": "601:33:26", "symbolAliases": [], "unitAlias": "" @@ -258,10 +258,10 @@ { "absolutePath": "@openzeppelin/contracts/math/SafeMath.sol", "file": "@openzeppelin/contracts/math/SafeMath.sol", - "id": 5911, + "id": 5902, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 7738, + "scope": 6420, + "sourceUnit": 7729, "src": "636:51:26", "symbolAliases": [], "unitAlias": "" @@ -272,53 +272,53 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 5912, + "id": 5903, "name": "UniswapLiteBase", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5194, + "referencedDeclaration": 5246, "src": "719:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_UniswapLiteBase_$5194", + "typeIdentifier": "t_contract$_UniswapLiteBase_$5246", "typeString": "contract UniswapLiteBase" } }, - "id": 5913, + "id": 5904, "nodeType": "InheritanceSpecifier", "src": "719:15:26" } ], "contractDependencies": [ - 5194 + 5246 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 6428, + "id": 6419, "linearizedBaseContracts": [ - 6428, - 5194 + 6419, + 5246 ], "name": "DedgeExitManager", "nodeType": "ContractDefinition", "nodes": [ { - "id": 5916, + "id": 5907, "libraryName": { "contractScope": null, - "id": 5914, + "id": 5905, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7737, + "referencedDeclaration": 7728, "src": "747:8:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$7737", + "typeIdentifier": "t_contract$_SafeMath_$7728", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", "src": "741:27:26", "typeName": { - "id": 5915, + "id": 5906, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "760:7:26", @@ -330,31 +330,31 @@ }, { "body": { - "id": 5919, + "id": 5910, "nodeType": "Block", "src": "802:2:26", "statements": [] }, "documentation": null, - "id": 5920, + "id": 5911, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 5917, + "id": 5908, "nodeType": "ParameterList", "parameters": [], "src": "782:2:26" }, "returnParameters": { - "id": 5918, + "id": 5909, "nodeType": "ParameterList", "parameters": [], "src": "802:0:26" }, - "scope": 6428, + "scope": 6419, "src": "774:30:26", "stateMutability": "payable", "superFunction": null, @@ -362,31 +362,31 @@ }, { "body": { - "id": 5923, + "id": 5914, "nodeType": "Block", "src": "831:2:26", "statements": [] }, "documentation": null, - "id": 5924, + "id": 5915, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 5921, + "id": 5912, "nodeType": "ParameterList", "parameters": [], "src": "821:2:26" }, "returnParameters": { - "id": 5922, + "id": 5913, "nodeType": "ParameterList", "parameters": [], "src": "831:0:26" }, - "scope": 6428, + "scope": 6419, "src": "810:23:26", "stateMutability": "nonpayable", "superFunction": null, @@ -394,14 +394,14 @@ }, { "canonicalName": "DedgeExitManager.DebtMarket", - "id": 5929, + "id": 5920, "members": [ { "constant": false, - "id": 5926, + "id": 5917, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 5929, + "scope": 5920, "src": "867:14:26", "stateVariable": false, "storageLocation": "default", @@ -410,7 +410,7 @@ "typeString": "address" }, "typeName": { - "id": 5925, + "id": 5916, "name": "address", "nodeType": "ElementaryTypeName", "src": "867:7:26", @@ -425,10 +425,10 @@ }, { "constant": false, - "id": 5928, + "id": 5919, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 5929, + "scope": 5920, "src": "891:14:26", "stateVariable": false, "storageLocation": "default", @@ -437,7 +437,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5927, + "id": 5918, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "891:7:26", @@ -452,20 +452,20 @@ ], "name": "DebtMarket", "nodeType": "StructDefinition", - "scope": 6428, + "scope": 6419, "src": "839:73:26", "visibility": "public" }, { "canonicalName": "DedgeExitManager.CollateralMarket", - "id": 5934, + "id": 5925, "members": [ { "constant": false, - "id": 5931, + "id": 5922, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 5934, + "scope": 5925, "src": "952:14:26", "stateVariable": false, "storageLocation": "default", @@ -474,7 +474,7 @@ "typeString": "address" }, "typeName": { - "id": 5930, + "id": 5921, "name": "address", "nodeType": "ElementaryTypeName", "src": "952:7:26", @@ -489,10 +489,10 @@ }, { "constant": false, - "id": 5933, + "id": 5924, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 5934, + "scope": 5925, "src": "976:14:26", "stateVariable": false, "storageLocation": "default", @@ -501,7 +501,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5932, + "id": 5923, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "976:7:26", @@ -516,20 +516,20 @@ ], "name": "CollateralMarket", "nodeType": "StructDefinition", - "scope": 6428, + "scope": 6419, "src": "918:79:26", "visibility": "public" }, { "canonicalName": "DedgeExitManager.ExitPositionCalldata", - "id": 5945, + "id": 5936, "members": [ { "constant": false, - "id": 5936, + "id": 5927, "name": "exitUserAddress", "nodeType": "VariableDeclaration", - "scope": 5945, + "scope": 5936, "src": "1041:31:26", "stateVariable": false, "storageLocation": "default", @@ -538,7 +538,7 @@ "typeString": "address payable" }, "typeName": { - "id": 5935, + "id": 5926, "name": "address", "nodeType": "ElementaryTypeName", "src": "1041:15:26", @@ -553,10 +553,10 @@ }, { "constant": false, - "id": 5938, + "id": 5929, "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 5945, + "scope": 5936, "src": "1082:30:26", "stateVariable": false, "storageLocation": "default", @@ -565,7 +565,7 @@ "typeString": "address" }, "typeName": { - "id": 5937, + "id": 5928, "name": "address", "nodeType": "ElementaryTypeName", "src": "1082:7:26", @@ -580,36 +580,36 @@ }, { "constant": false, - "id": 5941, + "id": 5932, "name": "debtMarket", "nodeType": "VariableDeclaration", - "scope": 5945, + "scope": 5936, "src": "1122:23:26", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5929_storage_$dyn_storage_ptr", + "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5920_storage_$dyn_storage_ptr", "typeString": "struct DedgeExitManager.DebtMarket[]" }, "typeName": { "baseType": { "contractScope": null, - "id": 5939, + "id": 5930, "name": "DebtMarket", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5929, + "referencedDeclaration": 5920, "src": "1122:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_DebtMarket_$5929_storage_ptr", + "typeIdentifier": "t_struct$_DebtMarket_$5920_storage_ptr", "typeString": "struct DedgeExitManager.DebtMarket" } }, - "id": 5940, + "id": 5931, "length": null, "nodeType": "ArrayTypeName", "src": "1122:12:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5929_storage_$dyn_storage_ptr", + "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5920_storage_$dyn_storage_ptr", "typeString": "struct DedgeExitManager.DebtMarket[]" } }, @@ -618,36 +618,36 @@ }, { "constant": false, - "id": 5944, + "id": 5935, "name": "collateralMarket", "nodeType": "VariableDeclaration", - "scope": 5945, + "scope": 5936, "src": "1155:35:26", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5934_storage_$dyn_storage_ptr", + "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5925_storage_$dyn_storage_ptr", "typeString": "struct DedgeExitManager.CollateralMarket[]" }, "typeName": { "baseType": { "contractScope": null, - "id": 5942, + "id": 5933, "name": "CollateralMarket", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5934, + "referencedDeclaration": 5925, "src": "1155:16:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_CollateralMarket_$5934_storage_ptr", + "typeIdentifier": "t_struct$_CollateralMarket_$5925_storage_ptr", "typeString": "struct DedgeExitManager.CollateralMarket" } }, - "id": 5943, + "id": 5934, "length": null, "nodeType": "ArrayTypeName", "src": "1155:18:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5934_storage_$dyn_storage_ptr", + "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5925_storage_$dyn_storage_ptr", "typeString": "struct DedgeExitManager.CollateralMarket[]" } }, @@ -657,27 +657,27 @@ ], "name": "ExitPositionCalldata", "nodeType": "StructDefinition", - "scope": 6428, + "scope": 6419, "src": "1003:194:26", "visibility": "public" }, { "body": { - "id": 5985, + "id": 5976, "nodeType": "Block", "src": "1294:214:26", "statements": [ { "assignments": [ - 5953 + 5944 ], "declarations": [ { "constant": false, - "id": 5953, + "id": 5944, "name": "g", "nodeType": "VariableDeclaration", - "scope": 5985, + "scope": 5976, "src": "1304:9:26", "stateVariable": false, "storageLocation": "default", @@ -686,7 +686,7 @@ "typeString": "address" }, "typeName": { - "id": 5952, + "id": 5943, "name": "address", "nodeType": "ElementaryTypeName", "src": "1304:7:26", @@ -700,7 +700,7 @@ "visibility": "internal" } ], - "id": 5961, + "id": 5952, "initialValue": { "argumentTypes": null, "arguments": [ @@ -714,11 +714,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5956, + "id": 5947, "name": "proxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5947, + "referencedDeclaration": 5938, "src": "1333:12:26", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -733,18 +733,18 @@ "typeString": "address payable" } ], - "id": 5955, + "id": 5946, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1324:8:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 5957, + "id": 5948, "isConstant": false, "isLValue": false, "isPure": false, @@ -754,25 +754,25 @@ "nodeType": "FunctionCall", "src": "1324:22:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 5958, + "id": 5949, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "authority", "nodeType": "MemberAccess", - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1324:32:26", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2799_$", + "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2851_$", "typeString": "function () view external returns (contract DSAuthority)" } }, - "id": 5959, + "id": 5950, "isConstant": false, "isLValue": false, "isPure": false, @@ -782,7 +782,7 @@ "nodeType": "FunctionCall", "src": "1324:34:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -790,11 +790,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 5954, + "id": 5945, "isConstant": false, "isLValue": false, "isPure": true, @@ -807,7 +807,7 @@ }, "typeName": "address" }, - "id": 5960, + "id": 5951, "isConstant": false, "isLValue": false, "isPure": false, @@ -839,11 +839,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5969, + "id": 5960, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5949, + "referencedDeclaration": 5940, "src": "1425:3:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -858,7 +858,7 @@ "typeString": "address" } ], - "id": 5968, + "id": 5959, "isConstant": false, "isLValue": false, "isPure": true, @@ -871,7 +871,7 @@ }, "typeName": "address" }, - "id": 5970, + "id": 5961, "isConstant": false, "isLValue": false, "isPure": false, @@ -893,7 +893,7 @@ "typeString": "address" } ], - "id": 5967, + "id": 5958, "isConstant": false, "isLValue": false, "isPure": true, @@ -906,7 +906,7 @@ }, "typeName": "bytes20" }, - "id": 5971, + "id": 5962, "isConstant": false, "isLValue": false, "isPure": false, @@ -928,7 +928,7 @@ "typeString": "bytes20" } ], - "id": 5966, + "id": 5957, "isConstant": false, "isLValue": false, "isPure": true, @@ -941,7 +941,7 @@ }, "typeName": "bytes32" }, - "id": 5972, + "id": 5963, "isConstant": false, "isLValue": false, "isPure": false, @@ -965,11 +965,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5974, + "id": 5965, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5953, + "referencedDeclaration": 5944, "src": "1453:1:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -984,18 +984,18 @@ "typeString": "address" } ], - "id": 5973, + "id": 5964, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1445:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 5975, + "id": 5966, "isConstant": false, "isLValue": false, "isPure": false, @@ -1005,25 +1005,25 @@ "nodeType": "FunctionCall", "src": "1445:10:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 5976, + "id": 5967, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1445:14:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 5977, + "id": 5968, "isConstant": false, "isLValue": false, "isPure": false, @@ -1047,11 +1047,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5979, + "id": 5970, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5953, + "referencedDeclaration": 5944, "src": "1483:1:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1066,18 +1066,18 @@ "typeString": "address" } ], - "id": 5978, + "id": 5969, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1475:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 5980, + "id": 5971, "isConstant": false, "isLValue": false, "isPure": false, @@ -1087,25 +1087,25 @@ "nodeType": "FunctionCall", "src": "1475:10:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 5981, + "id": 5972, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1475:14:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 5982, + "id": 5973, "isConstant": false, "isLValue": false, "isPure": false, @@ -1140,11 +1140,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5963, + "id": 5954, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5953, + "referencedDeclaration": 5944, "src": "1378:1:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1159,18 +1159,18 @@ "typeString": "address" } ], - "id": 5962, + "id": 5953, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1370:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 5964, + "id": 5955, "isConstant": false, "isLValue": false, "isPure": false, @@ -1180,25 +1180,25 @@ "nodeType": "FunctionCall", "src": "1370:10:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 5965, + "id": 5956, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "permit", "nodeType": "MemberAccess", - "referencedDeclaration": 3086, + "referencedDeclaration": 3138, "src": "1370:17:26", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32) external" } }, - "id": 5983, + "id": 5974, "isConstant": false, "isLValue": false, "isPure": false, @@ -1212,29 +1212,29 @@ "typeString": "tuple()" } }, - "id": 5984, + "id": 5975, "nodeType": "ExpressionStatement", "src": "1370:131:26" } ] }, "documentation": null, - "id": 5986, + "id": 5977, "implemented": true, "kind": "function", "modifiers": [], "name": "_proxyGuardPermit", "nodeType": "FunctionDefinition", "parameters": { - "id": 5950, + "id": 5941, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5947, + "id": 5938, "name": "proxyAddress", "nodeType": "VariableDeclaration", - "scope": 5986, + "scope": 5977, "src": "1230:28:26", "stateVariable": false, "storageLocation": "default", @@ -1243,7 +1243,7 @@ "typeString": "address payable" }, "typeName": { - "id": 5946, + "id": 5937, "name": "address", "nodeType": "ElementaryTypeName", "src": "1230:15:26", @@ -1258,10 +1258,10 @@ }, { "constant": false, - "id": 5949, + "id": 5940, "name": "src", "nodeType": "VariableDeclaration", - "scope": 5986, + "scope": 5977, "src": "1260:11:26", "stateVariable": false, "storageLocation": "default", @@ -1270,7 +1270,7 @@ "typeString": "address" }, "typeName": { - "id": 5948, + "id": 5939, "name": "address", "nodeType": "ElementaryTypeName", "src": "1260:7:26", @@ -1287,12 +1287,12 @@ "src": "1229:43:26" }, "returnParameters": { - "id": 5951, + "id": 5942, "nodeType": "ParameterList", "parameters": [], "src": "1294:0:26" }, - "scope": 6428, + "scope": 6419, "src": "1203:305:26", "stateMutability": "nonpayable", "superFunction": null, @@ -1300,21 +1300,21 @@ }, { "body": { - "id": 6026, + "id": 6017, "nodeType": "Block", "src": "1605:214:26", "statements": [ { "assignments": [ - 5994 + 5985 ], "declarations": [ { "constant": false, - "id": 5994, + "id": 5985, "name": "g", "nodeType": "VariableDeclaration", - "scope": 6026, + "scope": 6017, "src": "1615:9:26", "stateVariable": false, "storageLocation": "default", @@ -1323,7 +1323,7 @@ "typeString": "address" }, "typeName": { - "id": 5993, + "id": 5984, "name": "address", "nodeType": "ElementaryTypeName", "src": "1615:7:26", @@ -1337,7 +1337,7 @@ "visibility": "internal" } ], - "id": 6002, + "id": 5993, "initialValue": { "argumentTypes": null, "arguments": [ @@ -1351,11 +1351,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5997, + "id": 5988, "name": "proxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5988, + "referencedDeclaration": 5979, "src": "1644:12:26", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -1370,18 +1370,18 @@ "typeString": "address payable" } ], - "id": 5996, + "id": 5987, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1635:8:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 5998, + "id": 5989, "isConstant": false, "isLValue": false, "isPure": false, @@ -1391,25 +1391,25 @@ "nodeType": "FunctionCall", "src": "1635:22:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 5999, + "id": 5990, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "authority", "nodeType": "MemberAccess", - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1635:32:26", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2799_$", + "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2851_$", "typeString": "function () view external returns (contract DSAuthority)" } }, - "id": 6000, + "id": 5991, "isConstant": false, "isLValue": false, "isPure": false, @@ -1419,7 +1419,7 @@ "nodeType": "FunctionCall", "src": "1635:34:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -1427,11 +1427,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 5995, + "id": 5986, "isConstant": false, "isLValue": false, "isPure": true, @@ -1444,7 +1444,7 @@ }, "typeName": "address" }, - "id": 6001, + "id": 5992, "isConstant": false, "isLValue": false, "isPure": false, @@ -1476,11 +1476,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6010, + "id": 6001, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5990, + "referencedDeclaration": 5981, "src": "1736:3:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1495,7 +1495,7 @@ "typeString": "address" } ], - "id": 6009, + "id": 6000, "isConstant": false, "isLValue": false, "isPure": true, @@ -1508,7 +1508,7 @@ }, "typeName": "address" }, - "id": 6011, + "id": 6002, "isConstant": false, "isLValue": false, "isPure": false, @@ -1530,7 +1530,7 @@ "typeString": "address" } ], - "id": 6008, + "id": 5999, "isConstant": false, "isLValue": false, "isPure": true, @@ -1543,7 +1543,7 @@ }, "typeName": "bytes20" }, - "id": 6012, + "id": 6003, "isConstant": false, "isLValue": false, "isPure": false, @@ -1565,7 +1565,7 @@ "typeString": "bytes20" } ], - "id": 6007, + "id": 5998, "isConstant": false, "isLValue": false, "isPure": true, @@ -1578,7 +1578,7 @@ }, "typeName": "bytes32" }, - "id": 6013, + "id": 6004, "isConstant": false, "isLValue": false, "isPure": false, @@ -1602,11 +1602,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6015, + "id": 6006, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5994, + "referencedDeclaration": 5985, "src": "1764:1:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1621,18 +1621,18 @@ "typeString": "address" } ], - "id": 6014, + "id": 6005, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1756:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6016, + "id": 6007, "isConstant": false, "isLValue": false, "isPure": false, @@ -1642,25 +1642,25 @@ "nodeType": "FunctionCall", "src": "1756:10:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6017, + "id": 6008, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1756:14:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 6018, + "id": 6009, "isConstant": false, "isLValue": false, "isPure": false, @@ -1684,11 +1684,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6020, + "id": 6011, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5994, + "referencedDeclaration": 5985, "src": "1794:1:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1703,18 +1703,18 @@ "typeString": "address" } ], - "id": 6019, + "id": 6010, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1786:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6021, + "id": 6012, "isConstant": false, "isLValue": false, "isPure": false, @@ -1724,25 +1724,25 @@ "nodeType": "FunctionCall", "src": "1786:10:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6022, + "id": 6013, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1786:14:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 6023, + "id": 6014, "isConstant": false, "isLValue": false, "isPure": false, @@ -1777,11 +1777,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6004, + "id": 5995, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5994, + "referencedDeclaration": 5985, "src": "1689:1:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1796,18 +1796,18 @@ "typeString": "address" } ], - "id": 6003, + "id": 5994, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1681:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6005, + "id": 5996, "isConstant": false, "isLValue": false, "isPure": false, @@ -1817,25 +1817,25 @@ "nodeType": "FunctionCall", "src": "1681:10:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6006, + "id": 5997, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "forbid", "nodeType": "MemberAccess", - "referencedDeclaration": 3114, + "referencedDeclaration": 3166, "src": "1681:17:26", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32) external" } }, - "id": 6024, + "id": 6015, "isConstant": false, "isLValue": false, "isPure": false, @@ -1849,29 +1849,29 @@ "typeString": "tuple()" } }, - "id": 6025, + "id": 6016, "nodeType": "ExpressionStatement", "src": "1681:131:26" } ] }, "documentation": null, - "id": 6027, + "id": 6018, "implemented": true, "kind": "function", "modifiers": [], "name": "_proxyGuardForbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 5991, + "id": 5982, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5988, + "id": 5979, "name": "proxyAddress", "nodeType": "VariableDeclaration", - "scope": 6027, + "scope": 6018, "src": "1541:28:26", "stateVariable": false, "storageLocation": "default", @@ -1880,7 +1880,7 @@ "typeString": "address payable" }, "typeName": { - "id": 5987, + "id": 5978, "name": "address", "nodeType": "ElementaryTypeName", "src": "1541:15:26", @@ -1895,10 +1895,10 @@ }, { "constant": false, - "id": 5990, + "id": 5981, "name": "src", "nodeType": "VariableDeclaration", - "scope": 6027, + "scope": 6018, "src": "1571:11:26", "stateVariable": false, "storageLocation": "default", @@ -1907,7 +1907,7 @@ "typeString": "address" }, "typeName": { - "id": 5989, + "id": 5980, "name": "address", "nodeType": "ElementaryTypeName", "src": "1571:7:26", @@ -1924,12 +1924,12 @@ "src": "1540:43:26" }, "returnParameters": { - "id": 5992, + "id": 5983, "nodeType": "ParameterList", "parameters": [], "src": "1605:0:26" }, - "scope": 6428, + "scope": 6419, "src": "1514:305:26", "stateMutability": "nonpayable", "superFunction": null, @@ -1937,21 +1937,21 @@ }, { "body": { - "id": 6055, + "id": 6046, "nodeType": "Block", "src": "1882:264:26", "statements": [ { "assignments": [ - 6035 + 6026 ], "declarations": [ { "constant": false, - "id": 6035, + "id": 6026, "name": "underlying", "nodeType": "VariableDeclaration", - "scope": 6055, + "scope": 6046, "src": "1951:18:26", "stateVariable": false, "storageLocation": "default", @@ -1960,7 +1960,7 @@ "typeString": "address" }, "typeName": { - "id": 6034, + "id": 6025, "name": "address", "nodeType": "ElementaryTypeName", "src": "1951:7:26", @@ -1974,7 +1974,7 @@ "visibility": "internal" } ], - "id": 6041, + "id": 6032, "initialValue": { "argumentTypes": null, "arguments": [], @@ -1985,11 +1985,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6037, + "id": 6028, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6029, + "referencedDeclaration": 6020, "src": "1980:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2004,18 +2004,18 @@ "typeString": "address" } ], - "id": 6036, + "id": 6027, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "1972:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6038, + "id": 6029, "isConstant": false, "isLValue": false, "isPure": false, @@ -2025,25 +2025,25 @@ "nodeType": "FunctionCall", "src": "1972:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6039, + "id": 6030, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, + "referencedDeclaration": 835, "src": "1972:26:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6040, + "id": 6031, "isConstant": false, "isLValue": false, "isPure": false, @@ -2070,7 +2070,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 6051, + "id": 6042, "isConstant": false, "isLValue": false, "isPure": false, @@ -2080,11 +2080,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6047, + "id": 6038, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6029, + "referencedDeclaration": 6020, "src": "2058:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2093,11 +2093,11 @@ }, { "argumentTypes": null, - "id": 6048, + "id": 6039, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6031, + "referencedDeclaration": 6022, "src": "2066:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2121,11 +2121,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6044, + "id": 6035, "name": "underlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6035, + "referencedDeclaration": 6026, "src": "2038:10:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2140,7 +2140,7 @@ "typeString": "address" } ], - "id": 6043, + "id": 6034, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2151,7 +2151,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 6045, + "id": 6036, "isConstant": false, "isLValue": false, "isPure": false, @@ -2165,7 +2165,7 @@ "typeString": "contract IERC20" } }, - "id": 6046, + "id": 6037, "isConstant": false, "isLValue": false, "isPure": false, @@ -2179,7 +2179,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 6049, + "id": 6040, "isConstant": false, "isLValue": false, "isPure": false, @@ -2198,7 +2198,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "74727565", - "id": 6050, + "id": 6041, "isConstant": false, "isLValue": false, "isPure": true, @@ -2222,7 +2222,7 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564", - "id": 6052, + "id": 6043, "isConstant": false, "isLValue": false, "isPure": true, @@ -2249,21 +2249,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-approved-failed\"" } ], - "id": 6042, + "id": 6033, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2010:7:26", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6053, + "id": 6044, "isConstant": false, "isLValue": false, "isPure": false, @@ -2277,29 +2277,29 @@ "typeString": "tuple()" } }, - "id": 6054, + "id": 6045, "nodeType": "ExpressionStatement", "src": "2010:129:26" } ] }, "documentation": null, - "id": 6056, + "id": 6047, "implemented": true, "kind": "function", "modifiers": [], "name": "_approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 6032, + "id": 6023, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6029, + "id": 6020, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 6056, + "scope": 6047, "src": "1843:14:26", "stateVariable": false, "storageLocation": "default", @@ -2308,7 +2308,7 @@ "typeString": "address" }, "typeName": { - "id": 6028, + "id": 6019, "name": "address", "nodeType": "ElementaryTypeName", "src": "1843:7:26", @@ -2323,10 +2323,10 @@ }, { "constant": false, - "id": 6031, + "id": 6022, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6056, + "scope": 6047, "src": "1859:14:26", "stateVariable": false, "storageLocation": "default", @@ -2335,7 +2335,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6030, + "id": 6021, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1859:7:26", @@ -2351,12 +2351,12 @@ "src": "1842:32:26" }, "returnParameters": { - "id": 6033, + "id": 6024, "nodeType": "ParameterList", "parameters": [], "src": "1882:0:26" }, - "scope": 6428, + "scope": 6419, "src": "1825:321:26", "stateMutability": "nonpayable", "superFunction": null, @@ -2364,7 +2364,7 @@ }, { "body": { - "id": 6098, + "id": 6089, "nodeType": "Block", "src": "2292:339:26", "statements": [ @@ -2375,18 +2375,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 6069, + "id": 6060, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6067, + "id": 6058, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6060, + "referencedDeclaration": 6051, "src": "2306:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2397,11 +2397,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 6068, + "id": 6059, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6058, + "referencedDeclaration": 6049, "src": "2316:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2415,7 +2415,7 @@ } }, "falseBody": { - "id": 6096, + "id": 6087, "nodeType": "Block", "src": "2394:231:26", "statements": [ @@ -2428,11 +2428,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6090, + "id": 6081, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6062, + "referencedDeclaration": 6053, "src": "2500:9:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2441,11 +2441,11 @@ }, { "argumentTypes": null, - "id": 6091, + "id": 6082, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6064, + "referencedDeclaration": 6055, "src": "2531:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2477,11 +2477,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6084, + "id": 6075, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6060, + "referencedDeclaration": 6051, "src": "2448:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2496,18 +2496,18 @@ "typeString": "address" } ], - "id": 6083, + "id": 6074, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "2440:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6085, + "id": 6076, "isConstant": false, "isLValue": false, "isPure": false, @@ -2517,25 +2517,25 @@ "nodeType": "FunctionCall", "src": "2440:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6086, + "id": 6077, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, + "referencedDeclaration": 835, "src": "2440:26:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6087, + "id": 6078, "isConstant": false, "isLValue": false, "isPure": false, @@ -2557,7 +2557,7 @@ "typeString": "address" } ], - "id": 6082, + "id": 6073, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2568,7 +2568,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 6088, + "id": 6079, "isConstant": false, "isLValue": false, "isPure": false, @@ -2582,7 +2582,7 @@ "typeString": "contract IERC20" } }, - "id": 6089, + "id": 6080, "isConstant": false, "isLValue": false, "isPure": false, @@ -2596,7 +2596,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 6092, + "id": 6083, "isConstant": false, "isLValue": false, "isPure": false, @@ -2613,7 +2613,7 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d7472616e736665722d6661696c6564", - "id": 6093, + "id": 6084, "isConstant": false, "isLValue": false, "isPure": true, @@ -2640,21 +2640,21 @@ "typeString": "literal_string \"cmpnd-mgr-transfer-failed\"" } ], - "id": 6081, + "id": 6072, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2408:7:26", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6094, + "id": 6085, "isConstant": false, "isLValue": false, "isPure": false, @@ -2668,17 +2668,17 @@ "typeString": "tuple()" } }, - "id": 6095, + "id": 6086, "nodeType": "ExpressionStatement", "src": "2408:206:26" } ] }, - "id": 6097, + "id": 6088, "nodeType": "IfStatement", "src": "2302:323:26", "trueBody": { - "id": 6080, + "id": 6071, "nodeType": "Block", "src": "2331:57:26", "statements": [ @@ -2689,7 +2689,7 @@ { "argumentTypes": null, "hexValue": "", - "id": 6077, + "id": 6068, "isConstant": false, "isLValue": false, "isPure": true, @@ -2715,11 +2715,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6075, + "id": 6066, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6064, + "referencedDeclaration": 6055, "src": "2366:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2738,18 +2738,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6070, + "id": 6061, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6062, + "referencedDeclaration": 6053, "src": "2345:9:26", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 6073, + "id": 6064, "isConstant": false, "isLValue": false, "isPure": false, @@ -2763,7 +2763,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 6074, + "id": 6065, "isConstant": false, "isLValue": false, "isPure": false, @@ -2777,7 +2777,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 6076, + "id": 6067, "isConstant": false, "isLValue": false, "isPure": false, @@ -2791,7 +2791,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 6078, + "id": 6069, "isConstant": false, "isLValue": false, "isPure": false, @@ -2805,7 +2805,7 @@ "typeString": "tuple(bool,bytes memory)" } }, - "id": 6079, + "id": 6070, "nodeType": "ExpressionStatement", "src": "2345:32:26" } @@ -2815,22 +2815,22 @@ ] }, "documentation": null, - "id": 6099, + "id": 6090, "implemented": true, "kind": "function", "modifiers": [], "name": "_transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 6065, + "id": 6056, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6058, + "id": 6049, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 6099, + "scope": 6090, "src": "2180:21:26", "stateVariable": false, "storageLocation": "default", @@ -2839,7 +2839,7 @@ "typeString": "address" }, "typeName": { - "id": 6057, + "id": 6048, "name": "address", "nodeType": "ElementaryTypeName", "src": "2180:7:26", @@ -2854,10 +2854,10 @@ }, { "constant": false, - "id": 6060, + "id": 6051, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 6099, + "scope": 6090, "src": "2211:14:26", "stateVariable": false, "storageLocation": "default", @@ -2866,7 +2866,7 @@ "typeString": "address" }, "typeName": { - "id": 6059, + "id": 6050, "name": "address", "nodeType": "ElementaryTypeName", "src": "2211:7:26", @@ -2881,10 +2881,10 @@ }, { "constant": false, - "id": 6062, + "id": 6053, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 6099, + "scope": 6090, "src": "2235:17:26", "stateVariable": false, "storageLocation": "default", @@ -2893,7 +2893,7 @@ "typeString": "address" }, "typeName": { - "id": 6061, + "id": 6052, "name": "address", "nodeType": "ElementaryTypeName", "src": "2235:7:26", @@ -2908,10 +2908,10 @@ }, { "constant": false, - "id": 6064, + "id": 6055, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6099, + "scope": 6090, "src": "2262:14:26", "stateVariable": false, "storageLocation": "default", @@ -2920,7 +2920,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6063, + "id": 6054, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2262:7:26", @@ -2936,12 +2936,12 @@ "src": "2170:112:26" }, "returnParameters": { - "id": 6066, + "id": 6057, "nodeType": "ParameterList", "parameters": [], "src": "2292:0:26" }, - "scope": 6428, + "scope": 6419, "src": "2152:479:26", "stateMutability": "nonpayable", "superFunction": null, @@ -2949,7 +2949,7 @@ }, { "body": { - "id": 6140, + "id": 6131, "nodeType": "Block", "src": "2735:310:26", "statements": [ @@ -2960,18 +2960,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 6110, + "id": 6101, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6108, + "id": 6099, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6103, + "referencedDeclaration": 6094, "src": "2749:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2982,11 +2982,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 6109, + "id": 6100, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6101, + "referencedDeclaration": 6092, "src": "2759:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3000,7 +3000,7 @@ } }, "falseBody": { - "id": 6138, + "id": 6129, "nodeType": "Block", "src": "2848:191:26", "statements": [ @@ -3010,11 +3010,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6122, + "id": 6113, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6103, + "referencedDeclaration": 6094, "src": "2871:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3023,11 +3023,11 @@ }, { "argumentTypes": null, - "id": 6123, + "id": 6114, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6105, + "referencedDeclaration": 6096, "src": "2879:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3046,18 +3046,18 @@ "typeString": "uint256" } ], - "id": 6121, + "id": 6112, "name": "_approve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6056, + "referencedDeclaration": 6047, "src": "2862:8:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 6124, + "id": 6115, "isConstant": false, "isLValue": false, "isPure": false, @@ -3071,7 +3071,7 @@ "typeString": "tuple()" } }, - "id": 6125, + "id": 6116, "nodeType": "ExpressionStatement", "src": "2862:24:26" }, @@ -3085,7 +3085,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6134, + "id": 6125, "isConstant": false, "isLValue": false, "isPure": false, @@ -3095,11 +3095,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6131, + "id": 6122, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6105, + "referencedDeclaration": 6096, "src": "2953:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3119,11 +3119,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6128, + "id": 6119, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6103, + "referencedDeclaration": 6094, "src": "2933:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3138,18 +3138,18 @@ "typeString": "address" } ], - "id": 6127, + "id": 6118, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "2925:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6129, + "id": 6120, "isConstant": false, "isLValue": false, "isPure": false, @@ -3159,25 +3159,25 @@ "nodeType": "FunctionCall", "src": "2925:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6130, + "id": 6121, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "repayBorrow", "nodeType": "MemberAccess", - "referencedDeclaration": 769, + "referencedDeclaration": 782, "src": "2925:27:26", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 6132, + "id": 6123, "isConstant": false, "isLValue": false, "isPure": false, @@ -3196,7 +3196,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6133, + "id": 6124, "isConstant": false, "isLValue": false, "isPure": true, @@ -3220,7 +3220,7 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564", - "id": 6135, + "id": 6126, "isConstant": false, "isLValue": false, "isPure": true, @@ -3247,21 +3247,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-repay-failed\"" } ], - "id": 6126, + "id": 6117, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2900:7:26", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6136, + "id": 6127, "isConstant": false, "isLValue": false, "isPure": false, @@ -3275,17 +3275,17 @@ "typeString": "tuple()" } }, - "id": 6137, + "id": 6128, "nodeType": "ExpressionStatement", "src": "2900:128:26" } ] }, - "id": 6139, + "id": 6130, "nodeType": "IfStatement", "src": "2745:294:26", "trueBody": { - "id": 6120, + "id": 6111, "nodeType": "Block", "src": "2774:68:26", "statements": [ @@ -3298,11 +3298,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6116, + "id": 6107, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6105, + "referencedDeclaration": 6096, "src": "2822:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3324,11 +3324,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6112, + "id": 6103, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6103, + "referencedDeclaration": 6094, "src": "2796:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3343,18 +3343,18 @@ "typeString": "address" } ], - "id": 6111, + "id": 6102, "name": "ICEther", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 732, + "referencedDeclaration": 745, "src": "2788:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICEther_$732_$", + "typeIdentifier": "t_type$_t_contract$_ICEther_$745_$", "typeString": "type(contract ICEther)" } }, - "id": 6113, + "id": 6104, "isConstant": false, "isLValue": false, "isPure": false, @@ -3364,11 +3364,11 @@ "nodeType": "FunctionCall", "src": "2788:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICEther_$732", + "typeIdentifier": "t_contract$_ICEther_$745", "typeString": "contract ICEther" } }, - "id": 6114, + "id": 6105, "isConstant": false, "isLValue": false, "isPure": false, @@ -3382,7 +3382,7 @@ "typeString": "function () payable external" } }, - "id": 6115, + "id": 6106, "isConstant": false, "isLValue": false, "isPure": false, @@ -3396,7 +3396,7 @@ "typeString": "function (uint256) pure returns (function () payable external)" } }, - "id": 6117, + "id": 6108, "isConstant": false, "isLValue": false, "isPure": false, @@ -3410,7 +3410,7 @@ "typeString": "function () payable external" } }, - "id": 6118, + "id": 6109, "isConstant": false, "isLValue": false, "isPure": false, @@ -3424,7 +3424,7 @@ "typeString": "tuple()" } }, - "id": 6119, + "id": 6110, "nodeType": "ExpressionStatement", "src": "2788:43:26" } @@ -3434,22 +3434,22 @@ ] }, "documentation": null, - "id": 6141, + "id": 6132, "implemented": true, "kind": "function", "modifiers": [], "name": "_repayBorrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 6106, + "id": 6097, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6101, + "id": 6092, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 6141, + "scope": 6132, "src": "2659:21:26", "stateVariable": false, "storageLocation": "default", @@ -3458,7 +3458,7 @@ "typeString": "address" }, "typeName": { - "id": 6100, + "id": 6091, "name": "address", "nodeType": "ElementaryTypeName", "src": "2659:7:26", @@ -3473,10 +3473,10 @@ }, { "constant": false, - "id": 6103, + "id": 6094, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 6141, + "scope": 6132, "src": "2682:14:26", "stateVariable": false, "storageLocation": "default", @@ -3485,7 +3485,7 @@ "typeString": "address" }, "typeName": { - "id": 6102, + "id": 6093, "name": "address", "nodeType": "ElementaryTypeName", "src": "2682:7:26", @@ -3500,10 +3500,10 @@ }, { "constant": false, - "id": 6105, + "id": 6096, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6141, + "scope": 6132, "src": "2698:14:26", "stateVariable": false, "storageLocation": "default", @@ -3512,7 +3512,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6104, + "id": 6095, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2698:7:26", @@ -3528,12 +3528,12 @@ "src": "2658:55:26" }, "returnParameters": { - "id": 6107, + "id": 6098, "nodeType": "ParameterList", "parameters": [], "src": "2735:0:26" }, - "scope": 6428, + "scope": 6419, "src": "2637:408:26", "stateMutability": "nonpayable", "superFunction": null, @@ -3541,21 +3541,21 @@ }, { "body": { - "id": 6164, + "id": 6155, "nodeType": "Block", "src": "3125:176:26", "statements": [ { "assignments": [ - 6149 + 6140 ], "declarations": [ { "constant": false, - "id": 6149, + "id": 6140, "name": "a", "nodeType": "VariableDeclaration", - "scope": 6164, + "scope": 6155, "src": "3135:6:26", "stateVariable": false, "storageLocation": "default", @@ -3564,7 +3564,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6148, + "id": 6139, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3135:4:26", @@ -3577,17 +3577,17 @@ "visibility": "internal" } ], - "id": 6156, + "id": 6147, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6154, + "id": 6145, "name": "redeemTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6145, + "referencedDeclaration": 6136, "src": "3177:12:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3607,11 +3607,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6151, + "id": 6142, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6143, + "referencedDeclaration": 6134, "src": "3152:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3626,18 +3626,18 @@ "typeString": "address" } ], - "id": 6150, + "id": 6141, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "3144:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6152, + "id": 6143, "isConstant": false, "isLValue": false, "isPure": false, @@ -3647,25 +3647,25 @@ "nodeType": "FunctionCall", "src": "3144:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6153, + "id": 6144, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "redeemUnderlying", "nodeType": "MemberAccess", - "referencedDeclaration": 755, + "referencedDeclaration": 768, "src": "3144:32:26", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 6155, + "id": 6146, "isConstant": false, "isLValue": false, "isPure": false, @@ -3692,18 +3692,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6160, + "id": 6151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6158, + "id": 6149, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6149, + "referencedDeclaration": 6140, "src": "3221:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3715,7 +3715,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6159, + "id": 6150, "isConstant": false, "isLValue": false, "isPure": true, @@ -3739,7 +3739,7 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79696e672d6661696c6564", - "id": 6161, + "id": 6152, "isConstant": false, "isLValue": false, "isPure": true, @@ -3766,21 +3766,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-redeem-underlying-failed\"" } ], - "id": 6157, + "id": 6148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3200:7:26", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6162, + "id": 6153, "isConstant": false, "isLValue": false, "isPure": false, @@ -3794,29 +3794,29 @@ "typeString": "tuple()" } }, - "id": 6163, + "id": 6154, "nodeType": "ExpressionStatement", "src": "3200:94:26" } ] }, "documentation": null, - "id": 6165, + "id": 6156, "implemented": true, "kind": "function", "modifiers": [], "name": "_redeemUnderlying", "nodeType": "FunctionDefinition", "parameters": { - "id": 6146, + "id": 6137, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6143, + "id": 6134, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 6165, + "scope": 6156, "src": "3078:14:26", "stateVariable": false, "storageLocation": "default", @@ -3825,7 +3825,7 @@ "typeString": "address" }, "typeName": { - "id": 6142, + "id": 6133, "name": "address", "nodeType": "ElementaryTypeName", "src": "3078:7:26", @@ -3840,10 +3840,10 @@ }, { "constant": false, - "id": 6145, + "id": 6136, "name": "redeemTokens", "nodeType": "VariableDeclaration", - "scope": 6165, + "scope": 6156, "src": "3094:20:26", "stateVariable": false, "storageLocation": "default", @@ -3852,7 +3852,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6144, + "id": 6135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3094:7:26", @@ -3868,12 +3868,12 @@ "src": "3077:38:26" }, "returnParameters": { - "id": 6147, + "id": 6138, "nodeType": "ParameterList", "parameters": [], "src": "3125:0:26" }, - "scope": 6428, + "scope": 6419, "src": "3051:250:26", "stateMutability": "nonpayable", "superFunction": null, @@ -3881,7 +3881,7 @@ }, { "body": { - "id": 6205, + "id": 6196, "nodeType": "Block", "src": "3403:434:26", "statements": [ @@ -3892,18 +3892,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 6176, + "id": 6167, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6174, + "id": 6165, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6169, + "referencedDeclaration": 6160, "src": "3475:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3914,11 +3914,11 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 6175, + "id": 6166, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6167, + "referencedDeclaration": 6158, "src": "3485:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3932,25 +3932,25 @@ } }, "falseBody": null, - "id": 6198, + "id": 6189, "nodeType": "IfStatement", "src": "3471:306:26", "trueBody": { - "id": 6197, + "id": 6188, "nodeType": "Block", "src": "3500:277:26", "statements": [ { "assignments": [ - 6178 + 6169 ], "declarations": [ { "constant": false, - "id": 6178, + "id": 6169, "name": "underlying", "nodeType": "VariableDeclaration", - "scope": 6197, + "scope": 6188, "src": "3514:18:26", "stateVariable": false, "storageLocation": "default", @@ -3959,7 +3959,7 @@ "typeString": "address" }, "typeName": { - "id": 6177, + "id": 6168, "name": "address", "nodeType": "ElementaryTypeName", "src": "3514:7:26", @@ -3973,7 +3973,7 @@ "visibility": "internal" } ], - "id": 6184, + "id": 6175, "initialValue": { "argumentTypes": null, "arguments": [], @@ -3984,11 +3984,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6180, + "id": 6171, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6169, + "referencedDeclaration": 6160, "src": "3543:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4003,18 +4003,18 @@ "typeString": "address" } ], - "id": 6179, + "id": 6170, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "3535:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6181, + "id": 6172, "isConstant": false, "isLValue": false, "isPure": false, @@ -4024,25 +4024,25 @@ "nodeType": "FunctionCall", "src": "3535:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6182, + "id": 6173, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, + "referencedDeclaration": 835, "src": "3535:26:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6183, + "id": 6174, "isConstant": false, "isLValue": false, "isPure": false, @@ -4061,15 +4061,15 @@ }, { "assignments": [ - 6186 + 6177 ], "declarations": [ { "constant": false, - "id": 6186, + "id": 6177, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 6197, + "scope": 6188, "src": "3621:17:26", "stateVariable": false, "storageLocation": "default", @@ -4078,7 +4078,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6185, + "id": 6176, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3621:7:26", @@ -4091,17 +4091,17 @@ "visibility": "internal" } ], - "id": 6191, + "id": 6182, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6188, + "id": 6179, "name": "underlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6178, + "referencedDeclaration": 6169, "src": "3662:10:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4110,11 +4110,11 @@ }, { "argumentTypes": null, - "id": 6189, + "id": 6180, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6171, + "referencedDeclaration": 6162, "src": "3674:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4133,18 +4133,18 @@ "typeString": "uint256" } ], - "id": 6187, + "id": 6178, "name": "_getEthToTokenOutput", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5169, + "referencedDeclaration": 5221, "src": "3641:20:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 6190, + "id": 6181, "isConstant": false, "isLValue": false, "isPure": false, @@ -4167,11 +4167,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6193, + "id": 6184, "name": "underlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6178, + "referencedDeclaration": 6169, "src": "3744:10:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4180,11 +4180,11 @@ }, { "argumentTypes": null, - "id": 6194, + "id": 6185, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6186, + "referencedDeclaration": 6177, "src": "3756:9:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4203,21 +4203,21 @@ "typeString": "uint256" } ], - "id": 6192, + "id": 6183, "name": "_ethToToken", "nodeType": "Identifier", "overloadedDeclarations": [ - 4959, - 4988 + 5011, + 5040 ], - "referencedDeclaration": 4959, + "referencedDeclaration": 5011, "src": "3732:11:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 6195, + "id": 6186, "isConstant": false, "isLValue": false, "isPure": false, @@ -4231,7 +4231,7 @@ "typeString": "uint256" } }, - "id": 6196, + "id": 6187, "nodeType": "ExpressionStatement", "src": "3732:34:26" } @@ -4244,11 +4244,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6200, + "id": 6191, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6167, + "referencedDeclaration": 6158, "src": "3800:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4257,11 +4257,11 @@ }, { "argumentTypes": null, - "id": 6201, + "id": 6192, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6169, + "referencedDeclaration": 6160, "src": "3815:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4270,11 +4270,11 @@ }, { "argumentTypes": null, - "id": 6202, + "id": 6193, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6171, + "referencedDeclaration": 6162, "src": "3823:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4297,18 +4297,18 @@ "typeString": "uint256" } ], - "id": 6199, + "id": 6190, "name": "_repayBorrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6141, + "referencedDeclaration": 6132, "src": "3787:12:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 6203, + "id": 6194, "isConstant": false, "isLValue": false, "isPure": false, @@ -4322,29 +4322,29 @@ "typeString": "tuple()" } }, - "id": 6204, + "id": 6195, "nodeType": "ExpressionStatement", "src": "3787:43:26" } ] }, "documentation": null, - "id": 6206, + "id": 6197, "implemented": true, "kind": "function", "modifiers": [], "name": "_repayDebt", "nodeType": "FunctionDefinition", "parameters": { - "id": 6172, + "id": 6163, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6167, + "id": 6158, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 6206, + "scope": 6197, "src": "3327:21:26", "stateVariable": false, "storageLocation": "default", @@ -4353,7 +4353,7 @@ "typeString": "address" }, "typeName": { - "id": 6166, + "id": 6157, "name": "address", "nodeType": "ElementaryTypeName", "src": "3327:7:26", @@ -4368,10 +4368,10 @@ }, { "constant": false, - "id": 6169, + "id": 6160, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 6206, + "scope": 6197, "src": "3350:14:26", "stateVariable": false, "storageLocation": "default", @@ -4380,7 +4380,7 @@ "typeString": "address" }, "typeName": { - "id": 6168, + "id": 6159, "name": "address", "nodeType": "ElementaryTypeName", "src": "3350:7:26", @@ -4395,10 +4395,10 @@ }, { "constant": false, - "id": 6171, + "id": 6162, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6206, + "scope": 6197, "src": "3366:14:26", "stateVariable": false, "storageLocation": "default", @@ -4407,7 +4407,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6170, + "id": 6161, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3366:7:26", @@ -4423,12 +4423,12 @@ "src": "3326:55:26" }, "returnParameters": { - "id": 6173, + "id": 6164, "nodeType": "ParameterList", "parameters": [], "src": "3403:0:26" }, - "scope": 6428, + "scope": 6419, "src": "3307:530:26", "stateMutability": "nonpayable", "superFunction": null, @@ -4436,7 +4436,7 @@ }, { "body": { - "id": 6242, + "id": 6233, "nodeType": "Block", "src": "3984:260:26", "statements": [ @@ -4446,11 +4446,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6218, + "id": 6209, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6210, + "referencedDeclaration": 6201, "src": "4037:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4459,11 +4459,11 @@ }, { "argumentTypes": null, - "id": 6219, + "id": 6210, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6212, + "referencedDeclaration": 6203, "src": "4045:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4482,18 +4482,18 @@ "typeString": "uint256" } ], - "id": 6217, + "id": 6208, "name": "_redeemUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6165, + "referencedDeclaration": 6156, "src": "4019:17:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 6220, + "id": 6211, "isConstant": false, "isLValue": false, "isPure": false, @@ -4507,7 +4507,7 @@ "typeString": "tuple()" } }, - "id": 6221, + "id": 6212, "nodeType": "ExpressionStatement", "src": "4019:33:26" }, @@ -4518,18 +4518,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 6224, + "id": 6215, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6222, + "id": 6213, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6210, + "referencedDeclaration": 6201, "src": "4067:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4540,11 +4540,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 6223, + "id": 6214, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6208, + "referencedDeclaration": 6199, "src": "4077:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4558,30 +4558,30 @@ } }, "falseBody": null, - "id": 6228, + "id": 6219, "nodeType": "IfStatement", "src": "4063:67:26", "trueBody": { - "id": 6227, + "id": 6218, "nodeType": "Block", "src": "4092:38:26", "statements": [ { "expression": { "argumentTypes": null, - "id": 6225, + "id": 6216, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6212, + "referencedDeclaration": 6203, "src": "4113:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 6216, - "id": 6226, + "functionReturnParameters": 6207, + "id": 6217, "nodeType": "Return", "src": "4106:13:26" } @@ -4590,15 +4590,15 @@ }, { "assignments": [ - 6230 + 6221 ], "declarations": [ { "constant": false, - "id": 6230, + "id": 6221, "name": "underlying", "nodeType": "VariableDeclaration", - "scope": 6242, + "scope": 6233, "src": "4140:18:26", "stateVariable": false, "storageLocation": "default", @@ -4607,7 +4607,7 @@ "typeString": "address" }, "typeName": { - "id": 6229, + "id": 6220, "name": "address", "nodeType": "ElementaryTypeName", "src": "4140:7:26", @@ -4621,7 +4621,7 @@ "visibility": "internal" } ], - "id": 6236, + "id": 6227, "initialValue": { "argumentTypes": null, "arguments": [], @@ -4632,11 +4632,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6232, + "id": 6223, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6210, + "referencedDeclaration": 6201, "src": "4169:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4651,18 +4651,18 @@ "typeString": "address" } ], - "id": 6231, + "id": 6222, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "4161:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6233, + "id": 6224, "isConstant": false, "isLValue": false, "isPure": false, @@ -4672,25 +4672,25 @@ "nodeType": "FunctionCall", "src": "4161:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6234, + "id": 6225, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, + "referencedDeclaration": 835, "src": "4161:26:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6235, + "id": 6226, "isConstant": false, "isLValue": false, "isPure": false, @@ -4713,11 +4713,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6238, + "id": 6229, "name": "underlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6230, + "referencedDeclaration": 6221, "src": "4218:10:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4726,11 +4726,11 @@ }, { "argumentTypes": null, - "id": 6239, + "id": 6230, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6212, + "referencedDeclaration": 6203, "src": "4230:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4749,21 +4749,21 @@ "typeString": "uint256" } ], - "id": 6237, + "id": 6228, "name": "_tokenToEth", "nodeType": "Identifier", "overloadedDeclarations": [ - 5006, - 5045 + 5058, + 5097 ], - "referencedDeclaration": 5006, + "referencedDeclaration": 5058, "src": "4206:11:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 6240, + "id": 6231, "isConstant": false, "isLValue": false, "isPure": false, @@ -4777,30 +4777,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 6216, - "id": 6241, + "functionReturnParameters": 6207, + "id": 6232, "nodeType": "Return", "src": "4199:38:26" } ] }, "documentation": null, - "id": 6243, + "id": 6234, "implemented": true, "kind": "function", "modifiers": [], "name": "_retrieveCollateral", "nodeType": "FunctionDefinition", "parameters": { - "id": 6213, + "id": 6204, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6208, + "id": 6199, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 6243, + "scope": 6234, "src": "3881:21:26", "stateVariable": false, "storageLocation": "default", @@ -4809,7 +4809,7 @@ "typeString": "address" }, "typeName": { - "id": 6207, + "id": 6198, "name": "address", "nodeType": "ElementaryTypeName", "src": "3881:7:26", @@ -4824,10 +4824,10 @@ }, { "constant": false, - "id": 6210, + "id": 6201, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 6243, + "scope": 6234, "src": "3912:14:26", "stateVariable": false, "storageLocation": "default", @@ -4836,7 +4836,7 @@ "typeString": "address" }, "typeName": { - "id": 6209, + "id": 6200, "name": "address", "nodeType": "ElementaryTypeName", "src": "3912:7:26", @@ -4851,10 +4851,10 @@ }, { "constant": false, - "id": 6212, + "id": 6203, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6243, + "scope": 6234, "src": "3936:14:26", "stateVariable": false, "storageLocation": "default", @@ -4863,7 +4863,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6211, + "id": 6202, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3936:7:26", @@ -4879,15 +4879,15 @@ "src": "3871:85:26" }, "returnParameters": { - "id": 6216, + "id": 6207, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6215, + "id": 6206, "name": "", "nodeType": "VariableDeclaration", - "scope": 6243, + "scope": 6234, "src": "3975:7:26", "stateVariable": false, "storageLocation": "default", @@ -4896,7 +4896,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6214, + "id": 6205, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3975:7:26", @@ -4911,7 +4911,7 @@ ], "src": "3974:9:26" }, - "scope": 6428, + "scope": 6419, "src": "3843:401:26", "stateMutability": "nonpayable", "superFunction": null, @@ -4919,37 +4919,37 @@ }, { "body": { - "id": 6358, + "id": 6349, "nodeType": "Block", "src": "4405:1152:26", "statements": [ { "assignments": [ - 6255 + 6246 ], "declarations": [ { "constant": false, - "id": 6255, + "id": 6246, "name": "epCalldata", "nodeType": "VariableDeclaration", - "scope": 6358, + "scope": 6349, "src": "4451:38:26", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata" }, "typeName": { "contractScope": null, - "id": 6254, + "id": 6245, "name": "ExitPositionCalldata", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5945, + "referencedDeclaration": 5936, "src": "4451:20:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_storage_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_storage_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata" } }, @@ -4957,17 +4957,17 @@ "visibility": "internal" } ], - "id": 6262, + "id": 6253, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6258, + "id": 6249, "name": "_params", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6251, + "referencedDeclaration": 6242, "src": "4516:7:26", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -4979,19 +4979,19 @@ "components": [ { "argumentTypes": null, - "id": 6259, + "id": 6250, "name": "ExitPositionCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5945, + "referencedDeclaration": 5936, "src": "4538:20:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_ExitPositionCalldata_$5945_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ExitPositionCalldata_$5936_storage_ptr_$", "typeString": "type(struct DedgeExitManager.ExitPositionCalldata storage pointer)" } } ], - "id": 6260, + "id": 6251, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5000,7 +5000,7 @@ "nodeType": "TupleExpression", "src": "4537:22:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_ExitPositionCalldata_$5945_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ExitPositionCalldata_$5936_storage_ptr_$", "typeString": "type(struct DedgeExitManager.ExitPositionCalldata storage pointer)" } } @@ -5012,24 +5012,24 @@ "typeString": "bytes calldata" }, { - "typeIdentifier": "t_type$_t_struct$_ExitPositionCalldata_$5945_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ExitPositionCalldata_$5936_storage_ptr_$", "typeString": "type(struct DedgeExitManager.ExitPositionCalldata storage pointer)" } ], "expression": { "argumentTypes": null, - "id": 6256, + "id": 6247, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "4492:3:26", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 6257, + "id": 6248, "isConstant": false, "isLValue": false, "isPure": true, @@ -5043,7 +5043,7 @@ "typeString": "function () pure" } }, - "id": 6261, + "id": 6252, "isConstant": false, "isLValue": false, "isPure": false, @@ -5053,7 +5053,7 @@ "nodeType": "FunctionCall", "src": "4492:77:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, @@ -5062,31 +5062,31 @@ }, { "assignments": [ - 6264 + 6255 ], "declarations": [ { "constant": false, - "id": 6264, + "id": 6255, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 6358, + "scope": 6349, "src": "4580:31:26", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 6263, + "id": 6254, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "4580:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -5094,7 +5094,7 @@ "visibility": "internal" } ], - "id": 6269, + "id": 6260, "initialValue": { "argumentTypes": null, "arguments": [ @@ -5102,25 +5102,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6266, + "id": 6257, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "4643:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6267, + "id": 6258, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "addressRegistryAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 5938, + "referencedDeclaration": 5929, "src": "4643:33:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5135,18 +5135,18 @@ "typeString": "address" } ], - "id": 6265, + "id": 6256, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "4614:15:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 6268, + "id": 6259, "isConstant": false, "isLValue": false, "isPure": false, @@ -5156,7 +5156,7 @@ "nodeType": "FunctionCall", "src": "4614:72:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -5165,15 +5165,15 @@ }, { "assignments": [ - 6271 + 6262 ], "declarations": [ { "constant": false, - "id": 6271, + "id": 6262, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 6358, + "scope": 6349, "src": "4696:21:26", "stateVariable": false, "storageLocation": "default", @@ -5182,7 +5182,7 @@ "typeString": "address" }, "typeName": { - "id": 6270, + "id": 6261, "name": "address", "nodeType": "ElementaryTypeName", "src": "4696:7:26", @@ -5196,7 +5196,7 @@ "visibility": "internal" } ], - "id": 6275, + "id": 6266, "initialValue": { "argumentTypes": null, "arguments": [], @@ -5204,32 +5204,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6272, + "id": 6263, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6264, + "referencedDeclaration": 6255, "src": "4720:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6273, + "id": 6264, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, + "referencedDeclaration": 7501, "src": "4720:29:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6274, + "id": 6265, "isConstant": false, "isLValue": false, "isPure": false, @@ -5248,7 +5248,7 @@ }, { "body": { - "id": 6302, + "id": 6293, "nodeType": "Block", "src": "4867:178:26", "statements": [ @@ -5258,11 +5258,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6289, + "id": 6280, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6271, + "referencedDeclaration": 6262, "src": "4909:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5277,39 +5277,39 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6290, + "id": 6281, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "4940:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6291, + "id": 6282, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "debtMarket", "nodeType": "MemberAccess", - "referencedDeclaration": 5941, + "referencedDeclaration": 5932, "src": "4940:21:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5929_memory_$dyn_memory", + "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5920_memory_$dyn_memory", "typeString": "struct DedgeExitManager.DebtMarket memory[] memory" } }, - "id": 6293, + "id": 6284, "indexExpression": { "argumentTypes": null, - "id": 6292, + "id": 6283, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6277, + "referencedDeclaration": 6268, "src": "4962:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5323,18 +5323,18 @@ "nodeType": "IndexAccess", "src": "4940:24:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_DebtMarket_$5929_memory", + "typeIdentifier": "t_struct$_DebtMarket_$5920_memory", "typeString": "struct DedgeExitManager.DebtMarket memory" } }, - "id": 6294, + "id": 6285, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "cToken", "nodeType": "MemberAccess", - "referencedDeclaration": 5926, + "referencedDeclaration": 5917, "src": "4940:31:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5349,39 +5349,39 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6295, + "id": 6286, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "4989:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6296, + "id": 6287, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "debtMarket", "nodeType": "MemberAccess", - "referencedDeclaration": 5941, + "referencedDeclaration": 5932, "src": "4989:21:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5929_memory_$dyn_memory", + "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5920_memory_$dyn_memory", "typeString": "struct DedgeExitManager.DebtMarket memory[] memory" } }, - "id": 6298, + "id": 6289, "indexExpression": { "argumentTypes": null, - "id": 6297, + "id": 6288, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6277, + "referencedDeclaration": 6268, "src": "5011:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5395,18 +5395,18 @@ "nodeType": "IndexAccess", "src": "4989:24:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_DebtMarket_$5929_memory", + "typeIdentifier": "t_struct$_DebtMarket_$5920_memory", "typeString": "struct DedgeExitManager.DebtMarket memory" } }, - "id": 6299, + "id": 6290, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "amount", "nodeType": "MemberAccess", - "referencedDeclaration": 5928, + "referencedDeclaration": 5919, "src": "4989:31:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5429,18 +5429,18 @@ "typeString": "uint256" } ], - "id": 6288, + "id": 6279, "name": "_repayDebt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6206, + "referencedDeclaration": 6197, "src": "4881:10:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 6300, + "id": 6291, "isConstant": false, "isLValue": false, "isPure": false, @@ -5454,7 +5454,7 @@ "typeString": "tuple()" } }, - "id": 6301, + "id": 6292, "nodeType": "ExpressionStatement", "src": "4881:153:26" } @@ -5466,18 +5466,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6284, + "id": 6275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6280, + "id": 6271, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6277, + "referencedDeclaration": 6268, "src": "4828:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5492,32 +5492,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6281, + "id": 6272, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "4832:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6282, + "id": 6273, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "debtMarket", "nodeType": "MemberAccess", - "referencedDeclaration": 5941, + "referencedDeclaration": 5932, "src": "4832:21:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5929_memory_$dyn_memory", + "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5920_memory_$dyn_memory", "typeString": "struct DedgeExitManager.DebtMarket memory[] memory" } }, - "id": 6283, + "id": 6274, "isConstant": false, "isLValue": false, "isPure": false, @@ -5537,18 +5537,18 @@ "typeString": "bool" } }, - "id": 6303, + "id": 6294, "initializationExpression": { "assignments": [ - 6277 + 6268 ], "declarations": [ { "constant": false, - "id": 6277, + "id": 6268, "name": "i", "nodeType": "VariableDeclaration", - "scope": 6303, + "scope": 6294, "src": "4813:9:26", "stateVariable": false, "storageLocation": "default", @@ -5557,7 +5557,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6276, + "id": 6267, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4813:7:26", @@ -5570,11 +5570,11 @@ "visibility": "internal" } ], - "id": 6279, + "id": 6270, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 6278, + "id": 6269, "isConstant": false, "isLValue": false, "isPure": true, @@ -5595,7 +5595,7 @@ "loopExpression": { "expression": { "argumentTypes": null, - "id": 6286, + "id": 6277, "isConstant": false, "isLValue": false, "isPure": false, @@ -5606,11 +5606,11 @@ "src": "4862:3:26", "subExpression": { "argumentTypes": null, - "id": 6285, + "id": 6276, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6277, + "referencedDeclaration": 6268, "src": "4862:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5622,7 +5622,7 @@ "typeString": "uint256" } }, - "id": 6287, + "id": 6278, "nodeType": "ExpressionStatement", "src": "4862:3:26" }, @@ -5631,15 +5631,15 @@ }, { "assignments": [ - 6305 + 6296 ], "declarations": [ { "constant": false, - "id": 6305, + "id": 6296, "name": "totalEthAmount", "nodeType": "VariableDeclaration", - "scope": 6358, + "scope": 6349, "src": "5055:22:26", "stateVariable": false, "storageLocation": "default", @@ -5648,7 +5648,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6304, + "id": 6295, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5055:7:26", @@ -5661,32 +5661,32 @@ "visibility": "internal" } ], - "id": 6306, + "id": 6297, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "5055:22:26" }, { "body": { - "id": 6335, + "id": 6326, "nodeType": "Block", "src": "5152:217:26", "statements": [ { "expression": { "argumentTypes": null, - "id": 6333, + "id": 6324, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 6319, + "id": 6310, "name": "totalEthAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6305, + "referencedDeclaration": 6296, "src": "5166:14:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5700,11 +5700,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6321, + "id": 6312, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6271, + "referencedDeclaration": 6262, "src": "5221:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5719,39 +5719,39 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6322, + "id": 6313, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "5252:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6323, + "id": 6314, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralMarket", "nodeType": "MemberAccess", - "referencedDeclaration": 5944, + "referencedDeclaration": 5935, "src": "5252:27:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5934_memory_$dyn_memory", + "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5925_memory_$dyn_memory", "typeString": "struct DedgeExitManager.CollateralMarket memory[] memory" } }, - "id": 6325, + "id": 6316, "indexExpression": { "argumentTypes": null, - "id": 6324, + "id": 6315, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6308, + "referencedDeclaration": 6299, "src": "5280:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5765,18 +5765,18 @@ "nodeType": "IndexAccess", "src": "5252:30:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_CollateralMarket_$5934_memory", + "typeIdentifier": "t_struct$_CollateralMarket_$5925_memory", "typeString": "struct DedgeExitManager.CollateralMarket memory" } }, - "id": 6326, + "id": 6317, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "cToken", "nodeType": "MemberAccess", - "referencedDeclaration": 5931, + "referencedDeclaration": 5922, "src": "5252:37:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5791,39 +5791,39 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6327, + "id": 6318, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "5307:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6328, + "id": 6319, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralMarket", "nodeType": "MemberAccess", - "referencedDeclaration": 5944, + "referencedDeclaration": 5935, "src": "5307:27:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5934_memory_$dyn_memory", + "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5925_memory_$dyn_memory", "typeString": "struct DedgeExitManager.CollateralMarket memory[] memory" } }, - "id": 6330, + "id": 6321, "indexExpression": { "argumentTypes": null, - "id": 6329, + "id": 6320, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6308, + "referencedDeclaration": 6299, "src": "5335:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5837,18 +5837,18 @@ "nodeType": "IndexAccess", "src": "5307:30:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_CollateralMarket_$5934_memory", + "typeIdentifier": "t_struct$_CollateralMarket_$5925_memory", "typeString": "struct DedgeExitManager.CollateralMarket memory" } }, - "id": 6331, + "id": 6322, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "amount", "nodeType": "MemberAccess", - "referencedDeclaration": 5933, + "referencedDeclaration": 5924, "src": "5307:37:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5871,18 +5871,18 @@ "typeString": "uint256" } ], - "id": 6320, + "id": 6311, "name": "_retrieveCollateral", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6243, + "referencedDeclaration": 6234, "src": "5184:19:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,address,uint256) returns (uint256)" } }, - "id": 6332, + "id": 6323, "isConstant": false, "isLValue": false, "isPure": false, @@ -5902,7 +5902,7 @@ "typeString": "uint256" } }, - "id": 6334, + "id": 6325, "nodeType": "ExpressionStatement", "src": "5166:192:26" } @@ -5914,18 +5914,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6315, + "id": 6306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6311, + "id": 6302, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6308, + "referencedDeclaration": 6299, "src": "5107:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5940,32 +5940,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6312, + "id": 6303, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "5111:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6313, + "id": 6304, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralMarket", "nodeType": "MemberAccess", - "referencedDeclaration": 5944, + "referencedDeclaration": 5935, "src": "5111:27:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5934_memory_$dyn_memory", + "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5925_memory_$dyn_memory", "typeString": "struct DedgeExitManager.CollateralMarket memory[] memory" } }, - "id": 6314, + "id": 6305, "isConstant": false, "isLValue": false, "isPure": false, @@ -5985,18 +5985,18 @@ "typeString": "bool" } }, - "id": 6336, + "id": 6327, "initializationExpression": { "assignments": [ - 6308 + 6299 ], "declarations": [ { "constant": false, - "id": 6308, + "id": 6299, "name": "i", "nodeType": "VariableDeclaration", - "scope": 6336, + "scope": 6327, "src": "5092:9:26", "stateVariable": false, "storageLocation": "default", @@ -6005,7 +6005,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6307, + "id": 6298, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5092:7:26", @@ -6018,11 +6018,11 @@ "visibility": "internal" } ], - "id": 6310, + "id": 6301, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 6309, + "id": 6300, "isConstant": false, "isLValue": false, "isPure": true, @@ -6043,7 +6043,7 @@ "loopExpression": { "expression": { "argumentTypes": null, - "id": 6317, + "id": 6308, "isConstant": false, "isLValue": false, "isPure": false, @@ -6054,11 +6054,11 @@ "src": "5147:3:26", "subExpression": { "argumentTypes": null, - "id": 6316, + "id": 6307, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6308, + "referencedDeclaration": 6299, "src": "5147:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6070,7 +6070,7 @@ "typeString": "uint256" } }, - "id": 6318, + "id": 6309, "nodeType": "ExpressionStatement", "src": "5147:3:26" }, @@ -6084,7 +6084,7 @@ { "argumentTypes": null, "hexValue": "", - "id": 6355, + "id": 6346, "isConstant": false, "isLValue": false, "isPure": true, @@ -6113,11 +6113,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6352, + "id": 6343, "name": "_protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6249, + "referencedDeclaration": 6240, "src": "5523:12:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6137,11 +6137,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6349, + "id": 6340, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6247, + "referencedDeclaration": 6238, "src": "5513:4:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6161,11 +6161,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6346, + "id": 6337, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6245, + "referencedDeclaration": 6236, "src": "5500:7:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6182,32 +6182,32 @@ ], "expression": { "argumentTypes": null, - "id": 6344, + "id": 6335, "name": "totalEthAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6305, + "referencedDeclaration": 6296, "src": "5481:14:26", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 6345, + "id": 6336, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 7593, + "referencedDeclaration": 7584, "src": "5481:18:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 6347, + "id": 6338, "isConstant": false, "isLValue": false, "isPure": false, @@ -6221,21 +6221,21 @@ "typeString": "uint256" } }, - "id": 6348, + "id": 6339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 7593, + "referencedDeclaration": 7584, "src": "5481:31:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 6350, + "id": 6341, "isConstant": false, "isLValue": false, "isPure": false, @@ -6249,21 +6249,21 @@ "typeString": "uint256" } }, - "id": 6351, + "id": 6342, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 7593, + "referencedDeclaration": 7584, "src": "5481:41:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 6353, + "id": 6344, "isConstant": false, "isLValue": false, "isPure": false, @@ -6291,32 +6291,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6337, + "id": 6328, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "5430:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6341, + "id": 6332, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "exitUserAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 5936, + "referencedDeclaration": 5927, "src": "5430:26:26", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "id": 6342, + "id": 6333, "isConstant": false, "isLValue": false, "isPure": false, @@ -6330,7 +6330,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 6343, + "id": 6334, "isConstant": false, "isLValue": false, "isPure": false, @@ -6344,7 +6344,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 6354, + "id": 6345, "isConstant": false, "isLValue": false, "isPure": false, @@ -6358,7 +6358,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 6356, + "id": 6347, "isConstant": false, "isLValue": false, "isPure": false, @@ -6372,29 +6372,29 @@ "typeString": "tuple(bool,bytes memory)" } }, - "id": 6357, + "id": 6348, "nodeType": "ExpressionStatement", "src": "5430:120:26" } ] }, "documentation": null, - "id": 6359, + "id": 6350, "implemented": true, "kind": "function", "modifiers": [], "name": "exitPositionsPostLoan", "nodeType": "FunctionDefinition", "parameters": { - "id": 6252, + "id": 6243, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6245, + "id": 6236, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 6359, + "scope": 6350, "src": "4290:15:26", "stateVariable": false, "storageLocation": "default", @@ -6403,7 +6403,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6244, + "id": 6235, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4290:7:26", @@ -6417,10 +6417,10 @@ }, { "constant": false, - "id": 6247, + "id": 6238, "name": "_fee", "nodeType": "VariableDeclaration", - "scope": 6359, + "scope": 6350, "src": "4315:12:26", "stateVariable": false, "storageLocation": "default", @@ -6429,7 +6429,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6246, + "id": 6237, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4315:7:26", @@ -6443,10 +6443,10 @@ }, { "constant": false, - "id": 6249, + "id": 6240, "name": "_protocolFee", "nodeType": "VariableDeclaration", - "scope": 6359, + "scope": 6350, "src": "4337:20:26", "stateVariable": false, "storageLocation": "default", @@ -6455,7 +6455,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6248, + "id": 6239, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4337:7:26", @@ -6469,10 +6469,10 @@ }, { "constant": false, - "id": 6251, + "id": 6242, "name": "_params", "nodeType": "VariableDeclaration", - "scope": 6359, + "scope": 6350, "src": "4367:22:26", "stateVariable": false, "storageLocation": "calldata", @@ -6481,7 +6481,7 @@ "typeString": "bytes" }, "typeName": { - "id": 6250, + "id": 6241, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4367:5:26", @@ -6497,12 +6497,12 @@ "src": "4280:115:26" }, "returnParameters": { - "id": 6253, + "id": 6244, "nodeType": "ParameterList", "parameters": [], "src": "4405:0:26" }, - "scope": 6428, + "scope": 6419, "src": "4250:1307:26", "stateMutability": "nonpayable", "superFunction": null, @@ -6510,37 +6510,37 @@ }, { "body": { - "id": 6426, + "id": 6417, "nodeType": "Block", "src": "5814:1063:26", "statements": [ { "assignments": [ - 6373 + 6364 ], "declarations": [ { "constant": false, - "id": 6373, + "id": 6364, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 6426, + "scope": 6417, "src": "5824:31:26", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 6372, + "id": 6363, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "5824:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -6548,17 +6548,17 @@ "visibility": "internal" } ], - "id": 6377, + "id": 6368, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6375, + "id": 6366, "name": "addressRegistryAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6367, + "referencedDeclaration": 6358, "src": "5887:22:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6573,18 +6573,18 @@ "typeString": "address" } ], - "id": 6374, + "id": 6365, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "5858:15:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 6376, + "id": 6367, "isConstant": false, "isLValue": false, "isPure": false, @@ -6594,7 +6594,7 @@ "nodeType": "FunctionCall", "src": "5858:61:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -6603,15 +6603,15 @@ }, { "assignments": [ - 6379 + 6370 ], "declarations": [ { "constant": false, - "id": 6379, + "id": 6370, "name": "addressAndExecuteOperationCalldataParams", "nodeType": "VariableDeclaration", - "scope": 6426, + "scope": 6417, "src": "5984:53:26", "stateVariable": false, "storageLocation": "memory", @@ -6620,7 +6620,7 @@ "typeString": "bytes" }, "typeName": { - "id": 6378, + "id": 6369, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "5984:5:26", @@ -6633,7 +6633,7 @@ "visibility": "internal" } ], - "id": 6388, + "id": 6379, "initialValue": { "argumentTypes": null, "arguments": [ @@ -6642,11 +6642,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6384, + "id": 6375, "name": "dedgeExitManagerAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6363, + "referencedDeclaration": 6354, "src": "6094:23:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6663,18 +6663,18 @@ ], "expression": { "argumentTypes": null, - "id": 6382, + "id": 6373, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "6083:3:26", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 6383, + "id": 6374, "isConstant": false, "isLValue": false, "isPure": true, @@ -6688,7 +6688,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 6385, + "id": 6376, "isConstant": false, "isLValue": false, "isPure": false, @@ -6704,11 +6704,11 @@ }, { "argumentTypes": null, - "id": 6386, + "id": 6377, "name": "executeOperationCalldataParams", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6369, + "referencedDeclaration": 6360, "src": "6132:30:26", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -6729,18 +6729,18 @@ ], "expression": { "argumentTypes": null, - "id": 6380, + "id": 6371, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "6040:3:26", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 6381, + "id": 6372, "isConstant": false, "isLValue": false, "isPure": true, @@ -6754,7 +6754,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 6387, + "id": 6378, "isConstant": false, "isLValue": false, "isPure": false, @@ -6773,15 +6773,15 @@ }, { "assignments": [ - 6390 + 6381 ], "declarations": [ { "constant": false, - "id": 6390, + "id": 6381, "name": "lendingPool", "nodeType": "VariableDeclaration", - "scope": 6426, + "scope": 6417, "src": "6183:24:26", "stateVariable": false, "storageLocation": "default", @@ -6791,7 +6791,7 @@ }, "typeName": { "contractScope": null, - "id": 6389, + "id": 6380, "name": "ILendingPool", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 546, @@ -6805,7 +6805,7 @@ "visibility": "internal" } ], - "id": 6400, + "id": 6391, "initialValue": { "argumentTypes": null, "arguments": [ @@ -6824,32 +6824,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6393, + "id": 6384, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6373, + "referencedDeclaration": 6364, "src": "6283:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6394, + "id": 6385, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "AaveLendingPoolAddressProviderAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7495, + "referencedDeclaration": 7486, "src": "6283:53:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6395, + "id": 6386, "isConstant": false, "isLValue": false, "isPure": false, @@ -6871,7 +6871,7 @@ "typeString": "address" } ], - "id": 6392, + "id": 6383, "name": "ILendingPoolAddressesProvider", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -6882,7 +6882,7 @@ "typeString": "type(contract ILendingPoolAddressesProvider)" } }, - "id": 6396, + "id": 6387, "isConstant": false, "isLValue": false, "isPure": false, @@ -6896,7 +6896,7 @@ "typeString": "contract ILendingPoolAddressesProvider" } }, - "id": 6397, + "id": 6388, "isConstant": false, "isLValue": false, "isPure": false, @@ -6910,7 +6910,7 @@ "typeString": "function () view external returns (address)" } }, - "id": 6398, + "id": 6389, "isConstant": false, "isLValue": false, "isPure": false, @@ -6932,7 +6932,7 @@ "typeString": "address" } ], - "id": 6391, + "id": 6382, "name": "ILendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -6943,7 +6943,7 @@ "typeString": "type(contract ILendingPool)" } }, - "id": 6399, + "id": 6390, "isConstant": false, "isLValue": false, "isPure": false, @@ -6966,11 +6966,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6402, + "id": 6393, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6365, + "referencedDeclaration": 6356, "src": "6470:15:26", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -6982,11 +6982,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6404, + "id": 6395, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6390, + "referencedDeclaration": 6381, "src": "6495:11:26", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", @@ -7001,7 +7001,7 @@ "typeString": "contract ILendingPool" } ], - "id": 6403, + "id": 6394, "isConstant": false, "isLValue": false, "isPure": true, @@ -7014,7 +7014,7 @@ }, "typeName": "address" }, - "id": 6405, + "id": 6396, "isConstant": false, "isLValue": false, "isPure": false, @@ -7040,18 +7040,18 @@ "typeString": "address" } ], - "id": 6401, + "id": 6392, "name": "_proxyGuardPermit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5986, + "referencedDeclaration": 5977, "src": "6452:17:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", "typeString": "function (address payable,address)" } }, - "id": 6406, + "id": 6397, "isConstant": false, "isLValue": false, "isPure": false, @@ -7065,7 +7065,7 @@ "typeString": "tuple()" } }, - "id": 6407, + "id": 6398, "nodeType": "ExpressionStatement", "src": "6452:56:26" }, @@ -7075,11 +7075,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6411, + "id": 6402, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6365, + "referencedDeclaration": 6356, "src": "6601:15:26", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -7093,32 +7093,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6412, + "id": 6403, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6373, + "referencedDeclaration": 6364, "src": "6630:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6413, + "id": 6404, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "AaveEthAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7498, + "referencedDeclaration": 7489, "src": "6630:30:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6414, + "id": 6405, "isConstant": false, "isLValue": false, "isPure": false, @@ -7134,11 +7134,11 @@ }, { "argumentTypes": null, - "id": 6415, + "id": 6406, "name": "totalEthDebtAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6361, + "referencedDeclaration": 6352, "src": "6676:18:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7147,11 +7147,11 @@ }, { "argumentTypes": null, - "id": 6416, + "id": 6407, "name": "addressAndExecuteOperationCalldataParams", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6379, + "referencedDeclaration": 6370, "src": "6708:40:26", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -7180,18 +7180,18 @@ ], "expression": { "argumentTypes": null, - "id": 6408, + "id": 6399, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6390, + "referencedDeclaration": 6381, "src": "6566:11:26", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", "typeString": "contract ILendingPool" } }, - "id": 6410, + "id": 6401, "isConstant": false, "isLValue": false, "isPure": false, @@ -7205,7 +7205,7 @@ "typeString": "function (address,address,uint256,bytes memory) external" } }, - "id": 6417, + "id": 6408, "isConstant": false, "isLValue": false, "isPure": false, @@ -7219,7 +7219,7 @@ "typeString": "tuple()" } }, - "id": 6418, + "id": 6409, "nodeType": "ExpressionStatement", "src": "6566:192:26" }, @@ -7229,11 +7229,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6420, + "id": 6411, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6365, + "referencedDeclaration": 6356, "src": "6832:15:26", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -7245,11 +7245,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6422, + "id": 6413, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6390, + "referencedDeclaration": 6381, "src": "6857:11:26", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", @@ -7264,7 +7264,7 @@ "typeString": "contract ILendingPool" } ], - "id": 6421, + "id": 6412, "isConstant": false, "isLValue": false, "isPure": true, @@ -7277,7 +7277,7 @@ }, "typeName": "address" }, - "id": 6423, + "id": 6414, "isConstant": false, "isLValue": false, "isPure": false, @@ -7303,18 +7303,18 @@ "typeString": "address" } ], - "id": 6419, + "id": 6410, "name": "_proxyGuardForbid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6027, + "referencedDeclaration": 6018, "src": "6814:17:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", "typeString": "function (address payable,address)" } }, - "id": 6424, + "id": 6415, "isConstant": false, "isLValue": false, "isPure": false, @@ -7328,29 +7328,29 @@ "typeString": "tuple()" } }, - "id": 6425, + "id": 6416, "nodeType": "ExpressionStatement", "src": "6814:56:26" } ] }, "documentation": null, - "id": 6427, + "id": 6418, "implemented": true, "kind": "function", "modifiers": [], "name": "exitPositions", "nodeType": "FunctionDefinition", "parameters": { - "id": 6370, + "id": 6361, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6361, + "id": 6352, "name": "totalEthDebtAmount", "nodeType": "VariableDeclaration", - "scope": 6427, + "scope": 6418, "src": "5595:26:26", "stateVariable": false, "storageLocation": "default", @@ -7359,7 +7359,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6360, + "id": 6351, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5595:7:26", @@ -7373,10 +7373,10 @@ }, { "constant": false, - "id": 6363, + "id": 6354, "name": "dedgeExitManagerAddress", "nodeType": "VariableDeclaration", - "scope": 6427, + "scope": 6418, "src": "5631:31:26", "stateVariable": false, "storageLocation": "default", @@ -7385,7 +7385,7 @@ "typeString": "address" }, "typeName": { - "id": 6362, + "id": 6353, "name": "address", "nodeType": "ElementaryTypeName", "src": "5631:7:26", @@ -7400,10 +7400,10 @@ }, { "constant": false, - "id": 6365, + "id": 6356, "name": "dacProxyAddress", "nodeType": "VariableDeclaration", - "scope": 6427, + "scope": 6418, "src": "5672:31:26", "stateVariable": false, "storageLocation": "default", @@ -7412,7 +7412,7 @@ "typeString": "address payable" }, "typeName": { - "id": 6364, + "id": 6355, "name": "address", "nodeType": "ElementaryTypeName", "src": "5672:15:26", @@ -7427,10 +7427,10 @@ }, { "constant": false, - "id": 6367, + "id": 6358, "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 6427, + "scope": 6418, "src": "5713:30:26", "stateVariable": false, "storageLocation": "default", @@ -7439,7 +7439,7 @@ "typeString": "address" }, "typeName": { - "id": 6366, + "id": 6357, "name": "address", "nodeType": "ElementaryTypeName", "src": "5713:7:26", @@ -7454,10 +7454,10 @@ }, { "constant": false, - "id": 6369, + "id": 6360, "name": "executeOperationCalldataParams", "nodeType": "VariableDeclaration", - "scope": 6427, + "scope": 6418, "src": "5753:45:26", "stateVariable": false, "storageLocation": "calldata", @@ -7466,7 +7466,7 @@ "typeString": "bytes" }, "typeName": { - "id": 6368, + "id": 6359, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "5753:5:26", @@ -7482,19 +7482,19 @@ "src": "5585:219:26" }, "returnParameters": { - "id": 6371, + "id": 6362, "nodeType": "ParameterList", "parameters": [], "src": "5814:0:26" }, - "scope": 6428, + "scope": 6419, "src": "5563:1314:26", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 6429, + "scope": 6420, "src": "690:6189:26" } ], @@ -7504,14 +7504,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeExitManager.sol", "exportedSymbols": { "DedgeExitManager": [ - 6428 + 6419 ] }, - "id": 6429, + "id": 6420, "nodeType": "SourceUnit", "nodes": [ { - "id": 5898, + "id": 5889, "literals": [ "solidity", "0.5", @@ -7521,7 +7521,7 @@ "src": "65:23:26" }, { - "id": 5899, + "id": 5890, "literals": [ "experimental", "ABIEncoderV2" @@ -7532,9 +7532,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../interfaces/IERC20.sol", - "id": 5900, + "id": 5891, "nodeType": "ImportDirective", - "scope": 6429, + "scope": 6420, "sourceUnit": 121, "src": "124:34:26", "symbolAliases": [], @@ -7543,10 +7543,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", "file": "../interfaces/compound/IComptroller.sol", - "id": 5901, + "id": 5892, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 1097, + "scope": 6420, + "sourceUnit": 1123, "src": "160:49:26", "symbolAliases": [], "unitAlias": "" @@ -7554,10 +7554,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol", "file": "../interfaces/compound/ICEther.sol", - "id": 5902, + "id": 5893, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 733, + "scope": 6420, + "sourceUnit": 746, "src": "210:44:26", "symbolAliases": [], "unitAlias": "" @@ -7565,10 +7565,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol", "file": "../interfaces/compound/ICToken.sol", - "id": 5903, + "id": 5894, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 859, + "scope": 6420, + "sourceUnit": 885, "src": "255:44:26", "symbolAliases": [], "unitAlias": "" @@ -7576,9 +7576,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol", "file": "../interfaces/aave/ILendingPoolAddressesProvider.sol", - "id": 5904, + "id": 5895, "nodeType": "ImportDirective", - "scope": 6429, + "scope": 6420, "sourceUnit": 660, "src": "301:62:26", "symbolAliases": [], @@ -7587,9 +7587,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol", "file": "../interfaces/aave/ILendingPool.sol", - "id": 5905, + "id": 5896, "nodeType": "ImportDirective", - "scope": 6429, + "scope": 6420, "sourceUnit": 547, "src": "364:45:26", "symbolAliases": [], @@ -7598,9 +7598,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolParametersProvider.sol", "file": "../interfaces/aave/ILendingPoolParametersProvider.sol", - "id": 5906, + "id": 5897, "nodeType": "ImportDirective", - "scope": 6429, + "scope": 6420, "sourceUnit": 670, "src": "410:63:26", "symbolAliases": [], @@ -7609,10 +7609,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapLiteBase.sol", "file": "../lib/uniswap/UniswapLiteBase.sol", - "id": 5907, + "id": 5898, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 5195, + "scope": 6420, + "sourceUnit": 5247, "src": "475:44:26", "symbolAliases": [], "unitAlias": "" @@ -7620,10 +7620,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "file": "../lib/dapphub/Guard.sol", - "id": 5908, + "id": 5899, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 3196, + "scope": 6420, + "sourceUnit": 3248, "src": "520:34:26", "symbolAliases": [], "unitAlias": "" @@ -7631,10 +7631,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol", "file": "../registries/AddressRegistry.sol", - "id": 5909, + "id": 5900, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 7551, + "scope": 6420, + "sourceUnit": 7542, "src": "556:43:26", "symbolAliases": [], "unitAlias": "" @@ -7642,10 +7642,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol", "file": "../proxies/DACProxy.sol", - "id": 5910, + "id": 5901, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 7245, + "scope": 6420, + "sourceUnit": 7236, "src": "601:33:26", "symbolAliases": [], "unitAlias": "" @@ -7653,10 +7653,10 @@ { "absolutePath": "@openzeppelin/contracts/math/SafeMath.sol", "file": "@openzeppelin/contracts/math/SafeMath.sol", - "id": 5911, + "id": 5902, "nodeType": "ImportDirective", - "scope": 6429, - "sourceUnit": 7738, + "scope": 6420, + "sourceUnit": 7729, "src": "636:51:26", "symbolAliases": [], "unitAlias": "" @@ -7667,53 +7667,53 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 5912, + "id": 5903, "name": "UniswapLiteBase", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5194, + "referencedDeclaration": 5246, "src": "719:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_UniswapLiteBase_$5194", + "typeIdentifier": "t_contract$_UniswapLiteBase_$5246", "typeString": "contract UniswapLiteBase" } }, - "id": 5913, + "id": 5904, "nodeType": "InheritanceSpecifier", "src": "719:15:26" } ], "contractDependencies": [ - 5194 + 5246 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 6428, + "id": 6419, "linearizedBaseContracts": [ - 6428, - 5194 + 6419, + 5246 ], "name": "DedgeExitManager", "nodeType": "ContractDefinition", "nodes": [ { - "id": 5916, + "id": 5907, "libraryName": { "contractScope": null, - "id": 5914, + "id": 5905, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7737, + "referencedDeclaration": 7728, "src": "747:8:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$7737", + "typeIdentifier": "t_contract$_SafeMath_$7728", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", "src": "741:27:26", "typeName": { - "id": 5915, + "id": 5906, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "760:7:26", @@ -7725,31 +7725,31 @@ }, { "body": { - "id": 5919, + "id": 5910, "nodeType": "Block", "src": "802:2:26", "statements": [] }, "documentation": null, - "id": 5920, + "id": 5911, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 5917, + "id": 5908, "nodeType": "ParameterList", "parameters": [], "src": "782:2:26" }, "returnParameters": { - "id": 5918, + "id": 5909, "nodeType": "ParameterList", "parameters": [], "src": "802:0:26" }, - "scope": 6428, + "scope": 6419, "src": "774:30:26", "stateMutability": "payable", "superFunction": null, @@ -7757,31 +7757,31 @@ }, { "body": { - "id": 5923, + "id": 5914, "nodeType": "Block", "src": "831:2:26", "statements": [] }, "documentation": null, - "id": 5924, + "id": 5915, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 5921, + "id": 5912, "nodeType": "ParameterList", "parameters": [], "src": "821:2:26" }, "returnParameters": { - "id": 5922, + "id": 5913, "nodeType": "ParameterList", "parameters": [], "src": "831:0:26" }, - "scope": 6428, + "scope": 6419, "src": "810:23:26", "stateMutability": "nonpayable", "superFunction": null, @@ -7789,14 +7789,14 @@ }, { "canonicalName": "DedgeExitManager.DebtMarket", - "id": 5929, + "id": 5920, "members": [ { "constant": false, - "id": 5926, + "id": 5917, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 5929, + "scope": 5920, "src": "867:14:26", "stateVariable": false, "storageLocation": "default", @@ -7805,7 +7805,7 @@ "typeString": "address" }, "typeName": { - "id": 5925, + "id": 5916, "name": "address", "nodeType": "ElementaryTypeName", "src": "867:7:26", @@ -7820,10 +7820,10 @@ }, { "constant": false, - "id": 5928, + "id": 5919, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 5929, + "scope": 5920, "src": "891:14:26", "stateVariable": false, "storageLocation": "default", @@ -7832,7 +7832,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5927, + "id": 5918, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "891:7:26", @@ -7847,20 +7847,20 @@ ], "name": "DebtMarket", "nodeType": "StructDefinition", - "scope": 6428, + "scope": 6419, "src": "839:73:26", "visibility": "public" }, { "canonicalName": "DedgeExitManager.CollateralMarket", - "id": 5934, + "id": 5925, "members": [ { "constant": false, - "id": 5931, + "id": 5922, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 5934, + "scope": 5925, "src": "952:14:26", "stateVariable": false, "storageLocation": "default", @@ -7869,7 +7869,7 @@ "typeString": "address" }, "typeName": { - "id": 5930, + "id": 5921, "name": "address", "nodeType": "ElementaryTypeName", "src": "952:7:26", @@ -7884,10 +7884,10 @@ }, { "constant": false, - "id": 5933, + "id": 5924, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 5934, + "scope": 5925, "src": "976:14:26", "stateVariable": false, "storageLocation": "default", @@ -7896,7 +7896,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5932, + "id": 5923, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "976:7:26", @@ -7911,20 +7911,20 @@ ], "name": "CollateralMarket", "nodeType": "StructDefinition", - "scope": 6428, + "scope": 6419, "src": "918:79:26", "visibility": "public" }, { "canonicalName": "DedgeExitManager.ExitPositionCalldata", - "id": 5945, + "id": 5936, "members": [ { "constant": false, - "id": 5936, + "id": 5927, "name": "exitUserAddress", "nodeType": "VariableDeclaration", - "scope": 5945, + "scope": 5936, "src": "1041:31:26", "stateVariable": false, "storageLocation": "default", @@ -7933,7 +7933,7 @@ "typeString": "address payable" }, "typeName": { - "id": 5935, + "id": 5926, "name": "address", "nodeType": "ElementaryTypeName", "src": "1041:15:26", @@ -7948,10 +7948,10 @@ }, { "constant": false, - "id": 5938, + "id": 5929, "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 5945, + "scope": 5936, "src": "1082:30:26", "stateVariable": false, "storageLocation": "default", @@ -7960,7 +7960,7 @@ "typeString": "address" }, "typeName": { - "id": 5937, + "id": 5928, "name": "address", "nodeType": "ElementaryTypeName", "src": "1082:7:26", @@ -7975,36 +7975,36 @@ }, { "constant": false, - "id": 5941, + "id": 5932, "name": "debtMarket", "nodeType": "VariableDeclaration", - "scope": 5945, + "scope": 5936, "src": "1122:23:26", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5929_storage_$dyn_storage_ptr", + "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5920_storage_$dyn_storage_ptr", "typeString": "struct DedgeExitManager.DebtMarket[]" }, "typeName": { "baseType": { "contractScope": null, - "id": 5939, + "id": 5930, "name": "DebtMarket", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5929, + "referencedDeclaration": 5920, "src": "1122:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_DebtMarket_$5929_storage_ptr", + "typeIdentifier": "t_struct$_DebtMarket_$5920_storage_ptr", "typeString": "struct DedgeExitManager.DebtMarket" } }, - "id": 5940, + "id": 5931, "length": null, "nodeType": "ArrayTypeName", "src": "1122:12:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5929_storage_$dyn_storage_ptr", + "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5920_storage_$dyn_storage_ptr", "typeString": "struct DedgeExitManager.DebtMarket[]" } }, @@ -8013,36 +8013,36 @@ }, { "constant": false, - "id": 5944, + "id": 5935, "name": "collateralMarket", "nodeType": "VariableDeclaration", - "scope": 5945, + "scope": 5936, "src": "1155:35:26", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5934_storage_$dyn_storage_ptr", + "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5925_storage_$dyn_storage_ptr", "typeString": "struct DedgeExitManager.CollateralMarket[]" }, "typeName": { "baseType": { "contractScope": null, - "id": 5942, + "id": 5933, "name": "CollateralMarket", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5934, + "referencedDeclaration": 5925, "src": "1155:16:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_CollateralMarket_$5934_storage_ptr", + "typeIdentifier": "t_struct$_CollateralMarket_$5925_storage_ptr", "typeString": "struct DedgeExitManager.CollateralMarket" } }, - "id": 5943, + "id": 5934, "length": null, "nodeType": "ArrayTypeName", "src": "1155:18:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5934_storage_$dyn_storage_ptr", + "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5925_storage_$dyn_storage_ptr", "typeString": "struct DedgeExitManager.CollateralMarket[]" } }, @@ -8052,27 +8052,27 @@ ], "name": "ExitPositionCalldata", "nodeType": "StructDefinition", - "scope": 6428, + "scope": 6419, "src": "1003:194:26", "visibility": "public" }, { "body": { - "id": 5985, + "id": 5976, "nodeType": "Block", "src": "1294:214:26", "statements": [ { "assignments": [ - 5953 + 5944 ], "declarations": [ { "constant": false, - "id": 5953, + "id": 5944, "name": "g", "nodeType": "VariableDeclaration", - "scope": 5985, + "scope": 5976, "src": "1304:9:26", "stateVariable": false, "storageLocation": "default", @@ -8081,7 +8081,7 @@ "typeString": "address" }, "typeName": { - "id": 5952, + "id": 5943, "name": "address", "nodeType": "ElementaryTypeName", "src": "1304:7:26", @@ -8095,7 +8095,7 @@ "visibility": "internal" } ], - "id": 5961, + "id": 5952, "initialValue": { "argumentTypes": null, "arguments": [ @@ -8109,11 +8109,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5956, + "id": 5947, "name": "proxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5947, + "referencedDeclaration": 5938, "src": "1333:12:26", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -8128,18 +8128,18 @@ "typeString": "address payable" } ], - "id": 5955, + "id": 5946, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1324:8:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 5957, + "id": 5948, "isConstant": false, "isLValue": false, "isPure": false, @@ -8149,25 +8149,25 @@ "nodeType": "FunctionCall", "src": "1324:22:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 5958, + "id": 5949, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "authority", "nodeType": "MemberAccess", - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1324:32:26", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2799_$", + "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2851_$", "typeString": "function () view external returns (contract DSAuthority)" } }, - "id": 5959, + "id": 5950, "isConstant": false, "isLValue": false, "isPure": false, @@ -8177,7 +8177,7 @@ "nodeType": "FunctionCall", "src": "1324:34:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -8185,11 +8185,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 5954, + "id": 5945, "isConstant": false, "isLValue": false, "isPure": true, @@ -8202,7 +8202,7 @@ }, "typeName": "address" }, - "id": 5960, + "id": 5951, "isConstant": false, "isLValue": false, "isPure": false, @@ -8234,11 +8234,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5969, + "id": 5960, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5949, + "referencedDeclaration": 5940, "src": "1425:3:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8253,7 +8253,7 @@ "typeString": "address" } ], - "id": 5968, + "id": 5959, "isConstant": false, "isLValue": false, "isPure": true, @@ -8266,7 +8266,7 @@ }, "typeName": "address" }, - "id": 5970, + "id": 5961, "isConstant": false, "isLValue": false, "isPure": false, @@ -8288,7 +8288,7 @@ "typeString": "address" } ], - "id": 5967, + "id": 5958, "isConstant": false, "isLValue": false, "isPure": true, @@ -8301,7 +8301,7 @@ }, "typeName": "bytes20" }, - "id": 5971, + "id": 5962, "isConstant": false, "isLValue": false, "isPure": false, @@ -8323,7 +8323,7 @@ "typeString": "bytes20" } ], - "id": 5966, + "id": 5957, "isConstant": false, "isLValue": false, "isPure": true, @@ -8336,7 +8336,7 @@ }, "typeName": "bytes32" }, - "id": 5972, + "id": 5963, "isConstant": false, "isLValue": false, "isPure": false, @@ -8360,11 +8360,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5974, + "id": 5965, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5953, + "referencedDeclaration": 5944, "src": "1453:1:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8379,18 +8379,18 @@ "typeString": "address" } ], - "id": 5973, + "id": 5964, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1445:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 5975, + "id": 5966, "isConstant": false, "isLValue": false, "isPure": false, @@ -8400,25 +8400,25 @@ "nodeType": "FunctionCall", "src": "1445:10:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 5976, + "id": 5967, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1445:14:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 5977, + "id": 5968, "isConstant": false, "isLValue": false, "isPure": false, @@ -8442,11 +8442,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5979, + "id": 5970, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5953, + "referencedDeclaration": 5944, "src": "1483:1:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8461,18 +8461,18 @@ "typeString": "address" } ], - "id": 5978, + "id": 5969, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1475:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 5980, + "id": 5971, "isConstant": false, "isLValue": false, "isPure": false, @@ -8482,25 +8482,25 @@ "nodeType": "FunctionCall", "src": "1475:10:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 5981, + "id": 5972, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1475:14:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 5982, + "id": 5973, "isConstant": false, "isLValue": false, "isPure": false, @@ -8535,11 +8535,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5963, + "id": 5954, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5953, + "referencedDeclaration": 5944, "src": "1378:1:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8554,18 +8554,18 @@ "typeString": "address" } ], - "id": 5962, + "id": 5953, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1370:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 5964, + "id": 5955, "isConstant": false, "isLValue": false, "isPure": false, @@ -8575,25 +8575,25 @@ "nodeType": "FunctionCall", "src": "1370:10:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 5965, + "id": 5956, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "permit", "nodeType": "MemberAccess", - "referencedDeclaration": 3086, + "referencedDeclaration": 3138, "src": "1370:17:26", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32) external" } }, - "id": 5983, + "id": 5974, "isConstant": false, "isLValue": false, "isPure": false, @@ -8607,29 +8607,29 @@ "typeString": "tuple()" } }, - "id": 5984, + "id": 5975, "nodeType": "ExpressionStatement", "src": "1370:131:26" } ] }, "documentation": null, - "id": 5986, + "id": 5977, "implemented": true, "kind": "function", "modifiers": [], "name": "_proxyGuardPermit", "nodeType": "FunctionDefinition", "parameters": { - "id": 5950, + "id": 5941, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5947, + "id": 5938, "name": "proxyAddress", "nodeType": "VariableDeclaration", - "scope": 5986, + "scope": 5977, "src": "1230:28:26", "stateVariable": false, "storageLocation": "default", @@ -8638,7 +8638,7 @@ "typeString": "address payable" }, "typeName": { - "id": 5946, + "id": 5937, "name": "address", "nodeType": "ElementaryTypeName", "src": "1230:15:26", @@ -8653,10 +8653,10 @@ }, { "constant": false, - "id": 5949, + "id": 5940, "name": "src", "nodeType": "VariableDeclaration", - "scope": 5986, + "scope": 5977, "src": "1260:11:26", "stateVariable": false, "storageLocation": "default", @@ -8665,7 +8665,7 @@ "typeString": "address" }, "typeName": { - "id": 5948, + "id": 5939, "name": "address", "nodeType": "ElementaryTypeName", "src": "1260:7:26", @@ -8682,12 +8682,12 @@ "src": "1229:43:26" }, "returnParameters": { - "id": 5951, + "id": 5942, "nodeType": "ParameterList", "parameters": [], "src": "1294:0:26" }, - "scope": 6428, + "scope": 6419, "src": "1203:305:26", "stateMutability": "nonpayable", "superFunction": null, @@ -8695,21 +8695,21 @@ }, { "body": { - "id": 6026, + "id": 6017, "nodeType": "Block", "src": "1605:214:26", "statements": [ { "assignments": [ - 5994 + 5985 ], "declarations": [ { "constant": false, - "id": 5994, + "id": 5985, "name": "g", "nodeType": "VariableDeclaration", - "scope": 6026, + "scope": 6017, "src": "1615:9:26", "stateVariable": false, "storageLocation": "default", @@ -8718,7 +8718,7 @@ "typeString": "address" }, "typeName": { - "id": 5993, + "id": 5984, "name": "address", "nodeType": "ElementaryTypeName", "src": "1615:7:26", @@ -8732,7 +8732,7 @@ "visibility": "internal" } ], - "id": 6002, + "id": 5993, "initialValue": { "argumentTypes": null, "arguments": [ @@ -8746,11 +8746,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5997, + "id": 5988, "name": "proxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5988, + "referencedDeclaration": 5979, "src": "1644:12:26", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -8765,18 +8765,18 @@ "typeString": "address payable" } ], - "id": 5996, + "id": 5987, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1635:8:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 5998, + "id": 5989, "isConstant": false, "isLValue": false, "isPure": false, @@ -8786,25 +8786,25 @@ "nodeType": "FunctionCall", "src": "1635:22:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 5999, + "id": 5990, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "authority", "nodeType": "MemberAccess", - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1635:32:26", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2799_$", + "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2851_$", "typeString": "function () view external returns (contract DSAuthority)" } }, - "id": 6000, + "id": 5991, "isConstant": false, "isLValue": false, "isPure": false, @@ -8814,7 +8814,7 @@ "nodeType": "FunctionCall", "src": "1635:34:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -8822,11 +8822,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 5995, + "id": 5986, "isConstant": false, "isLValue": false, "isPure": true, @@ -8839,7 +8839,7 @@ }, "typeName": "address" }, - "id": 6001, + "id": 5992, "isConstant": false, "isLValue": false, "isPure": false, @@ -8871,11 +8871,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6010, + "id": 6001, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5990, + "referencedDeclaration": 5981, "src": "1736:3:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8890,7 +8890,7 @@ "typeString": "address" } ], - "id": 6009, + "id": 6000, "isConstant": false, "isLValue": false, "isPure": true, @@ -8903,7 +8903,7 @@ }, "typeName": "address" }, - "id": 6011, + "id": 6002, "isConstant": false, "isLValue": false, "isPure": false, @@ -8925,7 +8925,7 @@ "typeString": "address" } ], - "id": 6008, + "id": 5999, "isConstant": false, "isLValue": false, "isPure": true, @@ -8938,7 +8938,7 @@ }, "typeName": "bytes20" }, - "id": 6012, + "id": 6003, "isConstant": false, "isLValue": false, "isPure": false, @@ -8960,7 +8960,7 @@ "typeString": "bytes20" } ], - "id": 6007, + "id": 5998, "isConstant": false, "isLValue": false, "isPure": true, @@ -8973,7 +8973,7 @@ }, "typeName": "bytes32" }, - "id": 6013, + "id": 6004, "isConstant": false, "isLValue": false, "isPure": false, @@ -8997,11 +8997,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6015, + "id": 6006, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5994, + "referencedDeclaration": 5985, "src": "1764:1:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9016,18 +9016,18 @@ "typeString": "address" } ], - "id": 6014, + "id": 6005, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1756:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6016, + "id": 6007, "isConstant": false, "isLValue": false, "isPure": false, @@ -9037,25 +9037,25 @@ "nodeType": "FunctionCall", "src": "1756:10:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6017, + "id": 6008, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1756:14:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 6018, + "id": 6009, "isConstant": false, "isLValue": false, "isPure": false, @@ -9079,11 +9079,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6020, + "id": 6011, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5994, + "referencedDeclaration": 5985, "src": "1794:1:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9098,18 +9098,18 @@ "typeString": "address" } ], - "id": 6019, + "id": 6010, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1786:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6021, + "id": 6012, "isConstant": false, "isLValue": false, "isPure": false, @@ -9119,25 +9119,25 @@ "nodeType": "FunctionCall", "src": "1786:10:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6022, + "id": 6013, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1786:14:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 6023, + "id": 6014, "isConstant": false, "isLValue": false, "isPure": false, @@ -9172,11 +9172,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6004, + "id": 5995, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5994, + "referencedDeclaration": 5985, "src": "1689:1:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9191,18 +9191,18 @@ "typeString": "address" } ], - "id": 6003, + "id": 5994, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1681:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6005, + "id": 5996, "isConstant": false, "isLValue": false, "isPure": false, @@ -9212,25 +9212,25 @@ "nodeType": "FunctionCall", "src": "1681:10:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6006, + "id": 5997, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "forbid", "nodeType": "MemberAccess", - "referencedDeclaration": 3114, + "referencedDeclaration": 3166, "src": "1681:17:26", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32) external" } }, - "id": 6024, + "id": 6015, "isConstant": false, "isLValue": false, "isPure": false, @@ -9244,29 +9244,29 @@ "typeString": "tuple()" } }, - "id": 6025, + "id": 6016, "nodeType": "ExpressionStatement", "src": "1681:131:26" } ] }, "documentation": null, - "id": 6027, + "id": 6018, "implemented": true, "kind": "function", "modifiers": [], "name": "_proxyGuardForbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 5991, + "id": 5982, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5988, + "id": 5979, "name": "proxyAddress", "nodeType": "VariableDeclaration", - "scope": 6027, + "scope": 6018, "src": "1541:28:26", "stateVariable": false, "storageLocation": "default", @@ -9275,7 +9275,7 @@ "typeString": "address payable" }, "typeName": { - "id": 5987, + "id": 5978, "name": "address", "nodeType": "ElementaryTypeName", "src": "1541:15:26", @@ -9290,10 +9290,10 @@ }, { "constant": false, - "id": 5990, + "id": 5981, "name": "src", "nodeType": "VariableDeclaration", - "scope": 6027, + "scope": 6018, "src": "1571:11:26", "stateVariable": false, "storageLocation": "default", @@ -9302,7 +9302,7 @@ "typeString": "address" }, "typeName": { - "id": 5989, + "id": 5980, "name": "address", "nodeType": "ElementaryTypeName", "src": "1571:7:26", @@ -9319,12 +9319,12 @@ "src": "1540:43:26" }, "returnParameters": { - "id": 5992, + "id": 5983, "nodeType": "ParameterList", "parameters": [], "src": "1605:0:26" }, - "scope": 6428, + "scope": 6419, "src": "1514:305:26", "stateMutability": "nonpayable", "superFunction": null, @@ -9332,21 +9332,21 @@ }, { "body": { - "id": 6055, + "id": 6046, "nodeType": "Block", "src": "1882:264:26", "statements": [ { "assignments": [ - 6035 + 6026 ], "declarations": [ { "constant": false, - "id": 6035, + "id": 6026, "name": "underlying", "nodeType": "VariableDeclaration", - "scope": 6055, + "scope": 6046, "src": "1951:18:26", "stateVariable": false, "storageLocation": "default", @@ -9355,7 +9355,7 @@ "typeString": "address" }, "typeName": { - "id": 6034, + "id": 6025, "name": "address", "nodeType": "ElementaryTypeName", "src": "1951:7:26", @@ -9369,7 +9369,7 @@ "visibility": "internal" } ], - "id": 6041, + "id": 6032, "initialValue": { "argumentTypes": null, "arguments": [], @@ -9380,11 +9380,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6037, + "id": 6028, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6029, + "referencedDeclaration": 6020, "src": "1980:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9399,18 +9399,18 @@ "typeString": "address" } ], - "id": 6036, + "id": 6027, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "1972:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6038, + "id": 6029, "isConstant": false, "isLValue": false, "isPure": false, @@ -9420,25 +9420,25 @@ "nodeType": "FunctionCall", "src": "1972:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6039, + "id": 6030, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, + "referencedDeclaration": 835, "src": "1972:26:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6040, + "id": 6031, "isConstant": false, "isLValue": false, "isPure": false, @@ -9465,7 +9465,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 6051, + "id": 6042, "isConstant": false, "isLValue": false, "isPure": false, @@ -9475,11 +9475,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6047, + "id": 6038, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6029, + "referencedDeclaration": 6020, "src": "2058:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9488,11 +9488,11 @@ }, { "argumentTypes": null, - "id": 6048, + "id": 6039, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6031, + "referencedDeclaration": 6022, "src": "2066:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9516,11 +9516,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6044, + "id": 6035, "name": "underlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6035, + "referencedDeclaration": 6026, "src": "2038:10:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9535,7 +9535,7 @@ "typeString": "address" } ], - "id": 6043, + "id": 6034, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9546,7 +9546,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 6045, + "id": 6036, "isConstant": false, "isLValue": false, "isPure": false, @@ -9560,7 +9560,7 @@ "typeString": "contract IERC20" } }, - "id": 6046, + "id": 6037, "isConstant": false, "isLValue": false, "isPure": false, @@ -9574,7 +9574,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 6049, + "id": 6040, "isConstant": false, "isLValue": false, "isPure": false, @@ -9593,7 +9593,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "74727565", - "id": 6050, + "id": 6041, "isConstant": false, "isLValue": false, "isPure": true, @@ -9617,7 +9617,7 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d617070726f7665642d6661696c6564", - "id": 6052, + "id": 6043, "isConstant": false, "isLValue": false, "isPure": true, @@ -9644,21 +9644,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-approved-failed\"" } ], - "id": 6042, + "id": 6033, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2010:7:26", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6053, + "id": 6044, "isConstant": false, "isLValue": false, "isPure": false, @@ -9672,29 +9672,29 @@ "typeString": "tuple()" } }, - "id": 6054, + "id": 6045, "nodeType": "ExpressionStatement", "src": "2010:129:26" } ] }, "documentation": null, - "id": 6056, + "id": 6047, "implemented": true, "kind": "function", "modifiers": [], "name": "_approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 6032, + "id": 6023, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6029, + "id": 6020, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 6056, + "scope": 6047, "src": "1843:14:26", "stateVariable": false, "storageLocation": "default", @@ -9703,7 +9703,7 @@ "typeString": "address" }, "typeName": { - "id": 6028, + "id": 6019, "name": "address", "nodeType": "ElementaryTypeName", "src": "1843:7:26", @@ -9718,10 +9718,10 @@ }, { "constant": false, - "id": 6031, + "id": 6022, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6056, + "scope": 6047, "src": "1859:14:26", "stateVariable": false, "storageLocation": "default", @@ -9730,7 +9730,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6030, + "id": 6021, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1859:7:26", @@ -9746,12 +9746,12 @@ "src": "1842:32:26" }, "returnParameters": { - "id": 6033, + "id": 6024, "nodeType": "ParameterList", "parameters": [], "src": "1882:0:26" }, - "scope": 6428, + "scope": 6419, "src": "1825:321:26", "stateMutability": "nonpayable", "superFunction": null, @@ -9759,7 +9759,7 @@ }, { "body": { - "id": 6098, + "id": 6089, "nodeType": "Block", "src": "2292:339:26", "statements": [ @@ -9770,18 +9770,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 6069, + "id": 6060, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6067, + "id": 6058, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6060, + "referencedDeclaration": 6051, "src": "2306:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9792,11 +9792,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 6068, + "id": 6059, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6058, + "referencedDeclaration": 6049, "src": "2316:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9810,7 +9810,7 @@ } }, "falseBody": { - "id": 6096, + "id": 6087, "nodeType": "Block", "src": "2394:231:26", "statements": [ @@ -9823,11 +9823,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6090, + "id": 6081, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6062, + "referencedDeclaration": 6053, "src": "2500:9:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9836,11 +9836,11 @@ }, { "argumentTypes": null, - "id": 6091, + "id": 6082, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6064, + "referencedDeclaration": 6055, "src": "2531:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9872,11 +9872,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6084, + "id": 6075, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6060, + "referencedDeclaration": 6051, "src": "2448:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9891,18 +9891,18 @@ "typeString": "address" } ], - "id": 6083, + "id": 6074, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "2440:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6085, + "id": 6076, "isConstant": false, "isLValue": false, "isPure": false, @@ -9912,25 +9912,25 @@ "nodeType": "FunctionCall", "src": "2440:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6086, + "id": 6077, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, + "referencedDeclaration": 835, "src": "2440:26:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6087, + "id": 6078, "isConstant": false, "isLValue": false, "isPure": false, @@ -9952,7 +9952,7 @@ "typeString": "address" } ], - "id": 6082, + "id": 6073, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -9963,7 +9963,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 6088, + "id": 6079, "isConstant": false, "isLValue": false, "isPure": false, @@ -9977,7 +9977,7 @@ "typeString": "contract IERC20" } }, - "id": 6089, + "id": 6080, "isConstant": false, "isLValue": false, "isPure": false, @@ -9991,7 +9991,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 6092, + "id": 6083, "isConstant": false, "isLValue": false, "isPure": false, @@ -10008,7 +10008,7 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d7472616e736665722d6661696c6564", - "id": 6093, + "id": 6084, "isConstant": false, "isLValue": false, "isPure": true, @@ -10035,21 +10035,21 @@ "typeString": "literal_string \"cmpnd-mgr-transfer-failed\"" } ], - "id": 6081, + "id": 6072, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2408:7:26", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6094, + "id": 6085, "isConstant": false, "isLValue": false, "isPure": false, @@ -10063,17 +10063,17 @@ "typeString": "tuple()" } }, - "id": 6095, + "id": 6086, "nodeType": "ExpressionStatement", "src": "2408:206:26" } ] }, - "id": 6097, + "id": 6088, "nodeType": "IfStatement", "src": "2302:323:26", "trueBody": { - "id": 6080, + "id": 6071, "nodeType": "Block", "src": "2331:57:26", "statements": [ @@ -10084,7 +10084,7 @@ { "argumentTypes": null, "hexValue": "", - "id": 6077, + "id": 6068, "isConstant": false, "isLValue": false, "isPure": true, @@ -10110,11 +10110,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6075, + "id": 6066, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6064, + "referencedDeclaration": 6055, "src": "2366:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10133,18 +10133,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6070, + "id": 6061, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6062, + "referencedDeclaration": 6053, "src": "2345:9:26", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 6073, + "id": 6064, "isConstant": false, "isLValue": false, "isPure": false, @@ -10158,7 +10158,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 6074, + "id": 6065, "isConstant": false, "isLValue": false, "isPure": false, @@ -10172,7 +10172,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 6076, + "id": 6067, "isConstant": false, "isLValue": false, "isPure": false, @@ -10186,7 +10186,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 6078, + "id": 6069, "isConstant": false, "isLValue": false, "isPure": false, @@ -10200,7 +10200,7 @@ "typeString": "tuple(bool,bytes memory)" } }, - "id": 6079, + "id": 6070, "nodeType": "ExpressionStatement", "src": "2345:32:26" } @@ -10210,22 +10210,22 @@ ] }, "documentation": null, - "id": 6099, + "id": 6090, "implemented": true, "kind": "function", "modifiers": [], "name": "_transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 6065, + "id": 6056, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6058, + "id": 6049, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 6099, + "scope": 6090, "src": "2180:21:26", "stateVariable": false, "storageLocation": "default", @@ -10234,7 +10234,7 @@ "typeString": "address" }, "typeName": { - "id": 6057, + "id": 6048, "name": "address", "nodeType": "ElementaryTypeName", "src": "2180:7:26", @@ -10249,10 +10249,10 @@ }, { "constant": false, - "id": 6060, + "id": 6051, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 6099, + "scope": 6090, "src": "2211:14:26", "stateVariable": false, "storageLocation": "default", @@ -10261,7 +10261,7 @@ "typeString": "address" }, "typeName": { - "id": 6059, + "id": 6050, "name": "address", "nodeType": "ElementaryTypeName", "src": "2211:7:26", @@ -10276,10 +10276,10 @@ }, { "constant": false, - "id": 6062, + "id": 6053, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 6099, + "scope": 6090, "src": "2235:17:26", "stateVariable": false, "storageLocation": "default", @@ -10288,7 +10288,7 @@ "typeString": "address" }, "typeName": { - "id": 6061, + "id": 6052, "name": "address", "nodeType": "ElementaryTypeName", "src": "2235:7:26", @@ -10303,10 +10303,10 @@ }, { "constant": false, - "id": 6064, + "id": 6055, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6099, + "scope": 6090, "src": "2262:14:26", "stateVariable": false, "storageLocation": "default", @@ -10315,7 +10315,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6063, + "id": 6054, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2262:7:26", @@ -10331,12 +10331,12 @@ "src": "2170:112:26" }, "returnParameters": { - "id": 6066, + "id": 6057, "nodeType": "ParameterList", "parameters": [], "src": "2292:0:26" }, - "scope": 6428, + "scope": 6419, "src": "2152:479:26", "stateMutability": "nonpayable", "superFunction": null, @@ -10344,7 +10344,7 @@ }, { "body": { - "id": 6140, + "id": 6131, "nodeType": "Block", "src": "2735:310:26", "statements": [ @@ -10355,18 +10355,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 6110, + "id": 6101, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6108, + "id": 6099, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6103, + "referencedDeclaration": 6094, "src": "2749:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10377,11 +10377,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 6109, + "id": 6100, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6101, + "referencedDeclaration": 6092, "src": "2759:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10395,7 +10395,7 @@ } }, "falseBody": { - "id": 6138, + "id": 6129, "nodeType": "Block", "src": "2848:191:26", "statements": [ @@ -10405,11 +10405,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6122, + "id": 6113, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6103, + "referencedDeclaration": 6094, "src": "2871:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10418,11 +10418,11 @@ }, { "argumentTypes": null, - "id": 6123, + "id": 6114, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6105, + "referencedDeclaration": 6096, "src": "2879:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10441,18 +10441,18 @@ "typeString": "uint256" } ], - "id": 6121, + "id": 6112, "name": "_approve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6056, + "referencedDeclaration": 6047, "src": "2862:8:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 6124, + "id": 6115, "isConstant": false, "isLValue": false, "isPure": false, @@ -10466,7 +10466,7 @@ "typeString": "tuple()" } }, - "id": 6125, + "id": 6116, "nodeType": "ExpressionStatement", "src": "2862:24:26" }, @@ -10480,7 +10480,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6134, + "id": 6125, "isConstant": false, "isLValue": false, "isPure": false, @@ -10490,11 +10490,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6131, + "id": 6122, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6105, + "referencedDeclaration": 6096, "src": "2953:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10514,11 +10514,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6128, + "id": 6119, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6103, + "referencedDeclaration": 6094, "src": "2933:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10533,18 +10533,18 @@ "typeString": "address" } ], - "id": 6127, + "id": 6118, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "2925:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6129, + "id": 6120, "isConstant": false, "isLValue": false, "isPure": false, @@ -10554,25 +10554,25 @@ "nodeType": "FunctionCall", "src": "2925:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6130, + "id": 6121, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "repayBorrow", "nodeType": "MemberAccess", - "referencedDeclaration": 769, + "referencedDeclaration": 782, "src": "2925:27:26", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 6132, + "id": 6123, "isConstant": false, "isLValue": false, "isPure": false, @@ -10591,7 +10591,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6133, + "id": 6124, "isConstant": false, "isLValue": false, "isPure": true, @@ -10615,7 +10615,7 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d72657061792d6661696c6564", - "id": 6135, + "id": 6126, "isConstant": false, "isLValue": false, "isPure": true, @@ -10642,21 +10642,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-repay-failed\"" } ], - "id": 6126, + "id": 6117, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2900:7:26", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6136, + "id": 6127, "isConstant": false, "isLValue": false, "isPure": false, @@ -10670,17 +10670,17 @@ "typeString": "tuple()" } }, - "id": 6137, + "id": 6128, "nodeType": "ExpressionStatement", "src": "2900:128:26" } ] }, - "id": 6139, + "id": 6130, "nodeType": "IfStatement", "src": "2745:294:26", "trueBody": { - "id": 6120, + "id": 6111, "nodeType": "Block", "src": "2774:68:26", "statements": [ @@ -10693,11 +10693,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6116, + "id": 6107, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6105, + "referencedDeclaration": 6096, "src": "2822:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10719,11 +10719,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6112, + "id": 6103, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6103, + "referencedDeclaration": 6094, "src": "2796:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10738,18 +10738,18 @@ "typeString": "address" } ], - "id": 6111, + "id": 6102, "name": "ICEther", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 732, + "referencedDeclaration": 745, "src": "2788:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICEther_$732_$", + "typeIdentifier": "t_type$_t_contract$_ICEther_$745_$", "typeString": "type(contract ICEther)" } }, - "id": 6113, + "id": 6104, "isConstant": false, "isLValue": false, "isPure": false, @@ -10759,11 +10759,11 @@ "nodeType": "FunctionCall", "src": "2788:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICEther_$732", + "typeIdentifier": "t_contract$_ICEther_$745", "typeString": "contract ICEther" } }, - "id": 6114, + "id": 6105, "isConstant": false, "isLValue": false, "isPure": false, @@ -10777,7 +10777,7 @@ "typeString": "function () payable external" } }, - "id": 6115, + "id": 6106, "isConstant": false, "isLValue": false, "isPure": false, @@ -10791,7 +10791,7 @@ "typeString": "function (uint256) pure returns (function () payable external)" } }, - "id": 6117, + "id": 6108, "isConstant": false, "isLValue": false, "isPure": false, @@ -10805,7 +10805,7 @@ "typeString": "function () payable external" } }, - "id": 6118, + "id": 6109, "isConstant": false, "isLValue": false, "isPure": false, @@ -10819,7 +10819,7 @@ "typeString": "tuple()" } }, - "id": 6119, + "id": 6110, "nodeType": "ExpressionStatement", "src": "2788:43:26" } @@ -10829,22 +10829,22 @@ ] }, "documentation": null, - "id": 6141, + "id": 6132, "implemented": true, "kind": "function", "modifiers": [], "name": "_repayBorrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 6106, + "id": 6097, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6101, + "id": 6092, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 6141, + "scope": 6132, "src": "2659:21:26", "stateVariable": false, "storageLocation": "default", @@ -10853,7 +10853,7 @@ "typeString": "address" }, "typeName": { - "id": 6100, + "id": 6091, "name": "address", "nodeType": "ElementaryTypeName", "src": "2659:7:26", @@ -10868,10 +10868,10 @@ }, { "constant": false, - "id": 6103, + "id": 6094, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 6141, + "scope": 6132, "src": "2682:14:26", "stateVariable": false, "storageLocation": "default", @@ -10880,7 +10880,7 @@ "typeString": "address" }, "typeName": { - "id": 6102, + "id": 6093, "name": "address", "nodeType": "ElementaryTypeName", "src": "2682:7:26", @@ -10895,10 +10895,10 @@ }, { "constant": false, - "id": 6105, + "id": 6096, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6141, + "scope": 6132, "src": "2698:14:26", "stateVariable": false, "storageLocation": "default", @@ -10907,7 +10907,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6104, + "id": 6095, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2698:7:26", @@ -10923,12 +10923,12 @@ "src": "2658:55:26" }, "returnParameters": { - "id": 6107, + "id": 6098, "nodeType": "ParameterList", "parameters": [], "src": "2735:0:26" }, - "scope": 6428, + "scope": 6419, "src": "2637:408:26", "stateMutability": "nonpayable", "superFunction": null, @@ -10936,21 +10936,21 @@ }, { "body": { - "id": 6164, + "id": 6155, "nodeType": "Block", "src": "3125:176:26", "statements": [ { "assignments": [ - 6149 + 6140 ], "declarations": [ { "constant": false, - "id": 6149, + "id": 6140, "name": "a", "nodeType": "VariableDeclaration", - "scope": 6164, + "scope": 6155, "src": "3135:6:26", "stateVariable": false, "storageLocation": "default", @@ -10959,7 +10959,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6148, + "id": 6139, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3135:4:26", @@ -10972,17 +10972,17 @@ "visibility": "internal" } ], - "id": 6156, + "id": 6147, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6154, + "id": 6145, "name": "redeemTokens", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6145, + "referencedDeclaration": 6136, "src": "3177:12:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11002,11 +11002,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6151, + "id": 6142, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6143, + "referencedDeclaration": 6134, "src": "3152:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11021,18 +11021,18 @@ "typeString": "address" } ], - "id": 6150, + "id": 6141, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "3144:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6152, + "id": 6143, "isConstant": false, "isLValue": false, "isPure": false, @@ -11042,25 +11042,25 @@ "nodeType": "FunctionCall", "src": "3144:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6153, + "id": 6144, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "redeemUnderlying", "nodeType": "MemberAccess", - "referencedDeclaration": 755, + "referencedDeclaration": 768, "src": "3144:32:26", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 6155, + "id": 6146, "isConstant": false, "isLValue": false, "isPure": false, @@ -11087,18 +11087,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6160, + "id": 6151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6158, + "id": 6149, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6149, + "referencedDeclaration": 6140, "src": "3221:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11110,7 +11110,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6159, + "id": 6150, "isConstant": false, "isLValue": false, "isPure": true, @@ -11134,7 +11134,7 @@ { "argumentTypes": null, "hexValue": "636d706e642d6d67722d63746f6b656e2d72656465656d2d756e6465726c79696e672d6661696c6564", - "id": 6161, + "id": 6152, "isConstant": false, "isLValue": false, "isPure": true, @@ -11161,21 +11161,21 @@ "typeString": "literal_string \"cmpnd-mgr-ctoken-redeem-underlying-failed\"" } ], - "id": 6157, + "id": 6148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3200:7:26", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6162, + "id": 6153, "isConstant": false, "isLValue": false, "isPure": false, @@ -11189,29 +11189,29 @@ "typeString": "tuple()" } }, - "id": 6163, + "id": 6154, "nodeType": "ExpressionStatement", "src": "3200:94:26" } ] }, "documentation": null, - "id": 6165, + "id": 6156, "implemented": true, "kind": "function", "modifiers": [], "name": "_redeemUnderlying", "nodeType": "FunctionDefinition", "parameters": { - "id": 6146, + "id": 6137, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6143, + "id": 6134, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 6165, + "scope": 6156, "src": "3078:14:26", "stateVariable": false, "storageLocation": "default", @@ -11220,7 +11220,7 @@ "typeString": "address" }, "typeName": { - "id": 6142, + "id": 6133, "name": "address", "nodeType": "ElementaryTypeName", "src": "3078:7:26", @@ -11235,10 +11235,10 @@ }, { "constant": false, - "id": 6145, + "id": 6136, "name": "redeemTokens", "nodeType": "VariableDeclaration", - "scope": 6165, + "scope": 6156, "src": "3094:20:26", "stateVariable": false, "storageLocation": "default", @@ -11247,7 +11247,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6144, + "id": 6135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3094:7:26", @@ -11263,12 +11263,12 @@ "src": "3077:38:26" }, "returnParameters": { - "id": 6147, + "id": 6138, "nodeType": "ParameterList", "parameters": [], "src": "3125:0:26" }, - "scope": 6428, + "scope": 6419, "src": "3051:250:26", "stateMutability": "nonpayable", "superFunction": null, @@ -11276,7 +11276,7 @@ }, { "body": { - "id": 6205, + "id": 6196, "nodeType": "Block", "src": "3403:434:26", "statements": [ @@ -11287,18 +11287,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 6176, + "id": 6167, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6174, + "id": 6165, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6169, + "referencedDeclaration": 6160, "src": "3475:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11309,11 +11309,11 @@ "operator": "!=", "rightExpression": { "argumentTypes": null, - "id": 6175, + "id": 6166, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6167, + "referencedDeclaration": 6158, "src": "3485:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11327,25 +11327,25 @@ } }, "falseBody": null, - "id": 6198, + "id": 6189, "nodeType": "IfStatement", "src": "3471:306:26", "trueBody": { - "id": 6197, + "id": 6188, "nodeType": "Block", "src": "3500:277:26", "statements": [ { "assignments": [ - 6178 + 6169 ], "declarations": [ { "constant": false, - "id": 6178, + "id": 6169, "name": "underlying", "nodeType": "VariableDeclaration", - "scope": 6197, + "scope": 6188, "src": "3514:18:26", "stateVariable": false, "storageLocation": "default", @@ -11354,7 +11354,7 @@ "typeString": "address" }, "typeName": { - "id": 6177, + "id": 6168, "name": "address", "nodeType": "ElementaryTypeName", "src": "3514:7:26", @@ -11368,7 +11368,7 @@ "visibility": "internal" } ], - "id": 6184, + "id": 6175, "initialValue": { "argumentTypes": null, "arguments": [], @@ -11379,11 +11379,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6180, + "id": 6171, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6169, + "referencedDeclaration": 6160, "src": "3543:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11398,18 +11398,18 @@ "typeString": "address" } ], - "id": 6179, + "id": 6170, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "3535:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6181, + "id": 6172, "isConstant": false, "isLValue": false, "isPure": false, @@ -11419,25 +11419,25 @@ "nodeType": "FunctionCall", "src": "3535:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6182, + "id": 6173, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, + "referencedDeclaration": 835, "src": "3535:26:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6183, + "id": 6174, "isConstant": false, "isLValue": false, "isPure": false, @@ -11456,15 +11456,15 @@ }, { "assignments": [ - 6186 + 6177 ], "declarations": [ { "constant": false, - "id": 6186, + "id": 6177, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 6197, + "scope": 6188, "src": "3621:17:26", "stateVariable": false, "storageLocation": "default", @@ -11473,7 +11473,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6185, + "id": 6176, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3621:7:26", @@ -11486,17 +11486,17 @@ "visibility": "internal" } ], - "id": 6191, + "id": 6182, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6188, + "id": 6179, "name": "underlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6178, + "referencedDeclaration": 6169, "src": "3662:10:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11505,11 +11505,11 @@ }, { "argumentTypes": null, - "id": 6189, + "id": 6180, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6171, + "referencedDeclaration": 6162, "src": "3674:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11528,18 +11528,18 @@ "typeString": "uint256" } ], - "id": 6187, + "id": 6178, "name": "_getEthToTokenOutput", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5169, + "referencedDeclaration": 5221, "src": "3641:20:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 6190, + "id": 6181, "isConstant": false, "isLValue": false, "isPure": false, @@ -11562,11 +11562,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6193, + "id": 6184, "name": "underlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6178, + "referencedDeclaration": 6169, "src": "3744:10:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11575,11 +11575,11 @@ }, { "argumentTypes": null, - "id": 6194, + "id": 6185, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6186, + "referencedDeclaration": 6177, "src": "3756:9:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11598,21 +11598,21 @@ "typeString": "uint256" } ], - "id": 6192, + "id": 6183, "name": "_ethToToken", "nodeType": "Identifier", "overloadedDeclarations": [ - 4959, - 4988 + 5011, + 5040 ], - "referencedDeclaration": 4959, + "referencedDeclaration": 5011, "src": "3732:11:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 6195, + "id": 6186, "isConstant": false, "isLValue": false, "isPure": false, @@ -11626,7 +11626,7 @@ "typeString": "uint256" } }, - "id": 6196, + "id": 6187, "nodeType": "ExpressionStatement", "src": "3732:34:26" } @@ -11639,11 +11639,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6200, + "id": 6191, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6167, + "referencedDeclaration": 6158, "src": "3800:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11652,11 +11652,11 @@ }, { "argumentTypes": null, - "id": 6201, + "id": 6192, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6169, + "referencedDeclaration": 6160, "src": "3815:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11665,11 +11665,11 @@ }, { "argumentTypes": null, - "id": 6202, + "id": 6193, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6171, + "referencedDeclaration": 6162, "src": "3823:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11692,18 +11692,18 @@ "typeString": "uint256" } ], - "id": 6199, + "id": 6190, "name": "_repayBorrow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6141, + "referencedDeclaration": 6132, "src": "3787:12:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 6203, + "id": 6194, "isConstant": false, "isLValue": false, "isPure": false, @@ -11717,29 +11717,29 @@ "typeString": "tuple()" } }, - "id": 6204, + "id": 6195, "nodeType": "ExpressionStatement", "src": "3787:43:26" } ] }, "documentation": null, - "id": 6206, + "id": 6197, "implemented": true, "kind": "function", "modifiers": [], "name": "_repayDebt", "nodeType": "FunctionDefinition", "parameters": { - "id": 6172, + "id": 6163, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6167, + "id": 6158, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 6206, + "scope": 6197, "src": "3327:21:26", "stateVariable": false, "storageLocation": "default", @@ -11748,7 +11748,7 @@ "typeString": "address" }, "typeName": { - "id": 6166, + "id": 6157, "name": "address", "nodeType": "ElementaryTypeName", "src": "3327:7:26", @@ -11763,10 +11763,10 @@ }, { "constant": false, - "id": 6169, + "id": 6160, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 6206, + "scope": 6197, "src": "3350:14:26", "stateVariable": false, "storageLocation": "default", @@ -11775,7 +11775,7 @@ "typeString": "address" }, "typeName": { - "id": 6168, + "id": 6159, "name": "address", "nodeType": "ElementaryTypeName", "src": "3350:7:26", @@ -11790,10 +11790,10 @@ }, { "constant": false, - "id": 6171, + "id": 6162, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6206, + "scope": 6197, "src": "3366:14:26", "stateVariable": false, "storageLocation": "default", @@ -11802,7 +11802,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6170, + "id": 6161, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3366:7:26", @@ -11818,12 +11818,12 @@ "src": "3326:55:26" }, "returnParameters": { - "id": 6173, + "id": 6164, "nodeType": "ParameterList", "parameters": [], "src": "3403:0:26" }, - "scope": 6428, + "scope": 6419, "src": "3307:530:26", "stateMutability": "nonpayable", "superFunction": null, @@ -11831,7 +11831,7 @@ }, { "body": { - "id": 6242, + "id": 6233, "nodeType": "Block", "src": "3984:260:26", "statements": [ @@ -11841,11 +11841,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6218, + "id": 6209, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6210, + "referencedDeclaration": 6201, "src": "4037:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11854,11 +11854,11 @@ }, { "argumentTypes": null, - "id": 6219, + "id": 6210, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6212, + "referencedDeclaration": 6203, "src": "4045:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11877,18 +11877,18 @@ "typeString": "uint256" } ], - "id": 6217, + "id": 6208, "name": "_redeemUnderlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6165, + "referencedDeclaration": 6156, "src": "4019:17:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 6220, + "id": 6211, "isConstant": false, "isLValue": false, "isPure": false, @@ -11902,7 +11902,7 @@ "typeString": "tuple()" } }, - "id": 6221, + "id": 6212, "nodeType": "ExpressionStatement", "src": "4019:33:26" }, @@ -11913,18 +11913,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 6224, + "id": 6215, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6222, + "id": 6213, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6210, + "referencedDeclaration": 6201, "src": "4067:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11935,11 +11935,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 6223, + "id": 6214, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6208, + "referencedDeclaration": 6199, "src": "4077:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11953,30 +11953,30 @@ } }, "falseBody": null, - "id": 6228, + "id": 6219, "nodeType": "IfStatement", "src": "4063:67:26", "trueBody": { - "id": 6227, + "id": 6218, "nodeType": "Block", "src": "4092:38:26", "statements": [ { "expression": { "argumentTypes": null, - "id": 6225, + "id": 6216, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6212, + "referencedDeclaration": 6203, "src": "4113:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 6216, - "id": 6226, + "functionReturnParameters": 6207, + "id": 6217, "nodeType": "Return", "src": "4106:13:26" } @@ -11985,15 +11985,15 @@ }, { "assignments": [ - 6230 + 6221 ], "declarations": [ { "constant": false, - "id": 6230, + "id": 6221, "name": "underlying", "nodeType": "VariableDeclaration", - "scope": 6242, + "scope": 6233, "src": "4140:18:26", "stateVariable": false, "storageLocation": "default", @@ -12002,7 +12002,7 @@ "typeString": "address" }, "typeName": { - "id": 6229, + "id": 6220, "name": "address", "nodeType": "ElementaryTypeName", "src": "4140:7:26", @@ -12016,7 +12016,7 @@ "visibility": "internal" } ], - "id": 6236, + "id": 6227, "initialValue": { "argumentTypes": null, "arguments": [], @@ -12027,11 +12027,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6232, + "id": 6223, "name": "cToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6210, + "referencedDeclaration": 6201, "src": "4169:6:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12046,18 +12046,18 @@ "typeString": "address" } ], - "id": 6231, + "id": 6222, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "4161:7:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6233, + "id": 6224, "isConstant": false, "isLValue": false, "isPure": false, @@ -12067,25 +12067,25 @@ "nodeType": "FunctionCall", "src": "4161:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6234, + "id": 6225, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, + "referencedDeclaration": 835, "src": "4161:26:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6235, + "id": 6226, "isConstant": false, "isLValue": false, "isPure": false, @@ -12108,11 +12108,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6238, + "id": 6229, "name": "underlying", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6230, + "referencedDeclaration": 6221, "src": "4218:10:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12121,11 +12121,11 @@ }, { "argumentTypes": null, - "id": 6239, + "id": 6230, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6212, + "referencedDeclaration": 6203, "src": "4230:6:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12144,21 +12144,21 @@ "typeString": "uint256" } ], - "id": 6237, + "id": 6228, "name": "_tokenToEth", "nodeType": "Identifier", "overloadedDeclarations": [ - 5006, - 5045 + 5058, + 5097 ], - "referencedDeclaration": 5006, + "referencedDeclaration": 5058, "src": "4206:11:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 6240, + "id": 6231, "isConstant": false, "isLValue": false, "isPure": false, @@ -12172,30 +12172,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 6216, - "id": 6241, + "functionReturnParameters": 6207, + "id": 6232, "nodeType": "Return", "src": "4199:38:26" } ] }, "documentation": null, - "id": 6243, + "id": 6234, "implemented": true, "kind": "function", "modifiers": [], "name": "_retrieveCollateral", "nodeType": "FunctionDefinition", "parameters": { - "id": 6213, + "id": 6204, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6208, + "id": 6199, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 6243, + "scope": 6234, "src": "3881:21:26", "stateVariable": false, "storageLocation": "default", @@ -12204,7 +12204,7 @@ "typeString": "address" }, "typeName": { - "id": 6207, + "id": 6198, "name": "address", "nodeType": "ElementaryTypeName", "src": "3881:7:26", @@ -12219,10 +12219,10 @@ }, { "constant": false, - "id": 6210, + "id": 6201, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 6243, + "scope": 6234, "src": "3912:14:26", "stateVariable": false, "storageLocation": "default", @@ -12231,7 +12231,7 @@ "typeString": "address" }, "typeName": { - "id": 6209, + "id": 6200, "name": "address", "nodeType": "ElementaryTypeName", "src": "3912:7:26", @@ -12246,10 +12246,10 @@ }, { "constant": false, - "id": 6212, + "id": 6203, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6243, + "scope": 6234, "src": "3936:14:26", "stateVariable": false, "storageLocation": "default", @@ -12258,7 +12258,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6211, + "id": 6202, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3936:7:26", @@ -12274,15 +12274,15 @@ "src": "3871:85:26" }, "returnParameters": { - "id": 6216, + "id": 6207, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6215, + "id": 6206, "name": "", "nodeType": "VariableDeclaration", - "scope": 6243, + "scope": 6234, "src": "3975:7:26", "stateVariable": false, "storageLocation": "default", @@ -12291,7 +12291,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6214, + "id": 6205, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3975:7:26", @@ -12306,7 +12306,7 @@ ], "src": "3974:9:26" }, - "scope": 6428, + "scope": 6419, "src": "3843:401:26", "stateMutability": "nonpayable", "superFunction": null, @@ -12314,37 +12314,37 @@ }, { "body": { - "id": 6358, + "id": 6349, "nodeType": "Block", "src": "4405:1152:26", "statements": [ { "assignments": [ - 6255 + 6246 ], "declarations": [ { "constant": false, - "id": 6255, + "id": 6246, "name": "epCalldata", "nodeType": "VariableDeclaration", - "scope": 6358, + "scope": 6349, "src": "4451:38:26", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata" }, "typeName": { "contractScope": null, - "id": 6254, + "id": 6245, "name": "ExitPositionCalldata", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 5945, + "referencedDeclaration": 5936, "src": "4451:20:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_storage_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_storage_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata" } }, @@ -12352,17 +12352,17 @@ "visibility": "internal" } ], - "id": 6262, + "id": 6253, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6258, + "id": 6249, "name": "_params", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6251, + "referencedDeclaration": 6242, "src": "4516:7:26", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -12374,19 +12374,19 @@ "components": [ { "argumentTypes": null, - "id": 6259, + "id": 6250, "name": "ExitPositionCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5945, + "referencedDeclaration": 5936, "src": "4538:20:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_ExitPositionCalldata_$5945_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ExitPositionCalldata_$5936_storage_ptr_$", "typeString": "type(struct DedgeExitManager.ExitPositionCalldata storage pointer)" } } ], - "id": 6260, + "id": 6251, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -12395,7 +12395,7 @@ "nodeType": "TupleExpression", "src": "4537:22:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_ExitPositionCalldata_$5945_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ExitPositionCalldata_$5936_storage_ptr_$", "typeString": "type(struct DedgeExitManager.ExitPositionCalldata storage pointer)" } } @@ -12407,24 +12407,24 @@ "typeString": "bytes calldata" }, { - "typeIdentifier": "t_type$_t_struct$_ExitPositionCalldata_$5945_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ExitPositionCalldata_$5936_storage_ptr_$", "typeString": "type(struct DedgeExitManager.ExitPositionCalldata storage pointer)" } ], "expression": { "argumentTypes": null, - "id": 6256, + "id": 6247, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "4492:3:26", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 6257, + "id": 6248, "isConstant": false, "isLValue": false, "isPure": true, @@ -12438,7 +12438,7 @@ "typeString": "function () pure" } }, - "id": 6261, + "id": 6252, "isConstant": false, "isLValue": false, "isPure": false, @@ -12448,7 +12448,7 @@ "nodeType": "FunctionCall", "src": "4492:77:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, @@ -12457,31 +12457,31 @@ }, { "assignments": [ - 6264 + 6255 ], "declarations": [ { "constant": false, - "id": 6264, + "id": 6255, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 6358, + "scope": 6349, "src": "4580:31:26", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 6263, + "id": 6254, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "4580:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -12489,7 +12489,7 @@ "visibility": "internal" } ], - "id": 6269, + "id": 6260, "initialValue": { "argumentTypes": null, "arguments": [ @@ -12497,25 +12497,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6266, + "id": 6257, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "4643:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6267, + "id": 6258, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "addressRegistryAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 5938, + "referencedDeclaration": 5929, "src": "4643:33:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12530,18 +12530,18 @@ "typeString": "address" } ], - "id": 6265, + "id": 6256, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "4614:15:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 6268, + "id": 6259, "isConstant": false, "isLValue": false, "isPure": false, @@ -12551,7 +12551,7 @@ "nodeType": "FunctionCall", "src": "4614:72:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -12560,15 +12560,15 @@ }, { "assignments": [ - 6271 + 6262 ], "declarations": [ { "constant": false, - "id": 6271, + "id": 6262, "name": "CEtherAddress", "nodeType": "VariableDeclaration", - "scope": 6358, + "scope": 6349, "src": "4696:21:26", "stateVariable": false, "storageLocation": "default", @@ -12577,7 +12577,7 @@ "typeString": "address" }, "typeName": { - "id": 6270, + "id": 6261, "name": "address", "nodeType": "ElementaryTypeName", "src": "4696:7:26", @@ -12591,7 +12591,7 @@ "visibility": "internal" } ], - "id": 6275, + "id": 6266, "initialValue": { "argumentTypes": null, "arguments": [], @@ -12599,32 +12599,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6272, + "id": 6263, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6264, + "referencedDeclaration": 6255, "src": "4720:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6273, + "id": 6264, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, + "referencedDeclaration": 7501, "src": "4720:29:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6274, + "id": 6265, "isConstant": false, "isLValue": false, "isPure": false, @@ -12643,7 +12643,7 @@ }, { "body": { - "id": 6302, + "id": 6293, "nodeType": "Block", "src": "4867:178:26", "statements": [ @@ -12653,11 +12653,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6289, + "id": 6280, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6271, + "referencedDeclaration": 6262, "src": "4909:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12672,39 +12672,39 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6290, + "id": 6281, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "4940:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6291, + "id": 6282, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "debtMarket", "nodeType": "MemberAccess", - "referencedDeclaration": 5941, + "referencedDeclaration": 5932, "src": "4940:21:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5929_memory_$dyn_memory", + "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5920_memory_$dyn_memory", "typeString": "struct DedgeExitManager.DebtMarket memory[] memory" } }, - "id": 6293, + "id": 6284, "indexExpression": { "argumentTypes": null, - "id": 6292, + "id": 6283, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6277, + "referencedDeclaration": 6268, "src": "4962:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12718,18 +12718,18 @@ "nodeType": "IndexAccess", "src": "4940:24:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_DebtMarket_$5929_memory", + "typeIdentifier": "t_struct$_DebtMarket_$5920_memory", "typeString": "struct DedgeExitManager.DebtMarket memory" } }, - "id": 6294, + "id": 6285, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "cToken", "nodeType": "MemberAccess", - "referencedDeclaration": 5926, + "referencedDeclaration": 5917, "src": "4940:31:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12744,39 +12744,39 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6295, + "id": 6286, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "4989:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6296, + "id": 6287, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "debtMarket", "nodeType": "MemberAccess", - "referencedDeclaration": 5941, + "referencedDeclaration": 5932, "src": "4989:21:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5929_memory_$dyn_memory", + "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5920_memory_$dyn_memory", "typeString": "struct DedgeExitManager.DebtMarket memory[] memory" } }, - "id": 6298, + "id": 6289, "indexExpression": { "argumentTypes": null, - "id": 6297, + "id": 6288, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6277, + "referencedDeclaration": 6268, "src": "5011:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12790,18 +12790,18 @@ "nodeType": "IndexAccess", "src": "4989:24:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_DebtMarket_$5929_memory", + "typeIdentifier": "t_struct$_DebtMarket_$5920_memory", "typeString": "struct DedgeExitManager.DebtMarket memory" } }, - "id": 6299, + "id": 6290, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "amount", "nodeType": "MemberAccess", - "referencedDeclaration": 5928, + "referencedDeclaration": 5919, "src": "4989:31:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12824,18 +12824,18 @@ "typeString": "uint256" } ], - "id": 6288, + "id": 6279, "name": "_repayDebt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6206, + "referencedDeclaration": 6197, "src": "4881:10:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 6300, + "id": 6291, "isConstant": false, "isLValue": false, "isPure": false, @@ -12849,7 +12849,7 @@ "typeString": "tuple()" } }, - "id": 6301, + "id": 6292, "nodeType": "ExpressionStatement", "src": "4881:153:26" } @@ -12861,18 +12861,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6284, + "id": 6275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6280, + "id": 6271, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6277, + "referencedDeclaration": 6268, "src": "4828:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12887,32 +12887,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6281, + "id": 6272, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "4832:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6282, + "id": 6273, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "debtMarket", "nodeType": "MemberAccess", - "referencedDeclaration": 5941, + "referencedDeclaration": 5932, "src": "4832:21:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5929_memory_$dyn_memory", + "typeIdentifier": "t_array$_t_struct$_DebtMarket_$5920_memory_$dyn_memory", "typeString": "struct DedgeExitManager.DebtMarket memory[] memory" } }, - "id": 6283, + "id": 6274, "isConstant": false, "isLValue": false, "isPure": false, @@ -12932,18 +12932,18 @@ "typeString": "bool" } }, - "id": 6303, + "id": 6294, "initializationExpression": { "assignments": [ - 6277 + 6268 ], "declarations": [ { "constant": false, - "id": 6277, + "id": 6268, "name": "i", "nodeType": "VariableDeclaration", - "scope": 6303, + "scope": 6294, "src": "4813:9:26", "stateVariable": false, "storageLocation": "default", @@ -12952,7 +12952,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6276, + "id": 6267, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4813:7:26", @@ -12965,11 +12965,11 @@ "visibility": "internal" } ], - "id": 6279, + "id": 6270, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 6278, + "id": 6269, "isConstant": false, "isLValue": false, "isPure": true, @@ -12990,7 +12990,7 @@ "loopExpression": { "expression": { "argumentTypes": null, - "id": 6286, + "id": 6277, "isConstant": false, "isLValue": false, "isPure": false, @@ -13001,11 +13001,11 @@ "src": "4862:3:26", "subExpression": { "argumentTypes": null, - "id": 6285, + "id": 6276, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6277, + "referencedDeclaration": 6268, "src": "4862:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -13017,7 +13017,7 @@ "typeString": "uint256" } }, - "id": 6287, + "id": 6278, "nodeType": "ExpressionStatement", "src": "4862:3:26" }, @@ -13026,15 +13026,15 @@ }, { "assignments": [ - 6305 + 6296 ], "declarations": [ { "constant": false, - "id": 6305, + "id": 6296, "name": "totalEthAmount", "nodeType": "VariableDeclaration", - "scope": 6358, + "scope": 6349, "src": "5055:22:26", "stateVariable": false, "storageLocation": "default", @@ -13043,7 +13043,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6304, + "id": 6295, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5055:7:26", @@ -13056,32 +13056,32 @@ "visibility": "internal" } ], - "id": 6306, + "id": 6297, "initialValue": null, "nodeType": "VariableDeclarationStatement", "src": "5055:22:26" }, { "body": { - "id": 6335, + "id": 6326, "nodeType": "Block", "src": "5152:217:26", "statements": [ { "expression": { "argumentTypes": null, - "id": 6333, + "id": 6324, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 6319, + "id": 6310, "name": "totalEthAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6305, + "referencedDeclaration": 6296, "src": "5166:14:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -13095,11 +13095,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6321, + "id": 6312, "name": "CEtherAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6271, + "referencedDeclaration": 6262, "src": "5221:13:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -13114,39 +13114,39 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6322, + "id": 6313, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "5252:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6323, + "id": 6314, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralMarket", "nodeType": "MemberAccess", - "referencedDeclaration": 5944, + "referencedDeclaration": 5935, "src": "5252:27:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5934_memory_$dyn_memory", + "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5925_memory_$dyn_memory", "typeString": "struct DedgeExitManager.CollateralMarket memory[] memory" } }, - "id": 6325, + "id": 6316, "indexExpression": { "argumentTypes": null, - "id": 6324, + "id": 6315, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6308, + "referencedDeclaration": 6299, "src": "5280:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -13160,18 +13160,18 @@ "nodeType": "IndexAccess", "src": "5252:30:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_CollateralMarket_$5934_memory", + "typeIdentifier": "t_struct$_CollateralMarket_$5925_memory", "typeString": "struct DedgeExitManager.CollateralMarket memory" } }, - "id": 6326, + "id": 6317, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "cToken", "nodeType": "MemberAccess", - "referencedDeclaration": 5931, + "referencedDeclaration": 5922, "src": "5252:37:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -13186,39 +13186,39 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6327, + "id": 6318, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "5307:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6328, + "id": 6319, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralMarket", "nodeType": "MemberAccess", - "referencedDeclaration": 5944, + "referencedDeclaration": 5935, "src": "5307:27:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5934_memory_$dyn_memory", + "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5925_memory_$dyn_memory", "typeString": "struct DedgeExitManager.CollateralMarket memory[] memory" } }, - "id": 6330, + "id": 6321, "indexExpression": { "argumentTypes": null, - "id": 6329, + "id": 6320, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6308, + "referencedDeclaration": 6299, "src": "5335:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -13232,18 +13232,18 @@ "nodeType": "IndexAccess", "src": "5307:30:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_CollateralMarket_$5934_memory", + "typeIdentifier": "t_struct$_CollateralMarket_$5925_memory", "typeString": "struct DedgeExitManager.CollateralMarket memory" } }, - "id": 6331, + "id": 6322, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "amount", "nodeType": "MemberAccess", - "referencedDeclaration": 5933, + "referencedDeclaration": 5924, "src": "5307:37:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -13266,18 +13266,18 @@ "typeString": "uint256" } ], - "id": 6320, + "id": 6311, "name": "_retrieveCollateral", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6243, + "referencedDeclaration": 6234, "src": "5184:19:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,address,uint256) returns (uint256)" } }, - "id": 6332, + "id": 6323, "isConstant": false, "isLValue": false, "isPure": false, @@ -13297,7 +13297,7 @@ "typeString": "uint256" } }, - "id": 6334, + "id": 6325, "nodeType": "ExpressionStatement", "src": "5166:192:26" } @@ -13309,18 +13309,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6315, + "id": 6306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6311, + "id": 6302, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6308, + "referencedDeclaration": 6299, "src": "5107:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -13335,32 +13335,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6312, + "id": 6303, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "5111:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6313, + "id": 6304, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralMarket", "nodeType": "MemberAccess", - "referencedDeclaration": 5944, + "referencedDeclaration": 5935, "src": "5111:27:26", "typeDescriptions": { - "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5934_memory_$dyn_memory", + "typeIdentifier": "t_array$_t_struct$_CollateralMarket_$5925_memory_$dyn_memory", "typeString": "struct DedgeExitManager.CollateralMarket memory[] memory" } }, - "id": 6314, + "id": 6305, "isConstant": false, "isLValue": false, "isPure": false, @@ -13380,18 +13380,18 @@ "typeString": "bool" } }, - "id": 6336, + "id": 6327, "initializationExpression": { "assignments": [ - 6308 + 6299 ], "declarations": [ { "constant": false, - "id": 6308, + "id": 6299, "name": "i", "nodeType": "VariableDeclaration", - "scope": 6336, + "scope": 6327, "src": "5092:9:26", "stateVariable": false, "storageLocation": "default", @@ -13400,7 +13400,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6307, + "id": 6298, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5092:7:26", @@ -13413,11 +13413,11 @@ "visibility": "internal" } ], - "id": 6310, + "id": 6301, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 6309, + "id": 6300, "isConstant": false, "isLValue": false, "isPure": true, @@ -13438,7 +13438,7 @@ "loopExpression": { "expression": { "argumentTypes": null, - "id": 6317, + "id": 6308, "isConstant": false, "isLValue": false, "isPure": false, @@ -13449,11 +13449,11 @@ "src": "5147:3:26", "subExpression": { "argumentTypes": null, - "id": 6316, + "id": 6307, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6308, + "referencedDeclaration": 6299, "src": "5147:1:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -13465,7 +13465,7 @@ "typeString": "uint256" } }, - "id": 6318, + "id": 6309, "nodeType": "ExpressionStatement", "src": "5147:3:26" }, @@ -13479,7 +13479,7 @@ { "argumentTypes": null, "hexValue": "", - "id": 6355, + "id": 6346, "isConstant": false, "isLValue": false, "isPure": true, @@ -13508,11 +13508,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6352, + "id": 6343, "name": "_protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6249, + "referencedDeclaration": 6240, "src": "5523:12:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -13532,11 +13532,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6349, + "id": 6340, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6247, + "referencedDeclaration": 6238, "src": "5513:4:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -13556,11 +13556,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6346, + "id": 6337, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6245, + "referencedDeclaration": 6236, "src": "5500:7:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -13577,32 +13577,32 @@ ], "expression": { "argumentTypes": null, - "id": 6344, + "id": 6335, "name": "totalEthAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6305, + "referencedDeclaration": 6296, "src": "5481:14:26", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 6345, + "id": 6336, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 7593, + "referencedDeclaration": 7584, "src": "5481:18:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 6347, + "id": 6338, "isConstant": false, "isLValue": false, "isPure": false, @@ -13616,21 +13616,21 @@ "typeString": "uint256" } }, - "id": 6348, + "id": 6339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 7593, + "referencedDeclaration": 7584, "src": "5481:31:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 6350, + "id": 6341, "isConstant": false, "isLValue": false, "isPure": false, @@ -13644,21 +13644,21 @@ "typeString": "uint256" } }, - "id": 6351, + "id": 6342, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 7593, + "referencedDeclaration": 7584, "src": "5481:41:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 6353, + "id": 6344, "isConstant": false, "isLValue": false, "isPure": false, @@ -13686,32 +13686,32 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6337, + "id": 6328, "name": "epCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6255, + "referencedDeclaration": 6246, "src": "5430:10:26", "typeDescriptions": { - "typeIdentifier": "t_struct$_ExitPositionCalldata_$5945_memory_ptr", + "typeIdentifier": "t_struct$_ExitPositionCalldata_$5936_memory_ptr", "typeString": "struct DedgeExitManager.ExitPositionCalldata memory" } }, - "id": 6341, + "id": 6332, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "exitUserAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 5936, + "referencedDeclaration": 5927, "src": "5430:26:26", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "id": 6342, + "id": 6333, "isConstant": false, "isLValue": false, "isPure": false, @@ -13725,7 +13725,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 6343, + "id": 6334, "isConstant": false, "isLValue": false, "isPure": false, @@ -13739,7 +13739,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 6354, + "id": 6345, "isConstant": false, "isLValue": false, "isPure": false, @@ -13753,7 +13753,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 6356, + "id": 6347, "isConstant": false, "isLValue": false, "isPure": false, @@ -13767,29 +13767,29 @@ "typeString": "tuple(bool,bytes memory)" } }, - "id": 6357, + "id": 6348, "nodeType": "ExpressionStatement", "src": "5430:120:26" } ] }, "documentation": null, - "id": 6359, + "id": 6350, "implemented": true, "kind": "function", "modifiers": [], "name": "exitPositionsPostLoan", "nodeType": "FunctionDefinition", "parameters": { - "id": 6252, + "id": 6243, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6245, + "id": 6236, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 6359, + "scope": 6350, "src": "4290:15:26", "stateVariable": false, "storageLocation": "default", @@ -13798,7 +13798,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6244, + "id": 6235, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4290:7:26", @@ -13812,10 +13812,10 @@ }, { "constant": false, - "id": 6247, + "id": 6238, "name": "_fee", "nodeType": "VariableDeclaration", - "scope": 6359, + "scope": 6350, "src": "4315:12:26", "stateVariable": false, "storageLocation": "default", @@ -13824,7 +13824,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6246, + "id": 6237, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4315:7:26", @@ -13838,10 +13838,10 @@ }, { "constant": false, - "id": 6249, + "id": 6240, "name": "_protocolFee", "nodeType": "VariableDeclaration", - "scope": 6359, + "scope": 6350, "src": "4337:20:26", "stateVariable": false, "storageLocation": "default", @@ -13850,7 +13850,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6248, + "id": 6239, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4337:7:26", @@ -13864,10 +13864,10 @@ }, { "constant": false, - "id": 6251, + "id": 6242, "name": "_params", "nodeType": "VariableDeclaration", - "scope": 6359, + "scope": 6350, "src": "4367:22:26", "stateVariable": false, "storageLocation": "calldata", @@ -13876,7 +13876,7 @@ "typeString": "bytes" }, "typeName": { - "id": 6250, + "id": 6241, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "4367:5:26", @@ -13892,12 +13892,12 @@ "src": "4280:115:26" }, "returnParameters": { - "id": 6253, + "id": 6244, "nodeType": "ParameterList", "parameters": [], "src": "4405:0:26" }, - "scope": 6428, + "scope": 6419, "src": "4250:1307:26", "stateMutability": "nonpayable", "superFunction": null, @@ -13905,37 +13905,37 @@ }, { "body": { - "id": 6426, + "id": 6417, "nodeType": "Block", "src": "5814:1063:26", "statements": [ { "assignments": [ - 6373 + 6364 ], "declarations": [ { "constant": false, - "id": 6373, + "id": 6364, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 6426, + "scope": 6417, "src": "5824:31:26", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 6372, + "id": 6363, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "5824:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -13943,17 +13943,17 @@ "visibility": "internal" } ], - "id": 6377, + "id": 6368, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6375, + "id": 6366, "name": "addressRegistryAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6367, + "referencedDeclaration": 6358, "src": "5887:22:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -13968,18 +13968,18 @@ "typeString": "address" } ], - "id": 6374, + "id": 6365, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "5858:15:26", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 6376, + "id": 6367, "isConstant": false, "isLValue": false, "isPure": false, @@ -13989,7 +13989,7 @@ "nodeType": "FunctionCall", "src": "5858:61:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -13998,15 +13998,15 @@ }, { "assignments": [ - 6379 + 6370 ], "declarations": [ { "constant": false, - "id": 6379, + "id": 6370, "name": "addressAndExecuteOperationCalldataParams", "nodeType": "VariableDeclaration", - "scope": 6426, + "scope": 6417, "src": "5984:53:26", "stateVariable": false, "storageLocation": "memory", @@ -14015,7 +14015,7 @@ "typeString": "bytes" }, "typeName": { - "id": 6378, + "id": 6369, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "5984:5:26", @@ -14028,7 +14028,7 @@ "visibility": "internal" } ], - "id": 6388, + "id": 6379, "initialValue": { "argumentTypes": null, "arguments": [ @@ -14037,11 +14037,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6384, + "id": 6375, "name": "dedgeExitManagerAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6363, + "referencedDeclaration": 6354, "src": "6094:23:26", "typeDescriptions": { "typeIdentifier": "t_address", @@ -14058,18 +14058,18 @@ ], "expression": { "argumentTypes": null, - "id": 6382, + "id": 6373, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "6083:3:26", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 6383, + "id": 6374, "isConstant": false, "isLValue": false, "isPure": true, @@ -14083,7 +14083,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 6385, + "id": 6376, "isConstant": false, "isLValue": false, "isPure": false, @@ -14099,11 +14099,11 @@ }, { "argumentTypes": null, - "id": 6386, + "id": 6377, "name": "executeOperationCalldataParams", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6369, + "referencedDeclaration": 6360, "src": "6132:30:26", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -14124,18 +14124,18 @@ ], "expression": { "argumentTypes": null, - "id": 6380, + "id": 6371, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "6040:3:26", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 6381, + "id": 6372, "isConstant": false, "isLValue": false, "isPure": true, @@ -14149,7 +14149,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 6387, + "id": 6378, "isConstant": false, "isLValue": false, "isPure": false, @@ -14168,15 +14168,15 @@ }, { "assignments": [ - 6390 + 6381 ], "declarations": [ { "constant": false, - "id": 6390, + "id": 6381, "name": "lendingPool", "nodeType": "VariableDeclaration", - "scope": 6426, + "scope": 6417, "src": "6183:24:26", "stateVariable": false, "storageLocation": "default", @@ -14186,7 +14186,7 @@ }, "typeName": { "contractScope": null, - "id": 6389, + "id": 6380, "name": "ILendingPool", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 546, @@ -14200,7 +14200,7 @@ "visibility": "internal" } ], - "id": 6400, + "id": 6391, "initialValue": { "argumentTypes": null, "arguments": [ @@ -14219,32 +14219,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6393, + "id": 6384, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6373, + "referencedDeclaration": 6364, "src": "6283:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6394, + "id": 6385, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "AaveLendingPoolAddressProviderAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7495, + "referencedDeclaration": 7486, "src": "6283:53:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6395, + "id": 6386, "isConstant": false, "isLValue": false, "isPure": false, @@ -14266,7 +14266,7 @@ "typeString": "address" } ], - "id": 6392, + "id": 6383, "name": "ILendingPoolAddressesProvider", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -14277,7 +14277,7 @@ "typeString": "type(contract ILendingPoolAddressesProvider)" } }, - "id": 6396, + "id": 6387, "isConstant": false, "isLValue": false, "isPure": false, @@ -14291,7 +14291,7 @@ "typeString": "contract ILendingPoolAddressesProvider" } }, - "id": 6397, + "id": 6388, "isConstant": false, "isLValue": false, "isPure": false, @@ -14305,7 +14305,7 @@ "typeString": "function () view external returns (address)" } }, - "id": 6398, + "id": 6389, "isConstant": false, "isLValue": false, "isPure": false, @@ -14327,7 +14327,7 @@ "typeString": "address" } ], - "id": 6391, + "id": 6382, "name": "ILendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -14338,7 +14338,7 @@ "typeString": "type(contract ILendingPool)" } }, - "id": 6399, + "id": 6390, "isConstant": false, "isLValue": false, "isPure": false, @@ -14361,11 +14361,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6402, + "id": 6393, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6365, + "referencedDeclaration": 6356, "src": "6470:15:26", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -14377,11 +14377,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6404, + "id": 6395, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6390, + "referencedDeclaration": 6381, "src": "6495:11:26", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", @@ -14396,7 +14396,7 @@ "typeString": "contract ILendingPool" } ], - "id": 6403, + "id": 6394, "isConstant": false, "isLValue": false, "isPure": true, @@ -14409,7 +14409,7 @@ }, "typeName": "address" }, - "id": 6405, + "id": 6396, "isConstant": false, "isLValue": false, "isPure": false, @@ -14435,18 +14435,18 @@ "typeString": "address" } ], - "id": 6401, + "id": 6392, "name": "_proxyGuardPermit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5986, + "referencedDeclaration": 5977, "src": "6452:17:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", "typeString": "function (address payable,address)" } }, - "id": 6406, + "id": 6397, "isConstant": false, "isLValue": false, "isPure": false, @@ -14460,7 +14460,7 @@ "typeString": "tuple()" } }, - "id": 6407, + "id": 6398, "nodeType": "ExpressionStatement", "src": "6452:56:26" }, @@ -14470,11 +14470,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6411, + "id": 6402, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6365, + "referencedDeclaration": 6356, "src": "6601:15:26", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -14488,32 +14488,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6412, + "id": 6403, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6373, + "referencedDeclaration": 6364, "src": "6630:15:26", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6413, + "id": 6404, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "AaveEthAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7498, + "referencedDeclaration": 7489, "src": "6630:30:26", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6414, + "id": 6405, "isConstant": false, "isLValue": false, "isPure": false, @@ -14529,11 +14529,11 @@ }, { "argumentTypes": null, - "id": 6415, + "id": 6406, "name": "totalEthDebtAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6361, + "referencedDeclaration": 6352, "src": "6676:18:26", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -14542,11 +14542,11 @@ }, { "argumentTypes": null, - "id": 6416, + "id": 6407, "name": "addressAndExecuteOperationCalldataParams", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6379, + "referencedDeclaration": 6370, "src": "6708:40:26", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -14575,18 +14575,18 @@ ], "expression": { "argumentTypes": null, - "id": 6408, + "id": 6399, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6390, + "referencedDeclaration": 6381, "src": "6566:11:26", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", "typeString": "contract ILendingPool" } }, - "id": 6410, + "id": 6401, "isConstant": false, "isLValue": false, "isPure": false, @@ -14600,7 +14600,7 @@ "typeString": "function (address,address,uint256,bytes memory) external" } }, - "id": 6417, + "id": 6408, "isConstant": false, "isLValue": false, "isPure": false, @@ -14614,7 +14614,7 @@ "typeString": "tuple()" } }, - "id": 6418, + "id": 6409, "nodeType": "ExpressionStatement", "src": "6566:192:26" }, @@ -14624,11 +14624,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6420, + "id": 6411, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6365, + "referencedDeclaration": 6356, "src": "6832:15:26", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -14640,11 +14640,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6422, + "id": 6413, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6390, + "referencedDeclaration": 6381, "src": "6857:11:26", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", @@ -14659,7 +14659,7 @@ "typeString": "contract ILendingPool" } ], - "id": 6421, + "id": 6412, "isConstant": false, "isLValue": false, "isPure": true, @@ -14672,7 +14672,7 @@ }, "typeName": "address" }, - "id": 6423, + "id": 6414, "isConstant": false, "isLValue": false, "isPure": false, @@ -14698,18 +14698,18 @@ "typeString": "address" } ], - "id": 6419, + "id": 6410, "name": "_proxyGuardForbid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6027, + "referencedDeclaration": 6018, "src": "6814:17:26", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", "typeString": "function (address payable,address)" } }, - "id": 6424, + "id": 6415, "isConstant": false, "isLValue": false, "isPure": false, @@ -14723,29 +14723,29 @@ "typeString": "tuple()" } }, - "id": 6425, + "id": 6416, "nodeType": "ExpressionStatement", "src": "6814:56:26" } ] }, "documentation": null, - "id": 6427, + "id": 6418, "implemented": true, "kind": "function", "modifiers": [], "name": "exitPositions", "nodeType": "FunctionDefinition", "parameters": { - "id": 6370, + "id": 6361, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6361, + "id": 6352, "name": "totalEthDebtAmount", "nodeType": "VariableDeclaration", - "scope": 6427, + "scope": 6418, "src": "5595:26:26", "stateVariable": false, "storageLocation": "default", @@ -14754,7 +14754,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6360, + "id": 6351, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5595:7:26", @@ -14768,10 +14768,10 @@ }, { "constant": false, - "id": 6363, + "id": 6354, "name": "dedgeExitManagerAddress", "nodeType": "VariableDeclaration", - "scope": 6427, + "scope": 6418, "src": "5631:31:26", "stateVariable": false, "storageLocation": "default", @@ -14780,7 +14780,7 @@ "typeString": "address" }, "typeName": { - "id": 6362, + "id": 6353, "name": "address", "nodeType": "ElementaryTypeName", "src": "5631:7:26", @@ -14795,10 +14795,10 @@ }, { "constant": false, - "id": 6365, + "id": 6356, "name": "dacProxyAddress", "nodeType": "VariableDeclaration", - "scope": 6427, + "scope": 6418, "src": "5672:31:26", "stateVariable": false, "storageLocation": "default", @@ -14807,7 +14807,7 @@ "typeString": "address payable" }, "typeName": { - "id": 6364, + "id": 6355, "name": "address", "nodeType": "ElementaryTypeName", "src": "5672:15:26", @@ -14822,10 +14822,10 @@ }, { "constant": false, - "id": 6367, + "id": 6358, "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 6427, + "scope": 6418, "src": "5713:30:26", "stateVariable": false, "storageLocation": "default", @@ -14834,7 +14834,7 @@ "typeString": "address" }, "typeName": { - "id": 6366, + "id": 6357, "name": "address", "nodeType": "ElementaryTypeName", "src": "5713:7:26", @@ -14849,10 +14849,10 @@ }, { "constant": false, - "id": 6369, + "id": 6360, "name": "executeOperationCalldataParams", "nodeType": "VariableDeclaration", - "scope": 6427, + "scope": 6418, "src": "5753:45:26", "stateVariable": false, "storageLocation": "calldata", @@ -14861,7 +14861,7 @@ "typeString": "bytes" }, "typeName": { - "id": 6368, + "id": 6359, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "5753:5:26", @@ -14877,19 +14877,19 @@ "src": "5585:219:26" }, "returnParameters": { - "id": 6371, + "id": 6362, "nodeType": "ParameterList", "parameters": [], "src": "5814:0:26" }, - "scope": 6428, + "scope": 6419, "src": "5563:1314:26", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 6429, + "scope": 6420, "src": "690:6189:26" } ], @@ -14908,7 +14908,7 @@ } }, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:28:59.299Z", + "updatedAt": "2020-04-08T12:22:38.587Z", "networkType": "ethereum", "devdoc": { "methods": {} diff --git a/packages/smart-contracts/artifacts/DedgeGeneralManager.json b/packages/smart-contracts/artifacts/DedgeGeneralManager.json index 4374336..e60ed9f 100644 --- a/packages/smart-contracts/artifacts/DedgeGeneralManager.json +++ b/packages/smart-contracts/artifacts/DedgeGeneralManager.json @@ -69,14 +69,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeGeneralManager.sol", "exportedSymbols": { "DedgeGeneralManager": [ - 6484 + 6475 ] }, - "id": 6485, + "id": 6476, "nodeType": "SourceUnit", "nodes": [ { - "id": 6430, + "id": 6421, "literals": [ "solidity", "0.5", @@ -88,9 +88,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../interfaces/IERC20.sol", - "id": 6431, + "id": 6422, "nodeType": "ImportDirective", - "scope": 6485, + "scope": 6476, "sourceUnit": 121, "src": "122:34:27", "symbolAliases": [], @@ -102,40 +102,40 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 6484, + "id": 6475, "linearizedBaseContracts": [ - 6484 + 6475 ], "name": "DedgeGeneralManager", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 6434, + "id": 6425, "nodeType": "Block", "src": "222:2:27", "statements": [] }, "documentation": null, - "id": 6435, + "id": 6426, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 6432, + "id": 6423, "nodeType": "ParameterList", "parameters": [], "src": "202:2:27" }, "returnParameters": { - "id": 6433, + "id": 6424, "nodeType": "ParameterList", "parameters": [], "src": "222:0:27" }, - "scope": 6484, + "scope": 6475, "src": "193:31:27", "stateMutability": "payable", "superFunction": null, @@ -143,31 +143,31 @@ }, { "body": { - "id": 6438, + "id": 6429, "nodeType": "Block", "src": "251:2:27", "statements": [] }, "documentation": null, - "id": 6439, + "id": 6430, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 6436, + "id": 6427, "nodeType": "ParameterList", "parameters": [], "src": "241:2:27" }, "returnParameters": { - "id": 6437, + "id": 6428, "nodeType": "ParameterList", "parameters": [], "src": "251:0:27" }, - "scope": 6484, + "scope": 6475, "src": "230:23:27", "stateMutability": "nonpayable", "superFunction": null, @@ -175,22 +175,22 @@ }, { "body": { - "id": 6461, + "id": 6452, "nodeType": "Block", "src": "319:125:27", "statements": [ { "assignments": [ - 6447, + 6438, null ], "declarations": [ { "constant": false, - "id": 6447, + "id": 6438, "name": "success", "nodeType": "VariableDeclaration", - "scope": 6461, + "scope": 6452, "src": "330:12:27", "stateVariable": false, "storageLocation": "default", @@ -199,7 +199,7 @@ "typeString": "bool" }, "typeName": { - "id": 6446, + "id": 6437, "name": "bool", "nodeType": "ElementaryTypeName", "src": "330:4:27", @@ -213,14 +213,14 @@ }, null ], - "id": 6455, + "id": 6446, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "", - "id": 6453, + "id": 6444, "isConstant": false, "isLValue": false, "isPure": true, @@ -246,11 +246,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6451, + "id": 6442, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6443, + "referencedDeclaration": 6434, "src": "369:6:27", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -269,18 +269,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6448, + "id": 6439, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6441, + "referencedDeclaration": 6432, "src": "348:9:27", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 6449, + "id": 6440, "isConstant": false, "isLValue": false, "isPure": false, @@ -294,7 +294,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 6450, + "id": 6441, "isConstant": false, "isLValue": false, "isPure": false, @@ -308,7 +308,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 6452, + "id": 6443, "isConstant": false, "isLValue": false, "isPure": false, @@ -322,7 +322,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 6454, + "id": 6445, "isConstant": false, "isLValue": false, "isPure": false, @@ -345,11 +345,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6457, + "id": 6448, "name": "success", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6447, + "referencedDeclaration": 6438, "src": "398:7:27", "typeDescriptions": { "typeIdentifier": "t_bool", @@ -359,7 +359,7 @@ { "argumentTypes": null, "hexValue": "67656e2d6d67722d7472616e736665722d6574682d6661696c6564", - "id": 6458, + "id": 6449, "isConstant": false, "isLValue": false, "isPure": true, @@ -386,21 +386,21 @@ "typeString": "literal_string \"gen-mgr-transfer-eth-failed\"" } ], - "id": 6456, + "id": 6447, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "390:7:27", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6459, + "id": 6450, "isConstant": false, "isLValue": false, "isPure": false, @@ -414,29 +414,29 @@ "typeString": "tuple()" } }, - "id": 6460, + "id": 6451, "nodeType": "ExpressionStatement", "src": "390:47:27" } ] }, "documentation": null, - "id": 6462, + "id": 6453, "implemented": true, "kind": "function", "modifiers": [], "name": "transferETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 6444, + "id": 6435, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6441, + "id": 6432, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 6462, + "scope": 6453, "src": "280:17:27", "stateVariable": false, "storageLocation": "default", @@ -445,7 +445,7 @@ "typeString": "address" }, "typeName": { - "id": 6440, + "id": 6431, "name": "address", "nodeType": "ElementaryTypeName", "src": "280:7:27", @@ -460,10 +460,10 @@ }, { "constant": false, - "id": 6443, + "id": 6434, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6462, + "scope": 6453, "src": "299:11:27", "stateVariable": false, "storageLocation": "default", @@ -472,7 +472,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6442, + "id": 6433, "name": "uint", "nodeType": "ElementaryTypeName", "src": "299:4:27", @@ -488,12 +488,12 @@ "src": "279:32:27" }, "returnParameters": { - "id": 6445, + "id": 6436, "nodeType": "ParameterList", "parameters": [], "src": "319:0:27" }, - "scope": 6484, + "scope": 6475, "src": "259:185:27", "stateMutability": "nonpayable", "superFunction": null, @@ -501,7 +501,7 @@ }, { "body": { - "id": 6482, + "id": 6473, "nodeType": "Block", "src": "534:141:27", "statements": [ @@ -514,11 +514,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6476, + "id": 6467, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6464, + "referencedDeclaration": 6455, "src": "595:9:27", "typeDescriptions": { "typeIdentifier": "t_address", @@ -527,11 +527,11 @@ }, { "argumentTypes": null, - "id": 6477, + "id": 6468, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6468, + "referencedDeclaration": 6459, "src": "606:6:27", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -555,11 +555,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6473, + "id": 6464, "name": "erc20Address", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6466, + "referencedDeclaration": 6457, "src": "572:12:27", "typeDescriptions": { "typeIdentifier": "t_address", @@ -574,7 +574,7 @@ "typeString": "address" } ], - "id": 6472, + "id": 6463, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -585,7 +585,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 6474, + "id": 6465, "isConstant": false, "isLValue": false, "isPure": false, @@ -599,7 +599,7 @@ "typeString": "contract IERC20" } }, - "id": 6475, + "id": 6466, "isConstant": false, "isLValue": false, "isPure": false, @@ -613,7 +613,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 6478, + "id": 6469, "isConstant": false, "isLValue": false, "isPure": false, @@ -630,7 +630,7 @@ { "argumentTypes": null, "hexValue": "67656e2d6d67722d7472616e736665727065726332302d6661696c6564", - "id": 6479, + "id": 6470, "isConstant": false, "isLValue": false, "isPure": true, @@ -657,21 +657,21 @@ "typeString": "literal_string \"gen-mgr-transferperc20-failed\"" } ], - "id": 6471, + "id": 6462, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "544:7:27", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6480, + "id": 6471, "isConstant": false, "isLValue": false, "isPure": false, @@ -685,29 +685,29 @@ "typeString": "tuple()" } }, - "id": 6481, + "id": 6472, "nodeType": "ExpressionStatement", "src": "544:124:27" } ] }, "documentation": null, - "id": 6483, + "id": 6474, "implemented": true, "kind": "function", "modifiers": [], "name": "transferERC20", "nodeType": "FunctionDefinition", "parameters": { - "id": 6469, + "id": 6460, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6464, + "id": 6455, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 6483, + "scope": 6474, "src": "473:17:27", "stateVariable": false, "storageLocation": "default", @@ -716,7 +716,7 @@ "typeString": "address" }, "typeName": { - "id": 6463, + "id": 6454, "name": "address", "nodeType": "ElementaryTypeName", "src": "473:7:27", @@ -731,10 +731,10 @@ }, { "constant": false, - "id": 6466, + "id": 6457, "name": "erc20Address", "nodeType": "VariableDeclaration", - "scope": 6483, + "scope": 6474, "src": "492:20:27", "stateVariable": false, "storageLocation": "default", @@ -743,7 +743,7 @@ "typeString": "address" }, "typeName": { - "id": 6465, + "id": 6456, "name": "address", "nodeType": "ElementaryTypeName", "src": "492:7:27", @@ -758,10 +758,10 @@ }, { "constant": false, - "id": 6468, + "id": 6459, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6483, + "scope": 6474, "src": "514:11:27", "stateVariable": false, "storageLocation": "default", @@ -770,7 +770,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6467, + "id": 6458, "name": "uint", "nodeType": "ElementaryTypeName", "src": "514:4:27", @@ -786,19 +786,19 @@ "src": "472:54:27" }, "returnParameters": { - "id": 6470, + "id": 6461, "nodeType": "ParameterList", "parameters": [], "src": "534:0:27" }, - "scope": 6484, + "scope": 6475, "src": "450:225:27", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 6485, + "scope": 6476, "src": "158:519:27" } ], @@ -808,14 +808,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeGeneralManager.sol", "exportedSymbols": { "DedgeGeneralManager": [ - 6484 + 6475 ] }, - "id": 6485, + "id": 6476, "nodeType": "SourceUnit", "nodes": [ { - "id": 6430, + "id": 6421, "literals": [ "solidity", "0.5", @@ -827,9 +827,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../interfaces/IERC20.sol", - "id": 6431, + "id": 6422, "nodeType": "ImportDirective", - "scope": 6485, + "scope": 6476, "sourceUnit": 121, "src": "122:34:27", "symbolAliases": [], @@ -841,40 +841,40 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 6484, + "id": 6475, "linearizedBaseContracts": [ - 6484 + 6475 ], "name": "DedgeGeneralManager", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 6434, + "id": 6425, "nodeType": "Block", "src": "222:2:27", "statements": [] }, "documentation": null, - "id": 6435, + "id": 6426, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 6432, + "id": 6423, "nodeType": "ParameterList", "parameters": [], "src": "202:2:27" }, "returnParameters": { - "id": 6433, + "id": 6424, "nodeType": "ParameterList", "parameters": [], "src": "222:0:27" }, - "scope": 6484, + "scope": 6475, "src": "193:31:27", "stateMutability": "payable", "superFunction": null, @@ -882,31 +882,31 @@ }, { "body": { - "id": 6438, + "id": 6429, "nodeType": "Block", "src": "251:2:27", "statements": [] }, "documentation": null, - "id": 6439, + "id": 6430, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 6436, + "id": 6427, "nodeType": "ParameterList", "parameters": [], "src": "241:2:27" }, "returnParameters": { - "id": 6437, + "id": 6428, "nodeType": "ParameterList", "parameters": [], "src": "251:0:27" }, - "scope": 6484, + "scope": 6475, "src": "230:23:27", "stateMutability": "nonpayable", "superFunction": null, @@ -914,22 +914,22 @@ }, { "body": { - "id": 6461, + "id": 6452, "nodeType": "Block", "src": "319:125:27", "statements": [ { "assignments": [ - 6447, + 6438, null ], "declarations": [ { "constant": false, - "id": 6447, + "id": 6438, "name": "success", "nodeType": "VariableDeclaration", - "scope": 6461, + "scope": 6452, "src": "330:12:27", "stateVariable": false, "storageLocation": "default", @@ -938,7 +938,7 @@ "typeString": "bool" }, "typeName": { - "id": 6446, + "id": 6437, "name": "bool", "nodeType": "ElementaryTypeName", "src": "330:4:27", @@ -952,14 +952,14 @@ }, null ], - "id": 6455, + "id": 6446, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "", - "id": 6453, + "id": 6444, "isConstant": false, "isLValue": false, "isPure": true, @@ -985,11 +985,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6451, + "id": 6442, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6443, + "referencedDeclaration": 6434, "src": "369:6:27", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1008,18 +1008,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6448, + "id": 6439, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6441, + "referencedDeclaration": 6432, "src": "348:9:27", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 6449, + "id": 6440, "isConstant": false, "isLValue": false, "isPure": false, @@ -1033,7 +1033,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 6450, + "id": 6441, "isConstant": false, "isLValue": false, "isPure": false, @@ -1047,7 +1047,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 6452, + "id": 6443, "isConstant": false, "isLValue": false, "isPure": false, @@ -1061,7 +1061,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 6454, + "id": 6445, "isConstant": false, "isLValue": false, "isPure": false, @@ -1084,11 +1084,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6457, + "id": 6448, "name": "success", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6447, + "referencedDeclaration": 6438, "src": "398:7:27", "typeDescriptions": { "typeIdentifier": "t_bool", @@ -1098,7 +1098,7 @@ { "argumentTypes": null, "hexValue": "67656e2d6d67722d7472616e736665722d6574682d6661696c6564", - "id": 6458, + "id": 6449, "isConstant": false, "isLValue": false, "isPure": true, @@ -1125,21 +1125,21 @@ "typeString": "literal_string \"gen-mgr-transfer-eth-failed\"" } ], - "id": 6456, + "id": 6447, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "390:7:27", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6459, + "id": 6450, "isConstant": false, "isLValue": false, "isPure": false, @@ -1153,29 +1153,29 @@ "typeString": "tuple()" } }, - "id": 6460, + "id": 6451, "nodeType": "ExpressionStatement", "src": "390:47:27" } ] }, "documentation": null, - "id": 6462, + "id": 6453, "implemented": true, "kind": "function", "modifiers": [], "name": "transferETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 6444, + "id": 6435, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6441, + "id": 6432, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 6462, + "scope": 6453, "src": "280:17:27", "stateVariable": false, "storageLocation": "default", @@ -1184,7 +1184,7 @@ "typeString": "address" }, "typeName": { - "id": 6440, + "id": 6431, "name": "address", "nodeType": "ElementaryTypeName", "src": "280:7:27", @@ -1199,10 +1199,10 @@ }, { "constant": false, - "id": 6443, + "id": 6434, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6462, + "scope": 6453, "src": "299:11:27", "stateVariable": false, "storageLocation": "default", @@ -1211,7 +1211,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6442, + "id": 6433, "name": "uint", "nodeType": "ElementaryTypeName", "src": "299:4:27", @@ -1227,12 +1227,12 @@ "src": "279:32:27" }, "returnParameters": { - "id": 6445, + "id": 6436, "nodeType": "ParameterList", "parameters": [], "src": "319:0:27" }, - "scope": 6484, + "scope": 6475, "src": "259:185:27", "stateMutability": "nonpayable", "superFunction": null, @@ -1240,7 +1240,7 @@ }, { "body": { - "id": 6482, + "id": 6473, "nodeType": "Block", "src": "534:141:27", "statements": [ @@ -1253,11 +1253,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6476, + "id": 6467, "name": "recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6464, + "referencedDeclaration": 6455, "src": "595:9:27", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1266,11 +1266,11 @@ }, { "argumentTypes": null, - "id": 6477, + "id": 6468, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6468, + "referencedDeclaration": 6459, "src": "606:6:27", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1294,11 +1294,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6473, + "id": 6464, "name": "erc20Address", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6466, + "referencedDeclaration": 6457, "src": "572:12:27", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1313,7 +1313,7 @@ "typeString": "address" } ], - "id": 6472, + "id": 6463, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1324,7 +1324,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 6474, + "id": 6465, "isConstant": false, "isLValue": false, "isPure": false, @@ -1338,7 +1338,7 @@ "typeString": "contract IERC20" } }, - "id": 6475, + "id": 6466, "isConstant": false, "isLValue": false, "isPure": false, @@ -1352,7 +1352,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 6478, + "id": 6469, "isConstant": false, "isLValue": false, "isPure": false, @@ -1369,7 +1369,7 @@ { "argumentTypes": null, "hexValue": "67656e2d6d67722d7472616e736665727065726332302d6661696c6564", - "id": 6479, + "id": 6470, "isConstant": false, "isLValue": false, "isPure": true, @@ -1396,21 +1396,21 @@ "typeString": "literal_string \"gen-mgr-transferperc20-failed\"" } ], - "id": 6471, + "id": 6462, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "544:7:27", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6480, + "id": 6471, "isConstant": false, "isLValue": false, "isPure": false, @@ -1424,29 +1424,29 @@ "typeString": "tuple()" } }, - "id": 6481, + "id": 6472, "nodeType": "ExpressionStatement", "src": "544:124:27" } ] }, "documentation": null, - "id": 6483, + "id": 6474, "implemented": true, "kind": "function", "modifiers": [], "name": "transferERC20", "nodeType": "FunctionDefinition", "parameters": { - "id": 6469, + "id": 6460, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6464, + "id": 6455, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 6483, + "scope": 6474, "src": "473:17:27", "stateVariable": false, "storageLocation": "default", @@ -1455,7 +1455,7 @@ "typeString": "address" }, "typeName": { - "id": 6463, + "id": 6454, "name": "address", "nodeType": "ElementaryTypeName", "src": "473:7:27", @@ -1470,10 +1470,10 @@ }, { "constant": false, - "id": 6466, + "id": 6457, "name": "erc20Address", "nodeType": "VariableDeclaration", - "scope": 6483, + "scope": 6474, "src": "492:20:27", "stateVariable": false, "storageLocation": "default", @@ -1482,7 +1482,7 @@ "typeString": "address" }, "typeName": { - "id": 6465, + "id": 6456, "name": "address", "nodeType": "ElementaryTypeName", "src": "492:7:27", @@ -1497,10 +1497,10 @@ }, { "constant": false, - "id": 6468, + "id": 6459, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6483, + "scope": 6474, "src": "514:11:27", "stateVariable": false, "storageLocation": "default", @@ -1509,7 +1509,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6467, + "id": 6458, "name": "uint", "nodeType": "ElementaryTypeName", "src": "514:4:27", @@ -1525,19 +1525,19 @@ "src": "472:54:27" }, "returnParameters": { - "id": 6470, + "id": 6461, "nodeType": "ParameterList", "parameters": [], "src": "534:0:27" }, - "scope": 6484, + "scope": 6475, "src": "450:225:27", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 6485, + "scope": 6476, "src": "158:519:27" } ], @@ -1556,7 +1556,7 @@ } }, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:28:59.288Z", + "updatedAt": "2020-04-08T12:22:38.546Z", "networkType": "ethereum", "devdoc": { "methods": {} diff --git a/packages/smart-contracts/artifacts/DedgeMakerManager.json b/packages/smart-contracts/artifacts/DedgeMakerManager.json index c1cd87d..a928fef 100644 --- a/packages/smart-contracts/artifacts/DedgeMakerManager.json +++ b/packages/smart-contracts/artifacts/DedgeMakerManager.json @@ -371,9 +371,9 @@ "type": "function" } ], - "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"fallback\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"usr\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"ok\",\"type\":\"uint256\"}],\"name\":\"cdpAllow\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"apt\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"urn\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"wad\",\"type\":\"uint256\"}],\"name\":\"daiJoin_join\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"dst\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"wad\",\"type\":\"uint256\"}],\"name\":\"flux\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"},{\"internalType\":\"int256\",\"name\":\"dink\",\"type\":\"int256\"},{\"internalType\":\"int256\",\"name\":\"dart\",\"type\":\"int256\"}],\"name\":\"frob\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"}],\"name\":\"getVaultCollateral\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"ink\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"}],\"name\":\"getVaultDebt\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"debt\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"usr\",\"type\":\"address\"}],\"name\":\"give\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"dedgeMakerManagerAddress\",\"type\":\"address\"},{\"internalType\":\"address payable\",\"name\":\"dacProxyAddress\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"addressRegistryAddress\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdpId\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"executeOperationCalldataParams\",\"type\":\"bytes\"}],\"name\":\"importMakerVault\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_aaveFee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_protocolFee\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"importMakerVaultPostLoan\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"bytes32\",\"name\":\"ilk\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"usr\",\"type\":\"address\"}],\"name\":\"open\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"ethJoin\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"daiJoin\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"wadC\",\"type\":\"uint256\"}],\"name\":\"wipeAllAndFreeETH\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"gemJoin\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"daiJoin\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"wadC\",\"type\":\"uint256\"}],\"name\":\"wipeAllAndFreeGem\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeMakerManager.sol\":\"DedgeMakerManager\"},\"evmVersion\":\"constantinople\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol\":{\"keccak256\":\"0xe3762e63e74657a066e6fe281ec694e366ca86f6378470304c646b4e785e09f3\",\"urls\":[\"bzz-raw://67607850cbce7ffa66356dd28412e64ff58f62fa7c709f5fa28306b8be9050a7\",\"dweb:/ipfs/QmUaFhH5a6rQ8yJG2A6zJJ1ds9txqxr8ytxd2s7bhiNX35\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/ISafeERC20.sol\":{\"keccak256\":\"0xec78efb83d1275fbeb9d431938447eaabbff72deea196deea04b4873ee5a9f54\",\"urls\":[\"bzz-raw://7b50edf0121dc6286c5b93fd7ddc85edfbb719c91faf3ffd22957436c5b4763c\",\"dweb:/ipfs/QmSRUJaEp3QP71SG1V668qzXAzEj7YezhJ6AKdNqunH6dj\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/IFlashLoanReceiver.sol\":{\"keccak256\":\"0xbd9ee17614d720229da04b4d481b2e6669b5fd9217bc278a93b39a62e2383fde\",\"urls\":[\"bzz-raw://4827232c7582d13c0237ae80b47e2f3dd85499372d80a15c0f31599bb99e26a5\",\"dweb:/ipfs/QmX3mCBdQcCvL9WF5FwToZZpj6VBtkaoN9aZ1tszp7oVjt\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol\":{\"keccak256\":\"0xe1a1b1bbf6dc92e86a23b8af9cf04e3e527b766ed1147cce041080d01ede5a24\",\"urls\":[\"bzz-raw://c0a7bf8948392f8f7249a99d39ac0722840faea5767c2f97939657e281d318f5\",\"dweb:/ipfs/QmRmSmKfgegjtAnpQ6t3ucEiq9GUrfYPpi7XucjREHjYFd\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol\":{\"keccak256\":\"0x0b99a26eeba60b8201f6ffd0d9d00bc5562ace9e7998534fd3887d7ba72b7d88\",\"urls\":[\"bzz-raw://9a36c107f3471548d6a13d28e995cb71ef42bafd55bf759b7c1b0ba0fda7170c\",\"dweb:/ipfs/Qme6SJJ3A9MwVwzk6CJC9gN8jAWLkgWQUwzZU4k6eD4BNy\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol\":{\"keccak256\":\"0xa65d6eb1f4bae0350a65a2148fc83c6cab8952d11b19c39e4ab5c27d1d48773e\",\"urls\":[\"bzz-raw://84d98fe4bf18381ad57769601c6b53135c0e5ff5f191a62cd129cb5a815efc79\",\"dweb:/ipfs/QmaoXTSmkuT5u2HkEkggYzEE4mBA1MZp5yDrDKWU6Y8jgm\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol\":{\"keccak256\":\"0xd07da3ef9345ec40b090ea93df6d5a9ff7a03996a3c55f51aabee4d50ccdc201\",\"urls\":[\"bzz-raw://21c88532f770e244133c240d448092d8ea0e5a47dcf951522aa66106e15758e3\",\"dweb:/ipfs/QmXFkrbfpgcCFvoziSR3FnptBPf79og2tSR8deQGmViAkg\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol\":{\"keccak256\":\"0xc69ade89655263aaffac1183c0e842ea95294171280f2c5ab755286a66de3ff9\",\"urls\":[\"bzz-raw://742ca904eaf238a83270e315410b35e83048ee0c6529190be2ae9f9bc20e6187\",\"dweb:/ipfs/QmPW3WFbHZjsGQ6vMgPRPWHCNJLNxyEbR4w1DAvd466N51\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/makerdao/IDssProxyActions.sol\":{\"keccak256\":\"0xc670eb42195a3be8cf8ea3d11f3afa457377bfd52382094f65c63182e679863f\",\"urls\":[\"bzz-raw://855acaff1c943a63987c31ee6db3362b6c85ab419046430eaf160a96c0dc70e4\",\"dweb:/ipfs/QmWEdWqVUfsYKrJcxVQ9sowhTGUsaoydpUWsQjHkFmAPHX\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol\":{\"keccak256\":\"0xde1a310030b2b654b9c1e7782e94d7f00be0172c32dc4e99a7c168dd53d72843\",\"urls\":[\"bzz-raw://6a8b12cff637c3a1b025bd90a3c75524e53207c457b770bf22800df883fff45d\",\"dweb:/ipfs/QmSJXJDH5jiCkU11Xn7KeVTMoS64xg2XQ5hWGqQhMEnrmX\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol\":{\"keccak256\":\"0x0d2a2e2c0811bd1e9e757a1a804366cef39120f7eec3bffbcd8802afbf5d6f4b\",\"urls\":[\"bzz-raw://f5d9e36f7f3c6a0771d3656a1b1088f27d82f1f242579fe71e10b2d49aaac5b9\",\"dweb:/ipfs/QmZTjArdX13p6EGRD7fZuros5Wjs52usvNbxSavbLoRgZn\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/BytesLib.sol\":{\"keccak256\":\"0x2127d94e9d0443c4f0a5a8ebd8fd8746c7ea4e4d3849e3a45c41943019571ea7\",\"urls\":[\"bzz-raw://dbe24f863129a5062658ec1e6bc2695d7427dd8783aec86903125867f6343a4f\",\"dweb:/ipfs/QmfX7eArFhPnTa1bwjpfse3ni6EapoHfzuhdXxMxKU8kNb\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/aave/FlashLoanReceiverBase.sol\":{\"keccak256\":\"0x0a3802a7d1bf99d7ccb8046f2632f0a3fa42ebea5e1033cc13eb843b32cbf4c3\",\"urls\":[\"bzz-raw://68a6bcf9ccfe8d72448c3d3dadd328b14a741ba9d24e5aa20ad82b72c7108a7b\",\"dweb:/ipfs/QmeprLqp3jFqbxmNwuZ8Vm2EdeKp5idQZi4VSCLQZa28qY\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol\":{\"keccak256\":\"0x7636abae52593354ed288e67b6c2e5e1df218f753f6c253ae691cb5252274cf1\",\"urls\":[\"bzz-raw://d66e47ce74476c103bb8a1b11d618232276d4b57badfd7d96a45e9c881e83543\",\"dweb:/ipfs/QmXMWVNLRdiBHmnTx1c2DFvidnXpFuiy4CMh2T2avWEQ2h\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol\":{\"keccak256\":\"0xf38f1b725d7568da1b3a210190566e00daa3f241accba9fd6a906ae48e62b151\",\"urls\":[\"bzz-raw://83abf26fe875dd5599abfa2c9b387cb3ce7e70b4fe3ae0b3e2127f807b708ea1\",\"dweb:/ipfs/QmRntwBkLrh8SosWWsM1aC2cP7wMswCPuBKLmJzgQB1xeY\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol\":{\"keccak256\":\"0xc1440658c9e69c115e90b60f1a3b424155d9f0fa495a689bce0a202d8daf1df7\",\"urls\":[\"bzz-raw://dc3c2c615db44839d9353908fa2935cab29e0739ef559f00397724b904e5187f\",\"dweb:/ipfs/Qma5uk2NoqVnZgZF3fCXPRfkZMbxfEKuYo6NABq79We1t1\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol\":{\"keccak256\":\"0x36bff82bc9233b5ee86b50df83efb4915c50d3c5716e9bc463b290ab87a4b6bb\",\"urls\":[\"bzz-raw://486f7dfeaa00779677f8e139c54fb3f7f8043f66fe344ec35bd5d3873205f77e\",\"dweb:/ipfs/QmUVwqSEod9L97Cqz1fPv9jXPescnR4vNXAm4zdf2gZmgv\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol\":{\"keccak256\":\"0x8465bf916f7fbb622bfd0e4d5448effe0f1d056c267a733ce386f739ccf5916e\",\"urls\":[\"bzz-raw://106f1c87e4524a908bb1807951b2e1048797eba0f36604c119eaa4c9e0d0e2ab\",\"dweb:/ipfs/QmRofckMx8B6rP6eRDxKvmSkgo7ipamVDwPYptUfevmMCD\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapBase.sol\":{\"keccak256\":\"0x2f6d78b485392995fd2deb695a6983e82971feaf2ba629474d4ee0c5ee769614\",\"urls\":[\"bzz-raw://feca374d541b17754aecc30a9a5312de3ad406597df1d4c8b4f123bb8bca8036\",\"dweb:/ipfs/QmYdtfcTp4Dvozfa3PpLaWTxg8WnzQiie2cVnq5QPUD1CJ\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeMakerManager.sol\":{\"keccak256\":\"0x668fd43717315e1be5bf188d316d6a01e0560a42cde699a9b9d56b22436ddf1c\",\"urls\":[\"bzz-raw://082390efee5a477860b87da8f35543903746cf831fc209a39ddf06075e2438f9\",\"dweb:/ipfs/QmTVQdmTzZyLvwBX81ic73BUiCPwMaZEVEgMxomaC4UWXG\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol\":{\"keccak256\":\"0xfcd524540f6e01a5ef58192d42d87d296fad5a0d13dd883c1b5b604435befd97\",\"urls\":[\"bzz-raw://398eb7da5785008a974d476886bf95ed1793b4e5f19b56735dba4f998217ad75\",\"dweb:/ipfs/QmQtViYpthTUNzdgv4AEhSW6wMFneE5AdLerMf4q5eWWzN\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol\":{\"keccak256\":\"0x0f9a1a23e6eabb0a3cd78e2e2a0b23b15f8d175ab02d71aac63eb6e38fb82657\",\"urls\":[\"bzz-raw://6cdf61439a849257726d6fe87cc5455c008763485170f2609ed477a3f3dc0d68\",\"dweb:/ipfs/QmbLvvK3AmCaSKPXSnHNsd5iWMFzCr9HEd4cPmbPLZxZKs\"]},\"@openzeppelin/contracts/math/SafeMath.sol\":{\"keccak256\":\"0x640b6dee7a4b830bdfd52b5031a07fc2b12209f5b2e29e5d364a7d37f69d8076\",\"urls\":[\"bzz-raw://31113152e1ddb78fe7a4197f247591ca894e93f916867beb708d8e747b6cc74f\",\"dweb:/ipfs/QmbZaJyXdpsYGykVhHH9qpVGQg9DGCxE2QufbCUy3daTgq\"]},\"@openzeppelin/contracts/utils/Address.sol\":{\"keccak256\":\"0x1a8e5072509c5ea7365eb1d48030b9be865140c8fb779968da0a459a0e174a11\",\"urls\":[\"bzz-raw://03335b7b07c7c8c8d613cfdd8ec39a0b5ec133ee510bf2fe6cc5a496767bef4b\",\"dweb:/ipfs/Qmebp4nzPja645c9yXSdJkGq96oU3am3LUnG2K3R7XxyKf\"]}},\"version\":1}", - "bytecode": "0x608060405234801561001057600080fd5b50612d71806100206000396000f3fe6080604052600436106100a75760003560e01c80636d68b70b116100645780636d68b70b1461017f57806396e8d72c1461019f578063ba727a95146101bf578063bcd6deec146101df578063c56167c6146101ff578063ddd927b21461021f576100a7565b8063131fb710146100a95780631558b048146100c95780631d10f231146100e95780633edec14e1461010957806361d2d7dc1461013f5780636aa3ee111461015f575b005b3480156100b557600080fd5b506100a76100c4366004612422565b61023f565b3480156100d557600080fd5b506100a76100e43660046125f1565b6105df565b3480156100f557600080fd5b506100a7610104366004612574565b610647565b34801561011557600080fd5b506101296101243660046125b7565b6106ac565b6040516101369190612b3b565b60405180910390f35b34801561014b57600080fd5b5061012961015a3660046125b7565b6108b9565b34801561016b57600080fd5b5061012961017a366004612574565b610ab8565b34801561018b57600080fd5b506100a761019a3660046124b2565b610b43565b3480156101ab57600080fd5b506100a76101ba366004612652565b610eac565b3480156101cb57600080fd5b506100a76101da3660046125f1565b610edc565b3480156101eb57600080fd5b506100a76101fa3660046124b2565b610f0c565b34801561020b57600080fd5b506100a761021a366004612527565b6111b4565b34801561022b57600080fd5b506100a761023a366004612773565b6112b4565b60008490506000816001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561027f57600080fd5b505afa158015610293573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506102b79190810190612404565b905060006102c582876106ac565b90506060896040516020016102da9190612abd565b60408051601f19818403018152908290526102fb9188908890602001612a9b565b60405160208183030381529060405290506000846001600160a01b0316633f6dc33b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561034757600080fd5b505afa15801561035b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061037f9190810190612404565b6001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156103b757600080fd5b505afa1580156103cb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506103ef9190810190612404565b905061046e856001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561042d57600080fd5b505afa158015610441573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104659190810190612404565b898d6001610edc565b6104788a82611c47565b806001600160a01b0316635cffe9de8b876001600160a01b031663ee2a94116040518163ffffffff1660e01b815260040160206040518083038186803b1580156104c157600080fd5b505afa1580156104d5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104f99190810190612404565b86866040518563ffffffff1660e01b815260040161051a9493929190612acb565b600060405180830381600087803b15801561053457600080fd5b505af1158015610548573d6000803e3d6000fd5b505050506105c8856001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561058857600080fd5b505afa15801561059c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506105c09190810190612404565b896001610647565b6105d28a82611dde565b5050505050505050505050565b6040516313771f0760e31b81526001600160a01b03851690639bb8f8389061060f90869086908690600401612bfc565b600060405180830381600087803b15801561062957600080fd5b505af115801561063d573d6000803e3d6000fd5b5050505050505050565b604051631f95f98d60e31b81526001600160a01b0384169063fcafcc68906106759085908590600401612b49565b600060405180830381600087803b15801561068f57600080fd5b505af11580156106a3573d6000803e3d6000fd5b50505050505050565b600080836001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b1580156106e857600080fd5b505afa1580156106fc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107209190810190612404565b90506000846001600160a01b0316632726b073856040518263ffffffff1660e01b81526004016107509190612b3b565b60206040518083038186803b15801561076857600080fd5b505afa15801561077c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107a09190810190612404565b90506000856001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b81526004016107d09190612b3b565b60206040518083038186803b1580156107e857600080fd5b505afa1580156107fc573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061082091908101906126e9565b90506000866001600160a01b0316638161b120876040518263ffffffff1660e01b81526004016108509190612b3b565b60206040518083038186803b15801561086857600080fd5b505afa15801561087c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506108a09190810190612404565b90506108ae84828585611eae565b979650505050505050565b600080836001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b1580156108f557600080fd5b505afa158015610909573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061092d9190810190612404565b90506000846001600160a01b0316632726b073856040518263ffffffff1660e01b815260040161095d9190612b3b565b60206040518083038186803b15801561097557600080fd5b505afa158015610989573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109ad9190810190612404565b90506000856001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b81526004016109dd9190612b3b565b60206040518083038186803b1580156109f557600080fd5b505afa158015610a09573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610a2d91908101906126e9565b6040516309092f9760e21b81529091506001600160a01b03841690632424be5c90610a5e9084908690600401612b49565b604080518083038186803b158015610a7557600080fd5b505afa158015610a89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610aad9190810190612743565b509695505050505050565b604051636090dec560e01b81526000906001600160a01b03851690636090dec590610ae99086908690600401612b49565b602060405180830381600087803b158015610b0357600080fd5b505af1158015610b17573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b3b91908101906126e9565b949350505050565b6000856001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b158015610b7e57600080fd5b505afa158015610b92573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610bb69190810190612404565b90506000866001600160a01b0316632726b073856040518263ffffffff1660e01b8152600401610be69190612b3b565b60206040518083038186803b158015610bfe57600080fd5b505afa158015610c12573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610c369190810190612404565b90506000876001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b8152600401610c669190612b3b565b60206040518083038186803b158015610c7e57600080fd5b505afa158015610c92573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610cb691908101906126e9565b90506000836001600160a01b0316632424be5c83856040518363ffffffff1660e01b8152600401610ce8929190612b49565b604080518083038186803b158015610cff57600080fd5b505afa158015610d13573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610d379190810190612743565b915050610d4b878461021a87878888611eae565b610d658987610d5988612091565b60000384600003610eac565b610d71898730886105df565b60405163ef693bed60e01b81526001600160a01b0389169063ef693bed90610d9f9030908990600401612b0f565b600060405180830381600087803b158015610db957600080fd5b505af1158015610dcd573d6000803e3d6000fd5b50505050876001600160a01b0316637bd2bea76040518163ffffffff1660e01b8152600401602060405180830381600087803b158015610e0c57600080fd5b505af1158015610e20573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610e449190810190612707565b6001600160a01b0316632e1a7d4d866040518263ffffffff1660e01b8152600401610e6f9190612b3b565b600060405180830381600087803b158015610e8957600080fd5b505af1158015610e9d573d6000803e3d6000fd5b50505050505050505050505050565b6040516345e6bdcd60e01b81526001600160a01b038516906345e6bdcd9061060f90869086908690600401612b64565b6040516305b1fdb160e11b81526001600160a01b03851690630b63fb629061060f90869086908690600401612bfc565b6000856001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b158015610f4757600080fd5b505afa158015610f5b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610f7f9190810190612404565b90506000866001600160a01b0316632726b073856040518263ffffffff1660e01b8152600401610faf9190612b3b565b60206040518083038186803b158015610fc757600080fd5b505afa158015610fdb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610fff9190810190612404565b90506000876001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b815260040161102f9190612b3b565b60206040518083038186803b15801561104757600080fd5b505afa15801561105b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061107f91908101906126e9565b90506000836001600160a01b0316632424be5c83856040518363ffffffff1660e01b81526004016110b1929190612b49565b604080518083038186803b1580156110c857600080fd5b505afa1580156110dc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506111009190810190612743565b915050611114878461021a87878888611eae565b600061112089876120b8565b905061113c8a8861113084612091565b60000385600003610eac565b6111488a8830846105df565b60405163ef693bed60e01b81526001600160a01b038a169063ef693bed906111769030908a90600401612b0f565b600060405180830381600087803b15801561119057600080fd5b505af11580156111a4573d6000803e3d6000fd5b5050505050505050505050505050565b826001600160a01b031663f4b9fa756040518163ffffffff1660e01b8152600401602060405180830381600087803b1580156111ef57600080fd5b505af1158015611203573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506112279190810190612707565b6001600160a01b031663095ea7b384836040518363ffffffff1660e01b8152600401611254929190612b0f565b600060405180830381600087803b15801561126e57600080fd5b505af1158015611282573d6000803e3d6000fd5b5050604051633b4da69f60e01b81526001600160a01b0386169250633b4da69f91506106759085908590600401612b0f565b84840183016112c161223e565b6112cd83850185612725565b90506000816000015190506000816001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561131357600080fd5b505afa158015611327573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061134b9190810190612404565b905060008360400151905060006113668386602001516108b9565b604080516002808252606080830184529394509091602083019080388339019050509050828160008151811061139857fe5b60200260200101906001600160a01b031690816001600160a01b031681525050846001600160a01b031663b29ced066040518163ffffffff1660e01b815260040160206040518083038186803b1580156113f157600080fd5b505afa158015611405573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506114299190810190612404565b8160018151811061143657fe5b60200260200101906001600160a01b031690816001600160a01b0316815250506060856001600160a01b031663bd020fbc6040518163ffffffff1660e01b815260040160206040518083038186803b15801561149157600080fd5b505afa1580156114a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506114c99190810190612404565b6001600160a01b031663c2998238836040518263ffffffff1660e01b81526004016114f49190612b2a565b600060405180830381600087803b15801561150e57600080fd5b505af1158015611522573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261154a9190810190612696565b90508060008151811061155957fe5b60200260200101516000146115895760405162461bcd60e51b815260040161158090612bbc565b60405180910390fd5b8060018151811061159657fe5b60200260200101516000146115bd5760405162461bcd60e51b815260040161158090612bec565b6020870151604051632c2cb9fd60e01b8152644554482d4160d81b916001600160a01b03881691632c2cb9fd916115f691600401612b3b565b60206040518083038186803b15801561160e57600080fd5b505afa158015611622573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061164691908101906126e9565b14156119115761173d85876001600160a01b0316638ec9f15f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561168957600080fd5b505afa15801561169d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506116c19190810190612404565b886001600160a01b031663ac92d52b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156116fa57600080fd5b505afa15801561170e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506117329190810190612404565b8a6020015187610b43565b856001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561177657600080fd5b505afa15801561178a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506117ae9190810190612404565b6001600160a01b0316631249c58b846040518263ffffffff1660e01b81526004016000604051808303818588803b1580156117e857600080fd5b505af11580156117fc573d6000803e3d6000fd5b5050505050856001600160a01b031663b29ced066040518163ffffffff1660e01b815260040160206040518083038186803b15801561183a57600080fd5b505afa15801561184e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506118729190810190612404565b6001600160a01b031663c5ebeaec896040518263ffffffff1660e01b815260040161189d9190612b3b565b602060405180830381600087803b1580156118b757600080fd5b505af11580156118cb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506118ef91908101906126e9565b1561190c5760405162461bcd60e51b815260040161158090612bac565b610e9d565b61199e858860600151886001600160a01b031663ac92d52b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561195357600080fd5b505afa158015611967573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061198b9190810190612404565b8a602001516101fa8c6060015189612143565b60006119ae8489608001516121d0565b9050846001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156119e957600080fd5b505afa1580156119fd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611a219190810190612404565b6001600160a01b031663095ea7b386836040518363ffffffff1660e01b8152600401611a4e929190612b0f565b602060405180830381600087803b158015611a6857600080fd5b505af1158015611a7c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611aa091908101906126cb565b5060405163140e25ad60e31b81526001600160a01b0386169063a0712d6890611acd908490600401612b3b565b602060405180830381600087803b158015611ae757600080fd5b505af1158015611afb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611b1f91908101906126e9565b15611b3c5760405162461bcd60e51b815260040161158090612bcc565b866001600160a01b031663b29ced066040518163ffffffff1660e01b815260040160206040518083038186803b158015611b7557600080fd5b505afa158015611b89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611bad9190810190612404565b6001600160a01b031663c5ebeaec8a6040518263ffffffff1660e01b8152600401611bd89190612b3b565b602060405180830381600087803b158015611bf257600080fd5b505af1158015611c06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611c2a91908101906126e9565b156111a45760405162461bcd60e51b815260040161158090612bac565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b158015611c8257600080fd5b505afa158015611c96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611cba9190810190612707565b9050806001600160a01b031663f0217ce58360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d1757600080fd5b505afa158015611d2b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611d4f91908101906126e9565b846001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d8857600080fd5b505afa158015611d9c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611dc091908101906126e9565b6040518463ffffffff1660e01b815260040161067593929190612b64565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b158015611e1957600080fd5b505afa158015611e2d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611e519190810190612707565b9050806001600160a01b03166379d88d878360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d1757600080fd5b600080856001600160a01b031663d9638d36846040518263ffffffff1660e01b8152600401611edd9190612b3b565b60a06040518083038186803b158015611ef557600080fd5b505afa158015611f09573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611f2d91908101906127f1565b5050509150506000866001600160a01b0316632424be5c85876040518363ffffffff1660e01b8152600401611f63929190612b49565b604080518083038186803b158015611f7a57600080fd5b505afa158015611f8e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611fb29190810190612743565b9150506000876001600160a01b0316636c25b346886040518263ffffffff1660e01b8152600401611fe39190612abd565b60206040518083038186803b158015611ffb57600080fd5b505afa15801561200f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061203391908101906126e9565b9050600061204a61204484866121e4565b8361221b565b90506b033b2e3c9fd0803ce80000008104945080612074866b033b2e3c9fd0803ce80000006121e4565b1061207f5784612084565b846001015b9998505050505050505050565b8060008112156120b35760405162461bcd60e51b815260040161158090612bdc565b919050565b600061213c82846001600160a01b031663b3bcfa826040518163ffffffff1660e01b8152600401602060405180830381600087803b1580156120f957600080fd5b505af115801561210d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061213191908101906126e9565b601203600a0a6121e4565b9392505050565b6000826001600160a01b031663b3bcfa826040518163ffffffff1660e01b8152600401602060405180830381600087803b15801561218057600080fd5b505af1158015612194573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506121b891908101906126e9565b601203600a0a82816121c657fe5b0490505b92915050565b60008160ff16601203600a0a83816121c657fe5b60008115806121ff575050808202828282816121fc57fe5b04145b6121ca5760405162461bcd60e51b815260040161158090612b8c565b808203828111156121ca5760405162461bcd60e51b815260040161158090612b9c565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915290565b80356121ca81612cf3565b80516121ca81612cf3565b600082601f83011261229357600080fd5b81516122a66122a182612c3e565b612c17565b915081818352602084019350602081019050838560208402820111156122cb57600080fd5b60005b838110156122f757816122e18882612317565b84525060209283019291909101906001016122ce565b5050505092915050565b80516121ca81612d0a565b80356121ca81612d13565b80516121ca81612d13565b60008083601f84011261233457600080fd5b50813567ffffffffffffffff81111561234c57600080fd5b60208301915083600182028301111561236457600080fd5b9250929050565b80516121ca81612d1c565b600060a0828403121561238857600080fd5b61239260a0612c17565b905060006123a0848461226c565b82525060206123b18484830161230c565b60208301525060406123c58482850161226c565b60408301525060606123d98482850161226c565b60608301525060806123ed848285016123f9565b60808301525092915050565b80356121ca81612d25565b60006020828403121561241657600080fd5b6000610b3b8484612277565b60008060008060008060a0878903121561243b57600080fd5b6000612447898961226c565b965050602061245889828a0161226c565b955050604061246989828a0161226c565b945050606061247a89828a0161230c565b935050608087013567ffffffffffffffff81111561249757600080fd5b6124a389828a01612322565b92509250509295509295509295565b600080600080600060a086880312156124ca57600080fd5b60006124d6888861226c565b95505060206124e78882890161226c565b94505060406124f88882890161226c565b93505060606125098882890161230c565b925050608061251a8882890161230c565b9150509295509295909350565b60008060006060848603121561253c57600080fd5b6000612548868661226c565b93505060206125598682870161226c565b925050604061256a8682870161230c565b9150509250925092565b60008060006060848603121561258957600080fd5b6000612595868661226c565b93505060206125a68682870161230c565b925050604061256a8682870161226c565b600080604083850312156125ca57600080fd5b60006125d6858561226c565b92505060206125e78582860161230c565b9150509250929050565b6000806000806080858703121561260757600080fd5b6000612613878761226c565b94505060206126248782880161230c565b93505060406126358782880161226c565b92505060606126468782880161230c565b91505092959194509250565b6000806000806080858703121561266857600080fd5b6000612674878761226c565b94505060206126858782880161230c565b93505060406126358782880161230c565b6000602082840312156126a857600080fd5b815167ffffffffffffffff8111156126bf57600080fd5b610b3b84828501612282565b6000602082840312156126dd57600080fd5b6000610b3b8484612301565b6000602082840312156126fb57600080fd5b6000610b3b8484612317565b60006020828403121561271957600080fd5b6000610b3b848461236b565b600060a0828403121561273757600080fd5b6000610b3b8484612376565b6000806040838503121561275657600080fd5b60006127628585612317565b92505060206125e785828601612317565b60008060008060006080868803121561278b57600080fd5b6000612797888861230c565b95505060206127a88882890161230c565b94505060406127b98882890161230c565b935050606086013567ffffffffffffffff8111156127d657600080fd5b6127e288828901612322565b92509250509295509295909350565b600080600080600060a0868803121561280957600080fd5b60006128158888612317565b955050602061282688828901612317565b945050604061283788828901612317565b935050606061284888828901612317565b925050608061251a88828901612317565b6000612865838361287c565b505060200190565b61287681612ca2565b82525050565b61287681612c72565b600061289082612c65565b61289a8185612c69565b93506128a583612c5f565b8060005b838110156128d35781516128bd8882612859565b97506128c883612c5f565b9250506001016128a9565b509495945050505050565b61287681612c82565b60006128f383856120b3565b9350612900838584612cad565b50500190565b600061291182612c65565b61291b8185612c69565b935061292b818560208601612cb9565b61293481612ce9565b9093019392505050565b600061294982612c65565b61295381856120b3565b9350612963818560208601612cb9565b9290920192915050565b600061297a600c83612c69565b6b6d756c2d6f766572666c6f7760a01b815260200192915050565b60006129a2600c83612c69565b6b7375622d6f766572666c6f7760a01b815260200192915050565b60006129ca600f83612c69565b6e19185a4b589bdc9c9bddcb59985a5b608a1b815260200192915050565b60006129f5601483612c69565b731b5adc8b595b9d195c8b59d95b4b59985a5b195960621b815260200192915050565b6000612a25600f83612c69565b6e19d95b4b5cdd5c1c1b1e4b59985a5b608a1b815260200192915050565b6000612a50600c83612c69565b6b696e742d6f766572666c6f7760a01b815260200192915050565b6000612a78601483612c69565b731b5adc8b595b9d195c8b59185a4b59985a5b195960621b815260200192915050565b6000612aa7828661293e565b9150612ab48284866128e7565b95945050505050565b602081016121ca828461287c565b60808101612ad9828761286d565b612ae6602083018661287c565b612af360408301856128de565b8181036060830152612b058184612906565b9695505050505050565b60408101612b1d828561287c565b61213c60208301846128de565b6020808252810161213c8184612885565b602081016121ca82846128de565b60408101612b5782856128de565b61213c602083018461287c565b60608101612b7282866128de565b612b7f60208301856128de565b610b3b60408301846128de565b602080825281016121ca8161296d565b602080825281016121ca81612995565b602080825281016121ca816129bd565b602080825281016121ca816129e8565b602080825281016121ca81612a18565b602080825281016121ca81612a43565b602080825281016121ca81612a6b565b60608101612c0a82866128de565b612b7f602083018561287c565b60405181810167ffffffffffffffff81118282101715612c3657600080fd5b604052919050565b600067ffffffffffffffff821115612c5557600080fd5b5060209081020190565b60200190565b5190565b90815260200190565b60006121ca82612c90565b151590565b90565b60006121ca82612c72565b6001600160a01b031690565b60ff1690565b60006121ca82612c85565b82818337506000910152565b60005b83811015612cd4578181015183820152602001612cbc565b83811115612ce3576000848401525b50505050565b601f01601f191690565b612cfc81612c72565b8114612d0757600080fd5b50565b612cfc81612c7d565b612cfc81612c82565b612cfc81612c85565b612cfc81612c9c56fea365627a7a723158202382211b20407aa7cc1454ef0da1b3e1da76eb668946419ee57a4525293c828b6c6578706572696d656e74616cf564736f6c63430005100040", - "deployedBytecode": "0x6080604052600436106100a75760003560e01c80636d68b70b116100645780636d68b70b1461017f57806396e8d72c1461019f578063ba727a95146101bf578063bcd6deec146101df578063c56167c6146101ff578063ddd927b21461021f576100a7565b8063131fb710146100a95780631558b048146100c95780631d10f231146100e95780633edec14e1461010957806361d2d7dc1461013f5780636aa3ee111461015f575b005b3480156100b557600080fd5b506100a76100c4366004612422565b61023f565b3480156100d557600080fd5b506100a76100e43660046125f1565b6105df565b3480156100f557600080fd5b506100a7610104366004612574565b610647565b34801561011557600080fd5b506101296101243660046125b7565b6106ac565b6040516101369190612b3b565b60405180910390f35b34801561014b57600080fd5b5061012961015a3660046125b7565b6108b9565b34801561016b57600080fd5b5061012961017a366004612574565b610ab8565b34801561018b57600080fd5b506100a761019a3660046124b2565b610b43565b3480156101ab57600080fd5b506100a76101ba366004612652565b610eac565b3480156101cb57600080fd5b506100a76101da3660046125f1565b610edc565b3480156101eb57600080fd5b506100a76101fa3660046124b2565b610f0c565b34801561020b57600080fd5b506100a761021a366004612527565b6111b4565b34801561022b57600080fd5b506100a761023a366004612773565b6112b4565b60008490506000816001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561027f57600080fd5b505afa158015610293573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506102b79190810190612404565b905060006102c582876106ac565b90506060896040516020016102da9190612abd565b60408051601f19818403018152908290526102fb9188908890602001612a9b565b60405160208183030381529060405290506000846001600160a01b0316633f6dc33b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561034757600080fd5b505afa15801561035b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061037f9190810190612404565b6001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156103b757600080fd5b505afa1580156103cb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506103ef9190810190612404565b905061046e856001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561042d57600080fd5b505afa158015610441573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104659190810190612404565b898d6001610edc565b6104788a82611c47565b806001600160a01b0316635cffe9de8b876001600160a01b031663ee2a94116040518163ffffffff1660e01b815260040160206040518083038186803b1580156104c157600080fd5b505afa1580156104d5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104f99190810190612404565b86866040518563ffffffff1660e01b815260040161051a9493929190612acb565b600060405180830381600087803b15801561053457600080fd5b505af1158015610548573d6000803e3d6000fd5b505050506105c8856001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561058857600080fd5b505afa15801561059c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506105c09190810190612404565b896001610647565b6105d28a82611dde565b5050505050505050505050565b6040516313771f0760e31b81526001600160a01b03851690639bb8f8389061060f90869086908690600401612bfc565b600060405180830381600087803b15801561062957600080fd5b505af115801561063d573d6000803e3d6000fd5b5050505050505050565b604051631f95f98d60e31b81526001600160a01b0384169063fcafcc68906106759085908590600401612b49565b600060405180830381600087803b15801561068f57600080fd5b505af11580156106a3573d6000803e3d6000fd5b50505050505050565b600080836001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b1580156106e857600080fd5b505afa1580156106fc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107209190810190612404565b90506000846001600160a01b0316632726b073856040518263ffffffff1660e01b81526004016107509190612b3b565b60206040518083038186803b15801561076857600080fd5b505afa15801561077c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107a09190810190612404565b90506000856001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b81526004016107d09190612b3b565b60206040518083038186803b1580156107e857600080fd5b505afa1580156107fc573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061082091908101906126e9565b90506000866001600160a01b0316638161b120876040518263ffffffff1660e01b81526004016108509190612b3b565b60206040518083038186803b15801561086857600080fd5b505afa15801561087c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506108a09190810190612404565b90506108ae84828585611eae565b979650505050505050565b600080836001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b1580156108f557600080fd5b505afa158015610909573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061092d9190810190612404565b90506000846001600160a01b0316632726b073856040518263ffffffff1660e01b815260040161095d9190612b3b565b60206040518083038186803b15801561097557600080fd5b505afa158015610989573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109ad9190810190612404565b90506000856001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b81526004016109dd9190612b3b565b60206040518083038186803b1580156109f557600080fd5b505afa158015610a09573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610a2d91908101906126e9565b6040516309092f9760e21b81529091506001600160a01b03841690632424be5c90610a5e9084908690600401612b49565b604080518083038186803b158015610a7557600080fd5b505afa158015610a89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610aad9190810190612743565b509695505050505050565b604051636090dec560e01b81526000906001600160a01b03851690636090dec590610ae99086908690600401612b49565b602060405180830381600087803b158015610b0357600080fd5b505af1158015610b17573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b3b91908101906126e9565b949350505050565b6000856001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b158015610b7e57600080fd5b505afa158015610b92573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610bb69190810190612404565b90506000866001600160a01b0316632726b073856040518263ffffffff1660e01b8152600401610be69190612b3b565b60206040518083038186803b158015610bfe57600080fd5b505afa158015610c12573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610c369190810190612404565b90506000876001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b8152600401610c669190612b3b565b60206040518083038186803b158015610c7e57600080fd5b505afa158015610c92573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610cb691908101906126e9565b90506000836001600160a01b0316632424be5c83856040518363ffffffff1660e01b8152600401610ce8929190612b49565b604080518083038186803b158015610cff57600080fd5b505afa158015610d13573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610d379190810190612743565b915050610d4b878461021a87878888611eae565b610d658987610d5988612091565b60000384600003610eac565b610d71898730886105df565b60405163ef693bed60e01b81526001600160a01b0389169063ef693bed90610d9f9030908990600401612b0f565b600060405180830381600087803b158015610db957600080fd5b505af1158015610dcd573d6000803e3d6000fd5b50505050876001600160a01b0316637bd2bea76040518163ffffffff1660e01b8152600401602060405180830381600087803b158015610e0c57600080fd5b505af1158015610e20573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610e449190810190612707565b6001600160a01b0316632e1a7d4d866040518263ffffffff1660e01b8152600401610e6f9190612b3b565b600060405180830381600087803b158015610e8957600080fd5b505af1158015610e9d573d6000803e3d6000fd5b50505050505050505050505050565b6040516345e6bdcd60e01b81526001600160a01b038516906345e6bdcd9061060f90869086908690600401612b64565b6040516305b1fdb160e11b81526001600160a01b03851690630b63fb629061060f90869086908690600401612bfc565b6000856001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b158015610f4757600080fd5b505afa158015610f5b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610f7f9190810190612404565b90506000866001600160a01b0316632726b073856040518263ffffffff1660e01b8152600401610faf9190612b3b565b60206040518083038186803b158015610fc757600080fd5b505afa158015610fdb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610fff9190810190612404565b90506000876001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b815260040161102f9190612b3b565b60206040518083038186803b15801561104757600080fd5b505afa15801561105b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061107f91908101906126e9565b90506000836001600160a01b0316632424be5c83856040518363ffffffff1660e01b81526004016110b1929190612b49565b604080518083038186803b1580156110c857600080fd5b505afa1580156110dc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506111009190810190612743565b915050611114878461021a87878888611eae565b600061112089876120b8565b905061113c8a8861113084612091565b60000385600003610eac565b6111488a8830846105df565b60405163ef693bed60e01b81526001600160a01b038a169063ef693bed906111769030908a90600401612b0f565b600060405180830381600087803b15801561119057600080fd5b505af11580156111a4573d6000803e3d6000fd5b5050505050505050505050505050565b826001600160a01b031663f4b9fa756040518163ffffffff1660e01b8152600401602060405180830381600087803b1580156111ef57600080fd5b505af1158015611203573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506112279190810190612707565b6001600160a01b031663095ea7b384836040518363ffffffff1660e01b8152600401611254929190612b0f565b600060405180830381600087803b15801561126e57600080fd5b505af1158015611282573d6000803e3d6000fd5b5050604051633b4da69f60e01b81526001600160a01b0386169250633b4da69f91506106759085908590600401612b0f565b84840183016112c161223e565b6112cd83850185612725565b90506000816000015190506000816001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561131357600080fd5b505afa158015611327573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061134b9190810190612404565b905060008360400151905060006113668386602001516108b9565b604080516002808252606080830184529394509091602083019080388339019050509050828160008151811061139857fe5b60200260200101906001600160a01b031690816001600160a01b031681525050846001600160a01b031663b29ced066040518163ffffffff1660e01b815260040160206040518083038186803b1580156113f157600080fd5b505afa158015611405573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506114299190810190612404565b8160018151811061143657fe5b60200260200101906001600160a01b031690816001600160a01b0316815250506060856001600160a01b031663bd020fbc6040518163ffffffff1660e01b815260040160206040518083038186803b15801561149157600080fd5b505afa1580156114a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506114c99190810190612404565b6001600160a01b031663c2998238836040518263ffffffff1660e01b81526004016114f49190612b2a565b600060405180830381600087803b15801561150e57600080fd5b505af1158015611522573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261154a9190810190612696565b90508060008151811061155957fe5b60200260200101516000146115895760405162461bcd60e51b815260040161158090612bbc565b60405180910390fd5b8060018151811061159657fe5b60200260200101516000146115bd5760405162461bcd60e51b815260040161158090612bec565b6020870151604051632c2cb9fd60e01b8152644554482d4160d81b916001600160a01b03881691632c2cb9fd916115f691600401612b3b565b60206040518083038186803b15801561160e57600080fd5b505afa158015611622573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061164691908101906126e9565b14156119115761173d85876001600160a01b0316638ec9f15f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561168957600080fd5b505afa15801561169d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506116c19190810190612404565b886001600160a01b031663ac92d52b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156116fa57600080fd5b505afa15801561170e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506117329190810190612404565b8a6020015187610b43565b856001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561177657600080fd5b505afa15801561178a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506117ae9190810190612404565b6001600160a01b0316631249c58b846040518263ffffffff1660e01b81526004016000604051808303818588803b1580156117e857600080fd5b505af11580156117fc573d6000803e3d6000fd5b5050505050856001600160a01b031663b29ced066040518163ffffffff1660e01b815260040160206040518083038186803b15801561183a57600080fd5b505afa15801561184e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506118729190810190612404565b6001600160a01b031663c5ebeaec896040518263ffffffff1660e01b815260040161189d9190612b3b565b602060405180830381600087803b1580156118b757600080fd5b505af11580156118cb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506118ef91908101906126e9565b1561190c5760405162461bcd60e51b815260040161158090612bac565b610e9d565b61199e858860600151886001600160a01b031663ac92d52b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561195357600080fd5b505afa158015611967573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061198b9190810190612404565b8a602001516101fa8c6060015189612143565b60006119ae8489608001516121d0565b9050846001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156119e957600080fd5b505afa1580156119fd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611a219190810190612404565b6001600160a01b031663095ea7b386836040518363ffffffff1660e01b8152600401611a4e929190612b0f565b602060405180830381600087803b158015611a6857600080fd5b505af1158015611a7c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611aa091908101906126cb565b5060405163140e25ad60e31b81526001600160a01b0386169063a0712d6890611acd908490600401612b3b565b602060405180830381600087803b158015611ae757600080fd5b505af1158015611afb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611b1f91908101906126e9565b15611b3c5760405162461bcd60e51b815260040161158090612bcc565b866001600160a01b031663b29ced066040518163ffffffff1660e01b815260040160206040518083038186803b158015611b7557600080fd5b505afa158015611b89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611bad9190810190612404565b6001600160a01b031663c5ebeaec8a6040518263ffffffff1660e01b8152600401611bd89190612b3b565b602060405180830381600087803b158015611bf257600080fd5b505af1158015611c06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611c2a91908101906126e9565b156111a45760405162461bcd60e51b815260040161158090612bac565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b158015611c8257600080fd5b505afa158015611c96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611cba9190810190612707565b9050806001600160a01b031663f0217ce58360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d1757600080fd5b505afa158015611d2b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611d4f91908101906126e9565b846001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d8857600080fd5b505afa158015611d9c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611dc091908101906126e9565b6040518463ffffffff1660e01b815260040161067593929190612b64565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b158015611e1957600080fd5b505afa158015611e2d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611e519190810190612707565b9050806001600160a01b03166379d88d878360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d1757600080fd5b600080856001600160a01b031663d9638d36846040518263ffffffff1660e01b8152600401611edd9190612b3b565b60a06040518083038186803b158015611ef557600080fd5b505afa158015611f09573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611f2d91908101906127f1565b5050509150506000866001600160a01b0316632424be5c85876040518363ffffffff1660e01b8152600401611f63929190612b49565b604080518083038186803b158015611f7a57600080fd5b505afa158015611f8e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611fb29190810190612743565b9150506000876001600160a01b0316636c25b346886040518263ffffffff1660e01b8152600401611fe39190612abd565b60206040518083038186803b158015611ffb57600080fd5b505afa15801561200f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061203391908101906126e9565b9050600061204a61204484866121e4565b8361221b565b90506b033b2e3c9fd0803ce80000008104945080612074866b033b2e3c9fd0803ce80000006121e4565b1061207f5784612084565b846001015b9998505050505050505050565b8060008112156120b35760405162461bcd60e51b815260040161158090612bdc565b919050565b600061213c82846001600160a01b031663b3bcfa826040518163ffffffff1660e01b8152600401602060405180830381600087803b1580156120f957600080fd5b505af115801561210d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061213191908101906126e9565b601203600a0a6121e4565b9392505050565b6000826001600160a01b031663b3bcfa826040518163ffffffff1660e01b8152600401602060405180830381600087803b15801561218057600080fd5b505af1158015612194573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506121b891908101906126e9565b601203600a0a82816121c657fe5b0490505b92915050565b60008160ff16601203600a0a83816121c657fe5b60008115806121ff575050808202828282816121fc57fe5b04145b6121ca5760405162461bcd60e51b815260040161158090612b8c565b808203828111156121ca5760405162461bcd60e51b815260040161158090612b9c565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915290565b80356121ca81612cf3565b80516121ca81612cf3565b600082601f83011261229357600080fd5b81516122a66122a182612c3e565b612c17565b915081818352602084019350602081019050838560208402820111156122cb57600080fd5b60005b838110156122f757816122e18882612317565b84525060209283019291909101906001016122ce565b5050505092915050565b80516121ca81612d0a565b80356121ca81612d13565b80516121ca81612d13565b60008083601f84011261233457600080fd5b50813567ffffffffffffffff81111561234c57600080fd5b60208301915083600182028301111561236457600080fd5b9250929050565b80516121ca81612d1c565b600060a0828403121561238857600080fd5b61239260a0612c17565b905060006123a0848461226c565b82525060206123b18484830161230c565b60208301525060406123c58482850161226c565b60408301525060606123d98482850161226c565b60608301525060806123ed848285016123f9565b60808301525092915050565b80356121ca81612d25565b60006020828403121561241657600080fd5b6000610b3b8484612277565b60008060008060008060a0878903121561243b57600080fd5b6000612447898961226c565b965050602061245889828a0161226c565b955050604061246989828a0161226c565b945050606061247a89828a0161230c565b935050608087013567ffffffffffffffff81111561249757600080fd5b6124a389828a01612322565b92509250509295509295509295565b600080600080600060a086880312156124ca57600080fd5b60006124d6888861226c565b95505060206124e78882890161226c565b94505060406124f88882890161226c565b93505060606125098882890161230c565b925050608061251a8882890161230c565b9150509295509295909350565b60008060006060848603121561253c57600080fd5b6000612548868661226c565b93505060206125598682870161226c565b925050604061256a8682870161230c565b9150509250925092565b60008060006060848603121561258957600080fd5b6000612595868661226c565b93505060206125a68682870161230c565b925050604061256a8682870161226c565b600080604083850312156125ca57600080fd5b60006125d6858561226c565b92505060206125e78582860161230c565b9150509250929050565b6000806000806080858703121561260757600080fd5b6000612613878761226c565b94505060206126248782880161230c565b93505060406126358782880161226c565b92505060606126468782880161230c565b91505092959194509250565b6000806000806080858703121561266857600080fd5b6000612674878761226c565b94505060206126858782880161230c565b93505060406126358782880161230c565b6000602082840312156126a857600080fd5b815167ffffffffffffffff8111156126bf57600080fd5b610b3b84828501612282565b6000602082840312156126dd57600080fd5b6000610b3b8484612301565b6000602082840312156126fb57600080fd5b6000610b3b8484612317565b60006020828403121561271957600080fd5b6000610b3b848461236b565b600060a0828403121561273757600080fd5b6000610b3b8484612376565b6000806040838503121561275657600080fd5b60006127628585612317565b92505060206125e785828601612317565b60008060008060006080868803121561278b57600080fd5b6000612797888861230c565b95505060206127a88882890161230c565b94505060406127b98882890161230c565b935050606086013567ffffffffffffffff8111156127d657600080fd5b6127e288828901612322565b92509250509295509295909350565b600080600080600060a0868803121561280957600080fd5b60006128158888612317565b955050602061282688828901612317565b945050604061283788828901612317565b935050606061284888828901612317565b925050608061251a88828901612317565b6000612865838361287c565b505060200190565b61287681612ca2565b82525050565b61287681612c72565b600061289082612c65565b61289a8185612c69565b93506128a583612c5f565b8060005b838110156128d35781516128bd8882612859565b97506128c883612c5f565b9250506001016128a9565b509495945050505050565b61287681612c82565b60006128f383856120b3565b9350612900838584612cad565b50500190565b600061291182612c65565b61291b8185612c69565b935061292b818560208601612cb9565b61293481612ce9565b9093019392505050565b600061294982612c65565b61295381856120b3565b9350612963818560208601612cb9565b9290920192915050565b600061297a600c83612c69565b6b6d756c2d6f766572666c6f7760a01b815260200192915050565b60006129a2600c83612c69565b6b7375622d6f766572666c6f7760a01b815260200192915050565b60006129ca600f83612c69565b6e19185a4b589bdc9c9bddcb59985a5b608a1b815260200192915050565b60006129f5601483612c69565b731b5adc8b595b9d195c8b59d95b4b59985a5b195960621b815260200192915050565b6000612a25600f83612c69565b6e19d95b4b5cdd5c1c1b1e4b59985a5b608a1b815260200192915050565b6000612a50600c83612c69565b6b696e742d6f766572666c6f7760a01b815260200192915050565b6000612a78601483612c69565b731b5adc8b595b9d195c8b59185a4b59985a5b195960621b815260200192915050565b6000612aa7828661293e565b9150612ab48284866128e7565b95945050505050565b602081016121ca828461287c565b60808101612ad9828761286d565b612ae6602083018661287c565b612af360408301856128de565b8181036060830152612b058184612906565b9695505050505050565b60408101612b1d828561287c565b61213c60208301846128de565b6020808252810161213c8184612885565b602081016121ca82846128de565b60408101612b5782856128de565b61213c602083018461287c565b60608101612b7282866128de565b612b7f60208301856128de565b610b3b60408301846128de565b602080825281016121ca8161296d565b602080825281016121ca81612995565b602080825281016121ca816129bd565b602080825281016121ca816129e8565b602080825281016121ca81612a18565b602080825281016121ca81612a43565b602080825281016121ca81612a6b565b60608101612c0a82866128de565b612b7f602083018561287c565b60405181810167ffffffffffffffff81118282101715612c3657600080fd5b604052919050565b600067ffffffffffffffff821115612c5557600080fd5b5060209081020190565b60200190565b5190565b90815260200190565b60006121ca82612c90565b151590565b90565b60006121ca82612c72565b6001600160a01b031690565b60ff1690565b60006121ca82612c85565b82818337506000910152565b60005b83811015612cd4578181015183820152602001612cbc565b83811115612ce3576000848401525b50505050565b601f01601f191690565b612cfc81612c72565b8114612d0757600080fd5b50565b612cfc81612c7d565b612cfc81612c82565b612cfc81612c85565b612cfc81612c9c56fea365627a7a723158202382211b20407aa7cc1454ef0da1b3e1da76eb668946419ee57a4525293c828b6c6578706572696d656e74616cf564736f6c63430005100040", + "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"fallback\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"usr\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"ok\",\"type\":\"uint256\"}],\"name\":\"cdpAllow\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"apt\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"urn\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"wad\",\"type\":\"uint256\"}],\"name\":\"daiJoin_join\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"dst\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"wad\",\"type\":\"uint256\"}],\"name\":\"flux\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"},{\"internalType\":\"int256\",\"name\":\"dink\",\"type\":\"int256\"},{\"internalType\":\"int256\",\"name\":\"dart\",\"type\":\"int256\"}],\"name\":\"frob\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"}],\"name\":\"getVaultCollateral\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"ink\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"}],\"name\":\"getVaultDebt\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"debt\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"usr\",\"type\":\"address\"}],\"name\":\"give\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"dedgeMakerManagerAddress\",\"type\":\"address\"},{\"internalType\":\"address payable\",\"name\":\"dacProxyAddress\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"addressRegistryAddress\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdpId\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"executeOperationCalldataParams\",\"type\":\"bytes\"}],\"name\":\"importMakerVault\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_aaveFee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_protocolFee\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"importMakerVaultPostLoan\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"bytes32\",\"name\":\"ilk\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"usr\",\"type\":\"address\"}],\"name\":\"open\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"ethJoin\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"daiJoin\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"wadC\",\"type\":\"uint256\"}],\"name\":\"wipeAllAndFreeETH\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"manager\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"gemJoin\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"daiJoin\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"cdp\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"wadC\",\"type\":\"uint256\"}],\"name\":\"wipeAllAndFreeGem\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeMakerManager.sol\":\"DedgeMakerManager\"},\"evmVersion\":\"constantinople\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol\":{\"keccak256\":\"0xe3762e63e74657a066e6fe281ec694e366ca86f6378470304c646b4e785e09f3\",\"urls\":[\"bzz-raw://67607850cbce7ffa66356dd28412e64ff58f62fa7c709f5fa28306b8be9050a7\",\"dweb:/ipfs/QmUaFhH5a6rQ8yJG2A6zJJ1ds9txqxr8ytxd2s7bhiNX35\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/ISafeERC20.sol\":{\"keccak256\":\"0xec78efb83d1275fbeb9d431938447eaabbff72deea196deea04b4873ee5a9f54\",\"urls\":[\"bzz-raw://7b50edf0121dc6286c5b93fd7ddc85edfbb719c91faf3ffd22957436c5b4763c\",\"dweb:/ipfs/QmSRUJaEp3QP71SG1V668qzXAzEj7YezhJ6AKdNqunH6dj\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/IFlashLoanReceiver.sol\":{\"keccak256\":\"0xbd9ee17614d720229da04b4d481b2e6669b5fd9217bc278a93b39a62e2383fde\",\"urls\":[\"bzz-raw://4827232c7582d13c0237ae80b47e2f3dd85499372d80a15c0f31599bb99e26a5\",\"dweb:/ipfs/QmX3mCBdQcCvL9WF5FwToZZpj6VBtkaoN9aZ1tszp7oVjt\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol\":{\"keccak256\":\"0xe1a1b1bbf6dc92e86a23b8af9cf04e3e527b766ed1147cce041080d01ede5a24\",\"urls\":[\"bzz-raw://c0a7bf8948392f8f7249a99d39ac0722840faea5767c2f97939657e281d318f5\",\"dweb:/ipfs/QmRmSmKfgegjtAnpQ6t3ucEiq9GUrfYPpi7XucjREHjYFd\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol\":{\"keccak256\":\"0x0b99a26eeba60b8201f6ffd0d9d00bc5562ace9e7998534fd3887d7ba72b7d88\",\"urls\":[\"bzz-raw://9a36c107f3471548d6a13d28e995cb71ef42bafd55bf759b7c1b0ba0fda7170c\",\"dweb:/ipfs/Qme6SJJ3A9MwVwzk6CJC9gN8jAWLkgWQUwzZU4k6eD4BNy\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol\":{\"keccak256\":\"0x309afa791633faf166083968588cc12d10b511fea04522d9645cbd6469a6bcbe\",\"urls\":[\"bzz-raw://6ae438b67af64e89c742848ede981932ebc2b7238e2f147c8620d4048fd75885\",\"dweb:/ipfs/QmYZmAKfjvY3hS27hn1qcPBtegrQPELgc5YMXwybm5vBra\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol\":{\"keccak256\":\"0xf2fc635f3c28b641fa8dc95be41b6d7ab7f7d2bacfe9c2c37c1c0d22aac0afad\",\"urls\":[\"bzz-raw://767766022c3d3e172a71bd781eff9d92e938efc3e2d5708a90929491f2e0af15\",\"dweb:/ipfs/QmSkT4Jy2X54hYvDJG6PrX2tzdPvbK6WYtpBSJF7PDyVdp\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol\":{\"keccak256\":\"0xc69ade89655263aaffac1183c0e842ea95294171280f2c5ab755286a66de3ff9\",\"urls\":[\"bzz-raw://742ca904eaf238a83270e315410b35e83048ee0c6529190be2ae9f9bc20e6187\",\"dweb:/ipfs/QmPW3WFbHZjsGQ6vMgPRPWHCNJLNxyEbR4w1DAvd466N51\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/makerdao/IDssProxyActions.sol\":{\"keccak256\":\"0xc670eb42195a3be8cf8ea3d11f3afa457377bfd52382094f65c63182e679863f\",\"urls\":[\"bzz-raw://855acaff1c943a63987c31ee6db3362b6c85ab419046430eaf160a96c0dc70e4\",\"dweb:/ipfs/QmWEdWqVUfsYKrJcxVQ9sowhTGUsaoydpUWsQjHkFmAPHX\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol\":{\"keccak256\":\"0xde1a310030b2b654b9c1e7782e94d7f00be0172c32dc4e99a7c168dd53d72843\",\"urls\":[\"bzz-raw://6a8b12cff637c3a1b025bd90a3c75524e53207c457b770bf22800df883fff45d\",\"dweb:/ipfs/QmSJXJDH5jiCkU11Xn7KeVTMoS64xg2XQ5hWGqQhMEnrmX\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol\":{\"keccak256\":\"0x0d2a2e2c0811bd1e9e757a1a804366cef39120f7eec3bffbcd8802afbf5d6f4b\",\"urls\":[\"bzz-raw://f5d9e36f7f3c6a0771d3656a1b1088f27d82f1f242579fe71e10b2d49aaac5b9\",\"dweb:/ipfs/QmZTjArdX13p6EGRD7fZuros5Wjs52usvNbxSavbLoRgZn\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/BytesLib.sol\":{\"keccak256\":\"0x2127d94e9d0443c4f0a5a8ebd8fd8746c7ea4e4d3849e3a45c41943019571ea7\",\"urls\":[\"bzz-raw://dbe24f863129a5062658ec1e6bc2695d7427dd8783aec86903125867f6343a4f\",\"dweb:/ipfs/QmfX7eArFhPnTa1bwjpfse3ni6EapoHfzuhdXxMxKU8kNb\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/aave/FlashLoanReceiverBase.sol\":{\"keccak256\":\"0x0a3802a7d1bf99d7ccb8046f2632f0a3fa42ebea5e1033cc13eb843b32cbf4c3\",\"urls\":[\"bzz-raw://68a6bcf9ccfe8d72448c3d3dadd328b14a741ba9d24e5aa20ad82b72c7108a7b\",\"dweb:/ipfs/QmeprLqp3jFqbxmNwuZ8Vm2EdeKp5idQZi4VSCLQZa28qY\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Auth.sol\":{\"keccak256\":\"0x7636abae52593354ed288e67b6c2e5e1df218f753f6c253ae691cb5252274cf1\",\"urls\":[\"bzz-raw://d66e47ce74476c103bb8a1b11d618232276d4b57badfd7d96a45e9c881e83543\",\"dweb:/ipfs/QmXMWVNLRdiBHmnTx1c2DFvidnXpFuiy4CMh2T2avWEQ2h\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol\":{\"keccak256\":\"0xf38f1b725d7568da1b3a210190566e00daa3f241accba9fd6a906ae48e62b151\",\"urls\":[\"bzz-raw://83abf26fe875dd5599abfa2c9b387cb3ce7e70b4fe3ae0b3e2127f807b708ea1\",\"dweb:/ipfs/QmRntwBkLrh8SosWWsM1aC2cP7wMswCPuBKLmJzgQB1xeY\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Note.sol\":{\"keccak256\":\"0xc1440658c9e69c115e90b60f1a3b424155d9f0fa495a689bce0a202d8daf1df7\",\"urls\":[\"bzz-raw://dc3c2c615db44839d9353908fa2935cab29e0739ef559f00397724b904e5187f\",\"dweb:/ipfs/Qma5uk2NoqVnZgZF3fCXPRfkZMbxfEKuYo6NABq79We1t1\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Proxy.sol\":{\"keccak256\":\"0x36bff82bc9233b5ee86b50df83efb4915c50d3c5716e9bc463b290ab87a4b6bb\",\"urls\":[\"bzz-raw://486f7dfeaa00779677f8e139c54fb3f7f8043f66fe344ec35bd5d3873205f77e\",\"dweb:/ipfs/QmUVwqSEod9L97Cqz1fPv9jXPescnR4vNXAm4zdf2gZmgv\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol\":{\"keccak256\":\"0x8465bf916f7fbb622bfd0e4d5448effe0f1d056c267a733ce386f739ccf5916e\",\"urls\":[\"bzz-raw://106f1c87e4524a908bb1807951b2e1048797eba0f36604c119eaa4c9e0d0e2ab\",\"dweb:/ipfs/QmRofckMx8B6rP6eRDxKvmSkgo7ipamVDwPYptUfevmMCD\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapBase.sol\":{\"keccak256\":\"0x2f6d78b485392995fd2deb695a6983e82971feaf2ba629474d4ee0c5ee769614\",\"urls\":[\"bzz-raw://feca374d541b17754aecc30a9a5312de3ad406597df1d4c8b4f123bb8bca8036\",\"dweb:/ipfs/QmYdtfcTp4Dvozfa3PpLaWTxg8WnzQiie2cVnq5QPUD1CJ\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeMakerManager.sol\":{\"keccak256\":\"0x668fd43717315e1be5bf188d316d6a01e0560a42cde699a9b9d56b22436ddf1c\",\"urls\":[\"bzz-raw://082390efee5a477860b87da8f35543903746cf831fc209a39ddf06075e2438f9\",\"dweb:/ipfs/QmTVQdmTzZyLvwBX81ic73BUiCPwMaZEVEgMxomaC4UWXG\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol\":{\"keccak256\":\"0xfcd524540f6e01a5ef58192d42d87d296fad5a0d13dd883c1b5b604435befd97\",\"urls\":[\"bzz-raw://398eb7da5785008a974d476886bf95ed1793b4e5f19b56735dba4f998217ad75\",\"dweb:/ipfs/QmQtViYpthTUNzdgv4AEhSW6wMFneE5AdLerMf4q5eWWzN\"]},\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol\":{\"keccak256\":\"0x0f9a1a23e6eabb0a3cd78e2e2a0b23b15f8d175ab02d71aac63eb6e38fb82657\",\"urls\":[\"bzz-raw://6cdf61439a849257726d6fe87cc5455c008763485170f2609ed477a3f3dc0d68\",\"dweb:/ipfs/QmbLvvK3AmCaSKPXSnHNsd5iWMFzCr9HEd4cPmbPLZxZKs\"]},\"@openzeppelin/contracts/math/SafeMath.sol\":{\"keccak256\":\"0x640b6dee7a4b830bdfd52b5031a07fc2b12209f5b2e29e5d364a7d37f69d8076\",\"urls\":[\"bzz-raw://31113152e1ddb78fe7a4197f247591ca894e93f916867beb708d8e747b6cc74f\",\"dweb:/ipfs/QmbZaJyXdpsYGykVhHH9qpVGQg9DGCxE2QufbCUy3daTgq\"]},\"@openzeppelin/contracts/utils/Address.sol\":{\"keccak256\":\"0x1a8e5072509c5ea7365eb1d48030b9be865140c8fb779968da0a459a0e174a11\",\"urls\":[\"bzz-raw://03335b7b07c7c8c8d613cfdd8ec39a0b5ec133ee510bf2fe6cc5a496767bef4b\",\"dweb:/ipfs/Qmebp4nzPja645c9yXSdJkGq96oU3am3LUnG2K3R7XxyKf\"]}},\"version\":1}", + "bytecode": "0x608060405234801561001057600080fd5b50612d71806100206000396000f3fe6080604052600436106100a75760003560e01c80636d68b70b116100645780636d68b70b1461017f57806396e8d72c1461019f578063ba727a95146101bf578063bcd6deec146101df578063c56167c6146101ff578063ddd927b21461021f576100a7565b8063131fb710146100a95780631558b048146100c95780631d10f231146100e95780633edec14e1461010957806361d2d7dc1461013f5780636aa3ee111461015f575b005b3480156100b557600080fd5b506100a76100c4366004612422565b61023f565b3480156100d557600080fd5b506100a76100e43660046125f1565b6105df565b3480156100f557600080fd5b506100a7610104366004612574565b610647565b34801561011557600080fd5b506101296101243660046125b7565b6106ac565b6040516101369190612b3b565b60405180910390f35b34801561014b57600080fd5b5061012961015a3660046125b7565b6108b9565b34801561016b57600080fd5b5061012961017a366004612574565b610ab8565b34801561018b57600080fd5b506100a761019a3660046124b2565b610b43565b3480156101ab57600080fd5b506100a76101ba366004612652565b610eac565b3480156101cb57600080fd5b506100a76101da3660046125f1565b610edc565b3480156101eb57600080fd5b506100a76101fa3660046124b2565b610f0c565b34801561020b57600080fd5b506100a761021a366004612527565b6111b4565b34801561022b57600080fd5b506100a761023a366004612773565b6112b4565b60008490506000816001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561027f57600080fd5b505afa158015610293573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506102b79190810190612404565b905060006102c582876106ac565b90506060896040516020016102da9190612abd565b60408051601f19818403018152908290526102fb9188908890602001612a9b565b60405160208183030381529060405290506000846001600160a01b0316633f6dc33b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561034757600080fd5b505afa15801561035b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061037f9190810190612404565b6001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156103b757600080fd5b505afa1580156103cb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506103ef9190810190612404565b905061046e856001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561042d57600080fd5b505afa158015610441573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104659190810190612404565b898d6001610edc565b6104788a82611c47565b806001600160a01b0316635cffe9de8b876001600160a01b031663ee2a94116040518163ffffffff1660e01b815260040160206040518083038186803b1580156104c157600080fd5b505afa1580156104d5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104f99190810190612404565b86866040518563ffffffff1660e01b815260040161051a9493929190612acb565b600060405180830381600087803b15801561053457600080fd5b505af1158015610548573d6000803e3d6000fd5b505050506105c8856001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561058857600080fd5b505afa15801561059c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506105c09190810190612404565b896001610647565b6105d28a82611dde565b5050505050505050505050565b6040516313771f0760e31b81526001600160a01b03851690639bb8f8389061060f90869086908690600401612bfc565b600060405180830381600087803b15801561062957600080fd5b505af115801561063d573d6000803e3d6000fd5b5050505050505050565b604051631f95f98d60e31b81526001600160a01b0384169063fcafcc68906106759085908590600401612b49565b600060405180830381600087803b15801561068f57600080fd5b505af11580156106a3573d6000803e3d6000fd5b50505050505050565b600080836001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b1580156106e857600080fd5b505afa1580156106fc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107209190810190612404565b90506000846001600160a01b0316632726b073856040518263ffffffff1660e01b81526004016107509190612b3b565b60206040518083038186803b15801561076857600080fd5b505afa15801561077c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107a09190810190612404565b90506000856001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b81526004016107d09190612b3b565b60206040518083038186803b1580156107e857600080fd5b505afa1580156107fc573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061082091908101906126e9565b90506000866001600160a01b0316638161b120876040518263ffffffff1660e01b81526004016108509190612b3b565b60206040518083038186803b15801561086857600080fd5b505afa15801561087c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506108a09190810190612404565b90506108ae84828585611eae565b979650505050505050565b600080836001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b1580156108f557600080fd5b505afa158015610909573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061092d9190810190612404565b90506000846001600160a01b0316632726b073856040518263ffffffff1660e01b815260040161095d9190612b3b565b60206040518083038186803b15801561097557600080fd5b505afa158015610989573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109ad9190810190612404565b90506000856001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b81526004016109dd9190612b3b565b60206040518083038186803b1580156109f557600080fd5b505afa158015610a09573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610a2d91908101906126e9565b6040516309092f9760e21b81529091506001600160a01b03841690632424be5c90610a5e9084908690600401612b49565b604080518083038186803b158015610a7557600080fd5b505afa158015610a89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610aad9190810190612743565b509695505050505050565b604051636090dec560e01b81526000906001600160a01b03851690636090dec590610ae99086908690600401612b49565b602060405180830381600087803b158015610b0357600080fd5b505af1158015610b17573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b3b91908101906126e9565b949350505050565b6000856001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b158015610b7e57600080fd5b505afa158015610b92573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610bb69190810190612404565b90506000866001600160a01b0316632726b073856040518263ffffffff1660e01b8152600401610be69190612b3b565b60206040518083038186803b158015610bfe57600080fd5b505afa158015610c12573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610c369190810190612404565b90506000876001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b8152600401610c669190612b3b565b60206040518083038186803b158015610c7e57600080fd5b505afa158015610c92573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610cb691908101906126e9565b90506000836001600160a01b0316632424be5c83856040518363ffffffff1660e01b8152600401610ce8929190612b49565b604080518083038186803b158015610cff57600080fd5b505afa158015610d13573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610d379190810190612743565b915050610d4b878461021a87878888611eae565b610d658987610d5988612091565b60000384600003610eac565b610d71898730886105df565b60405163ef693bed60e01b81526001600160a01b0389169063ef693bed90610d9f9030908990600401612b0f565b600060405180830381600087803b158015610db957600080fd5b505af1158015610dcd573d6000803e3d6000fd5b50505050876001600160a01b0316637bd2bea76040518163ffffffff1660e01b8152600401602060405180830381600087803b158015610e0c57600080fd5b505af1158015610e20573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610e449190810190612707565b6001600160a01b0316632e1a7d4d866040518263ffffffff1660e01b8152600401610e6f9190612b3b565b600060405180830381600087803b158015610e8957600080fd5b505af1158015610e9d573d6000803e3d6000fd5b50505050505050505050505050565b6040516345e6bdcd60e01b81526001600160a01b038516906345e6bdcd9061060f90869086908690600401612b64565b6040516305b1fdb160e11b81526001600160a01b03851690630b63fb629061060f90869086908690600401612bfc565b6000856001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b158015610f4757600080fd5b505afa158015610f5b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610f7f9190810190612404565b90506000866001600160a01b0316632726b073856040518263ffffffff1660e01b8152600401610faf9190612b3b565b60206040518083038186803b158015610fc757600080fd5b505afa158015610fdb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610fff9190810190612404565b90506000876001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b815260040161102f9190612b3b565b60206040518083038186803b15801561104757600080fd5b505afa15801561105b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061107f91908101906126e9565b90506000836001600160a01b0316632424be5c83856040518363ffffffff1660e01b81526004016110b1929190612b49565b604080518083038186803b1580156110c857600080fd5b505afa1580156110dc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506111009190810190612743565b915050611114878461021a87878888611eae565b600061112089876120b8565b905061113c8a8861113084612091565b60000385600003610eac565b6111488a8830846105df565b60405163ef693bed60e01b81526001600160a01b038a169063ef693bed906111769030908a90600401612b0f565b600060405180830381600087803b15801561119057600080fd5b505af11580156111a4573d6000803e3d6000fd5b5050505050505050505050505050565b826001600160a01b031663f4b9fa756040518163ffffffff1660e01b8152600401602060405180830381600087803b1580156111ef57600080fd5b505af1158015611203573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506112279190810190612707565b6001600160a01b031663095ea7b384836040518363ffffffff1660e01b8152600401611254929190612b0f565b600060405180830381600087803b15801561126e57600080fd5b505af1158015611282573d6000803e3d6000fd5b5050604051633b4da69f60e01b81526001600160a01b0386169250633b4da69f91506106759085908590600401612b0f565b84840183016112c161223e565b6112cd83850185612725565b90506000816000015190506000816001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561131357600080fd5b505afa158015611327573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061134b9190810190612404565b905060008360400151905060006113668386602001516108b9565b604080516002808252606080830184529394509091602083019080388339019050509050828160008151811061139857fe5b60200260200101906001600160a01b031690816001600160a01b031681525050846001600160a01b031663b29ced066040518163ffffffff1660e01b815260040160206040518083038186803b1580156113f157600080fd5b505afa158015611405573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506114299190810190612404565b8160018151811061143657fe5b60200260200101906001600160a01b031690816001600160a01b0316815250506060856001600160a01b031663bd020fbc6040518163ffffffff1660e01b815260040160206040518083038186803b15801561149157600080fd5b505afa1580156114a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506114c99190810190612404565b6001600160a01b031663c2998238836040518263ffffffff1660e01b81526004016114f49190612b2a565b600060405180830381600087803b15801561150e57600080fd5b505af1158015611522573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261154a9190810190612696565b90508060008151811061155957fe5b60200260200101516000146115895760405162461bcd60e51b815260040161158090612bbc565b60405180910390fd5b8060018151811061159657fe5b60200260200101516000146115bd5760405162461bcd60e51b815260040161158090612bec565b6020870151604051632c2cb9fd60e01b8152644554482d4160d81b916001600160a01b03881691632c2cb9fd916115f691600401612b3b565b60206040518083038186803b15801561160e57600080fd5b505afa158015611622573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061164691908101906126e9565b14156119115761173d85876001600160a01b0316638ec9f15f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561168957600080fd5b505afa15801561169d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506116c19190810190612404565b886001600160a01b031663ac92d52b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156116fa57600080fd5b505afa15801561170e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506117329190810190612404565b8a6020015187610b43565b856001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561177657600080fd5b505afa15801561178a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506117ae9190810190612404565b6001600160a01b0316631249c58b846040518263ffffffff1660e01b81526004016000604051808303818588803b1580156117e857600080fd5b505af11580156117fc573d6000803e3d6000fd5b5050505050856001600160a01b031663b29ced066040518163ffffffff1660e01b815260040160206040518083038186803b15801561183a57600080fd5b505afa15801561184e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506118729190810190612404565b6001600160a01b031663c5ebeaec896040518263ffffffff1660e01b815260040161189d9190612b3b565b602060405180830381600087803b1580156118b757600080fd5b505af11580156118cb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506118ef91908101906126e9565b1561190c5760405162461bcd60e51b815260040161158090612bac565b610e9d565b61199e858860600151886001600160a01b031663ac92d52b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561195357600080fd5b505afa158015611967573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061198b9190810190612404565b8a602001516101fa8c6060015189612143565b60006119ae8489608001516121d0565b9050846001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156119e957600080fd5b505afa1580156119fd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611a219190810190612404565b6001600160a01b031663095ea7b386836040518363ffffffff1660e01b8152600401611a4e929190612b0f565b602060405180830381600087803b158015611a6857600080fd5b505af1158015611a7c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611aa091908101906126cb565b5060405163140e25ad60e31b81526001600160a01b0386169063a0712d6890611acd908490600401612b3b565b602060405180830381600087803b158015611ae757600080fd5b505af1158015611afb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611b1f91908101906126e9565b15611b3c5760405162461bcd60e51b815260040161158090612bcc565b866001600160a01b031663b29ced066040518163ffffffff1660e01b815260040160206040518083038186803b158015611b7557600080fd5b505afa158015611b89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611bad9190810190612404565b6001600160a01b031663c5ebeaec8a6040518263ffffffff1660e01b8152600401611bd89190612b3b565b602060405180830381600087803b158015611bf257600080fd5b505af1158015611c06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611c2a91908101906126e9565b156111a45760405162461bcd60e51b815260040161158090612bac565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b158015611c8257600080fd5b505afa158015611c96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611cba9190810190612707565b9050806001600160a01b031663f0217ce58360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d1757600080fd5b505afa158015611d2b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611d4f91908101906126e9565b846001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d8857600080fd5b505afa158015611d9c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611dc091908101906126e9565b6040518463ffffffff1660e01b815260040161067593929190612b64565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b158015611e1957600080fd5b505afa158015611e2d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611e519190810190612707565b9050806001600160a01b03166379d88d878360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d1757600080fd5b600080856001600160a01b031663d9638d36846040518263ffffffff1660e01b8152600401611edd9190612b3b565b60a06040518083038186803b158015611ef557600080fd5b505afa158015611f09573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611f2d91908101906127f1565b5050509150506000866001600160a01b0316632424be5c85876040518363ffffffff1660e01b8152600401611f63929190612b49565b604080518083038186803b158015611f7a57600080fd5b505afa158015611f8e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611fb29190810190612743565b9150506000876001600160a01b0316636c25b346886040518263ffffffff1660e01b8152600401611fe39190612abd565b60206040518083038186803b158015611ffb57600080fd5b505afa15801561200f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061203391908101906126e9565b9050600061204a61204484866121e4565b8361221b565b90506b033b2e3c9fd0803ce80000008104945080612074866b033b2e3c9fd0803ce80000006121e4565b1061207f5784612084565b846001015b9998505050505050505050565b8060008112156120b35760405162461bcd60e51b815260040161158090612bdc565b919050565b600061213c82846001600160a01b031663b3bcfa826040518163ffffffff1660e01b8152600401602060405180830381600087803b1580156120f957600080fd5b505af115801561210d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061213191908101906126e9565b601203600a0a6121e4565b9392505050565b6000826001600160a01b031663b3bcfa826040518163ffffffff1660e01b8152600401602060405180830381600087803b15801561218057600080fd5b505af1158015612194573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506121b891908101906126e9565b601203600a0a82816121c657fe5b0490505b92915050565b60008160ff16601203600a0a83816121c657fe5b60008115806121ff575050808202828282816121fc57fe5b04145b6121ca5760405162461bcd60e51b815260040161158090612b8c565b808203828111156121ca5760405162461bcd60e51b815260040161158090612b9c565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915290565b80356121ca81612cf3565b80516121ca81612cf3565b600082601f83011261229357600080fd5b81516122a66122a182612c3e565b612c17565b915081818352602084019350602081019050838560208402820111156122cb57600080fd5b60005b838110156122f757816122e18882612317565b84525060209283019291909101906001016122ce565b5050505092915050565b80516121ca81612d0a565b80356121ca81612d13565b80516121ca81612d13565b60008083601f84011261233457600080fd5b50813567ffffffffffffffff81111561234c57600080fd5b60208301915083600182028301111561236457600080fd5b9250929050565b80516121ca81612d1c565b600060a0828403121561238857600080fd5b61239260a0612c17565b905060006123a0848461226c565b82525060206123b18484830161230c565b60208301525060406123c58482850161226c565b60408301525060606123d98482850161226c565b60608301525060806123ed848285016123f9565b60808301525092915050565b80356121ca81612d25565b60006020828403121561241657600080fd5b6000610b3b8484612277565b60008060008060008060a0878903121561243b57600080fd5b6000612447898961226c565b965050602061245889828a0161226c565b955050604061246989828a0161226c565b945050606061247a89828a0161230c565b935050608087013567ffffffffffffffff81111561249757600080fd5b6124a389828a01612322565b92509250509295509295509295565b600080600080600060a086880312156124ca57600080fd5b60006124d6888861226c565b95505060206124e78882890161226c565b94505060406124f88882890161226c565b93505060606125098882890161230c565b925050608061251a8882890161230c565b9150509295509295909350565b60008060006060848603121561253c57600080fd5b6000612548868661226c565b93505060206125598682870161226c565b925050604061256a8682870161230c565b9150509250925092565b60008060006060848603121561258957600080fd5b6000612595868661226c565b93505060206125a68682870161230c565b925050604061256a8682870161226c565b600080604083850312156125ca57600080fd5b60006125d6858561226c565b92505060206125e78582860161230c565b9150509250929050565b6000806000806080858703121561260757600080fd5b6000612613878761226c565b94505060206126248782880161230c565b93505060406126358782880161226c565b92505060606126468782880161230c565b91505092959194509250565b6000806000806080858703121561266857600080fd5b6000612674878761226c565b94505060206126858782880161230c565b93505060406126358782880161230c565b6000602082840312156126a857600080fd5b815167ffffffffffffffff8111156126bf57600080fd5b610b3b84828501612282565b6000602082840312156126dd57600080fd5b6000610b3b8484612301565b6000602082840312156126fb57600080fd5b6000610b3b8484612317565b60006020828403121561271957600080fd5b6000610b3b848461236b565b600060a0828403121561273757600080fd5b6000610b3b8484612376565b6000806040838503121561275657600080fd5b60006127628585612317565b92505060206125e785828601612317565b60008060008060006080868803121561278b57600080fd5b6000612797888861230c565b95505060206127a88882890161230c565b94505060406127b98882890161230c565b935050606086013567ffffffffffffffff8111156127d657600080fd5b6127e288828901612322565b92509250509295509295909350565b600080600080600060a0868803121561280957600080fd5b60006128158888612317565b955050602061282688828901612317565b945050604061283788828901612317565b935050606061284888828901612317565b925050608061251a88828901612317565b6000612865838361287c565b505060200190565b61287681612ca2565b82525050565b61287681612c72565b600061289082612c65565b61289a8185612c69565b93506128a583612c5f565b8060005b838110156128d35781516128bd8882612859565b97506128c883612c5f565b9250506001016128a9565b509495945050505050565b61287681612c82565b60006128f383856120b3565b9350612900838584612cad565b50500190565b600061291182612c65565b61291b8185612c69565b935061292b818560208601612cb9565b61293481612ce9565b9093019392505050565b600061294982612c65565b61295381856120b3565b9350612963818560208601612cb9565b9290920192915050565b600061297a600c83612c69565b6b6d756c2d6f766572666c6f7760a01b815260200192915050565b60006129a2600c83612c69565b6b7375622d6f766572666c6f7760a01b815260200192915050565b60006129ca600f83612c69565b6e19185a4b589bdc9c9bddcb59985a5b608a1b815260200192915050565b60006129f5601483612c69565b731b5adc8b595b9d195c8b59d95b4b59985a5b195960621b815260200192915050565b6000612a25600f83612c69565b6e19d95b4b5cdd5c1c1b1e4b59985a5b608a1b815260200192915050565b6000612a50600c83612c69565b6b696e742d6f766572666c6f7760a01b815260200192915050565b6000612a78601483612c69565b731b5adc8b595b9d195c8b59185a4b59985a5b195960621b815260200192915050565b6000612aa7828661293e565b9150612ab48284866128e7565b95945050505050565b602081016121ca828461287c565b60808101612ad9828761286d565b612ae6602083018661287c565b612af360408301856128de565b8181036060830152612b058184612906565b9695505050505050565b60408101612b1d828561287c565b61213c60208301846128de565b6020808252810161213c8184612885565b602081016121ca82846128de565b60408101612b5782856128de565b61213c602083018461287c565b60608101612b7282866128de565b612b7f60208301856128de565b610b3b60408301846128de565b602080825281016121ca8161296d565b602080825281016121ca81612995565b602080825281016121ca816129bd565b602080825281016121ca816129e8565b602080825281016121ca81612a18565b602080825281016121ca81612a43565b602080825281016121ca81612a6b565b60608101612c0a82866128de565b612b7f602083018561287c565b60405181810167ffffffffffffffff81118282101715612c3657600080fd5b604052919050565b600067ffffffffffffffff821115612c5557600080fd5b5060209081020190565b60200190565b5190565b90815260200190565b60006121ca82612c90565b151590565b90565b60006121ca82612c72565b6001600160a01b031690565b60ff1690565b60006121ca82612c85565b82818337506000910152565b60005b83811015612cd4578181015183820152602001612cbc565b83811115612ce3576000848401525b50505050565b601f01601f191690565b612cfc81612c72565b8114612d0757600080fd5b50565b612cfc81612c7d565b612cfc81612c82565b612cfc81612c85565b612cfc81612c9c56fea365627a7a72315820b7290f9ca9156c1a63424e5933bfe3bb7ce4c9e808d7df6e46c440382958b9996c6578706572696d656e74616cf564736f6c63430005100040", + "deployedBytecode": "0x6080604052600436106100a75760003560e01c80636d68b70b116100645780636d68b70b1461017f57806396e8d72c1461019f578063ba727a95146101bf578063bcd6deec146101df578063c56167c6146101ff578063ddd927b21461021f576100a7565b8063131fb710146100a95780631558b048146100c95780631d10f231146100e95780633edec14e1461010957806361d2d7dc1461013f5780636aa3ee111461015f575b005b3480156100b557600080fd5b506100a76100c4366004612422565b61023f565b3480156100d557600080fd5b506100a76100e43660046125f1565b6105df565b3480156100f557600080fd5b506100a7610104366004612574565b610647565b34801561011557600080fd5b506101296101243660046125b7565b6106ac565b6040516101369190612b3b565b60405180910390f35b34801561014b57600080fd5b5061012961015a3660046125b7565b6108b9565b34801561016b57600080fd5b5061012961017a366004612574565b610ab8565b34801561018b57600080fd5b506100a761019a3660046124b2565b610b43565b3480156101ab57600080fd5b506100a76101ba366004612652565b610eac565b3480156101cb57600080fd5b506100a76101da3660046125f1565b610edc565b3480156101eb57600080fd5b506100a76101fa3660046124b2565b610f0c565b34801561020b57600080fd5b506100a761021a366004612527565b6111b4565b34801561022b57600080fd5b506100a761023a366004612773565b6112b4565b60008490506000816001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561027f57600080fd5b505afa158015610293573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506102b79190810190612404565b905060006102c582876106ac565b90506060896040516020016102da9190612abd565b60408051601f19818403018152908290526102fb9188908890602001612a9b565b60405160208183030381529060405290506000846001600160a01b0316633f6dc33b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561034757600080fd5b505afa15801561035b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061037f9190810190612404565b6001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156103b757600080fd5b505afa1580156103cb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506103ef9190810190612404565b905061046e856001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561042d57600080fd5b505afa158015610441573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104659190810190612404565b898d6001610edc565b6104788a82611c47565b806001600160a01b0316635cffe9de8b876001600160a01b031663ee2a94116040518163ffffffff1660e01b815260040160206040518083038186803b1580156104c157600080fd5b505afa1580156104d5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506104f99190810190612404565b86866040518563ffffffff1660e01b815260040161051a9493929190612acb565b600060405180830381600087803b15801561053457600080fd5b505af1158015610548573d6000803e3d6000fd5b505050506105c8856001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561058857600080fd5b505afa15801561059c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506105c09190810190612404565b896001610647565b6105d28a82611dde565b5050505050505050505050565b6040516313771f0760e31b81526001600160a01b03851690639bb8f8389061060f90869086908690600401612bfc565b600060405180830381600087803b15801561062957600080fd5b505af115801561063d573d6000803e3d6000fd5b5050505050505050565b604051631f95f98d60e31b81526001600160a01b0384169063fcafcc68906106759085908590600401612b49565b600060405180830381600087803b15801561068f57600080fd5b505af11580156106a3573d6000803e3d6000fd5b50505050505050565b600080836001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b1580156106e857600080fd5b505afa1580156106fc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107209190810190612404565b90506000846001600160a01b0316632726b073856040518263ffffffff1660e01b81526004016107509190612b3b565b60206040518083038186803b15801561076857600080fd5b505afa15801561077c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506107a09190810190612404565b90506000856001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b81526004016107d09190612b3b565b60206040518083038186803b1580156107e857600080fd5b505afa1580156107fc573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061082091908101906126e9565b90506000866001600160a01b0316638161b120876040518263ffffffff1660e01b81526004016108509190612b3b565b60206040518083038186803b15801561086857600080fd5b505afa15801561087c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506108a09190810190612404565b90506108ae84828585611eae565b979650505050505050565b600080836001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b1580156108f557600080fd5b505afa158015610909573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061092d9190810190612404565b90506000846001600160a01b0316632726b073856040518263ffffffff1660e01b815260040161095d9190612b3b565b60206040518083038186803b15801561097557600080fd5b505afa158015610989573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506109ad9190810190612404565b90506000856001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b81526004016109dd9190612b3b565b60206040518083038186803b1580156109f557600080fd5b505afa158015610a09573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610a2d91908101906126e9565b6040516309092f9760e21b81529091506001600160a01b03841690632424be5c90610a5e9084908690600401612b49565b604080518083038186803b158015610a7557600080fd5b505afa158015610a89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610aad9190810190612743565b509695505050505050565b604051636090dec560e01b81526000906001600160a01b03851690636090dec590610ae99086908690600401612b49565b602060405180830381600087803b158015610b0357600080fd5b505af1158015610b17573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610b3b91908101906126e9565b949350505050565b6000856001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b158015610b7e57600080fd5b505afa158015610b92573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610bb69190810190612404565b90506000866001600160a01b0316632726b073856040518263ffffffff1660e01b8152600401610be69190612b3b565b60206040518083038186803b158015610bfe57600080fd5b505afa158015610c12573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610c369190810190612404565b90506000876001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b8152600401610c669190612b3b565b60206040518083038186803b158015610c7e57600080fd5b505afa158015610c92573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610cb691908101906126e9565b90506000836001600160a01b0316632424be5c83856040518363ffffffff1660e01b8152600401610ce8929190612b49565b604080518083038186803b158015610cff57600080fd5b505afa158015610d13573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610d379190810190612743565b915050610d4b878461021a87878888611eae565b610d658987610d5988612091565b60000384600003610eac565b610d71898730886105df565b60405163ef693bed60e01b81526001600160a01b0389169063ef693bed90610d9f9030908990600401612b0f565b600060405180830381600087803b158015610db957600080fd5b505af1158015610dcd573d6000803e3d6000fd5b50505050876001600160a01b0316637bd2bea76040518163ffffffff1660e01b8152600401602060405180830381600087803b158015610e0c57600080fd5b505af1158015610e20573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610e449190810190612707565b6001600160a01b0316632e1a7d4d866040518263ffffffff1660e01b8152600401610e6f9190612b3b565b600060405180830381600087803b158015610e8957600080fd5b505af1158015610e9d573d6000803e3d6000fd5b50505050505050505050505050565b6040516345e6bdcd60e01b81526001600160a01b038516906345e6bdcd9061060f90869086908690600401612b64565b6040516305b1fdb160e11b81526001600160a01b03851690630b63fb629061060f90869086908690600401612bfc565b6000856001600160a01b03166336569e776040518163ffffffff1660e01b815260040160206040518083038186803b158015610f4757600080fd5b505afa158015610f5b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610f7f9190810190612404565b90506000866001600160a01b0316632726b073856040518263ffffffff1660e01b8152600401610faf9190612b3b565b60206040518083038186803b158015610fc757600080fd5b505afa158015610fdb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610fff9190810190612404565b90506000876001600160a01b0316632c2cb9fd866040518263ffffffff1660e01b815260040161102f9190612b3b565b60206040518083038186803b15801561104757600080fd5b505afa15801561105b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061107f91908101906126e9565b90506000836001600160a01b0316632424be5c83856040518363ffffffff1660e01b81526004016110b1929190612b49565b604080518083038186803b1580156110c857600080fd5b505afa1580156110dc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506111009190810190612743565b915050611114878461021a87878888611eae565b600061112089876120b8565b905061113c8a8861113084612091565b60000385600003610eac565b6111488a8830846105df565b60405163ef693bed60e01b81526001600160a01b038a169063ef693bed906111769030908a90600401612b0f565b600060405180830381600087803b15801561119057600080fd5b505af11580156111a4573d6000803e3d6000fd5b5050505050505050505050505050565b826001600160a01b031663f4b9fa756040518163ffffffff1660e01b8152600401602060405180830381600087803b1580156111ef57600080fd5b505af1158015611203573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506112279190810190612707565b6001600160a01b031663095ea7b384836040518363ffffffff1660e01b8152600401611254929190612b0f565b600060405180830381600087803b15801561126e57600080fd5b505af1158015611282573d6000803e3d6000fd5b5050604051633b4da69f60e01b81526001600160a01b0386169250633b4da69f91506106759085908590600401612b0f565b84840183016112c161223e565b6112cd83850185612725565b90506000816000015190506000816001600160a01b0316635ed75a2f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561131357600080fd5b505afa158015611327573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061134b9190810190612404565b905060008360400151905060006113668386602001516108b9565b604080516002808252606080830184529394509091602083019080388339019050509050828160008151811061139857fe5b60200260200101906001600160a01b031690816001600160a01b031681525050846001600160a01b031663b29ced066040518163ffffffff1660e01b815260040160206040518083038186803b1580156113f157600080fd5b505afa158015611405573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506114299190810190612404565b8160018151811061143657fe5b60200260200101906001600160a01b031690816001600160a01b0316815250506060856001600160a01b031663bd020fbc6040518163ffffffff1660e01b815260040160206040518083038186803b15801561149157600080fd5b505afa1580156114a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506114c99190810190612404565b6001600160a01b031663c2998238836040518263ffffffff1660e01b81526004016114f49190612b2a565b600060405180830381600087803b15801561150e57600080fd5b505af1158015611522573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261154a9190810190612696565b90508060008151811061155957fe5b60200260200101516000146115895760405162461bcd60e51b815260040161158090612bbc565b60405180910390fd5b8060018151811061159657fe5b60200260200101516000146115bd5760405162461bcd60e51b815260040161158090612bec565b6020870151604051632c2cb9fd60e01b8152644554482d4160d81b916001600160a01b03881691632c2cb9fd916115f691600401612b3b565b60206040518083038186803b15801561160e57600080fd5b505afa158015611622573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061164691908101906126e9565b14156119115761173d85876001600160a01b0316638ec9f15f6040518163ffffffff1660e01b815260040160206040518083038186803b15801561168957600080fd5b505afa15801561169d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506116c19190810190612404565b886001600160a01b031663ac92d52b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156116fa57600080fd5b505afa15801561170e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506117329190810190612404565b8a6020015187610b43565b856001600160a01b031663744d27126040518163ffffffff1660e01b815260040160206040518083038186803b15801561177657600080fd5b505afa15801561178a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506117ae9190810190612404565b6001600160a01b0316631249c58b846040518263ffffffff1660e01b81526004016000604051808303818588803b1580156117e857600080fd5b505af11580156117fc573d6000803e3d6000fd5b5050505050856001600160a01b031663b29ced066040518163ffffffff1660e01b815260040160206040518083038186803b15801561183a57600080fd5b505afa15801561184e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506118729190810190612404565b6001600160a01b031663c5ebeaec896040518263ffffffff1660e01b815260040161189d9190612b3b565b602060405180830381600087803b1580156118b757600080fd5b505af11580156118cb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506118ef91908101906126e9565b1561190c5760405162461bcd60e51b815260040161158090612bac565b610e9d565b61199e858860600151886001600160a01b031663ac92d52b6040518163ffffffff1660e01b815260040160206040518083038186803b15801561195357600080fd5b505afa158015611967573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061198b9190810190612404565b8a602001516101fa8c6060015189612143565b60006119ae8489608001516121d0565b9050846001600160a01b0316636f307dc36040518163ffffffff1660e01b815260040160206040518083038186803b1580156119e957600080fd5b505afa1580156119fd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611a219190810190612404565b6001600160a01b031663095ea7b386836040518363ffffffff1660e01b8152600401611a4e929190612b0f565b602060405180830381600087803b158015611a6857600080fd5b505af1158015611a7c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611aa091908101906126cb565b5060405163140e25ad60e31b81526001600160a01b0386169063a0712d6890611acd908490600401612b3b565b602060405180830381600087803b158015611ae757600080fd5b505af1158015611afb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611b1f91908101906126e9565b15611b3c5760405162461bcd60e51b815260040161158090612bcc565b866001600160a01b031663b29ced066040518163ffffffff1660e01b815260040160206040518083038186803b158015611b7557600080fd5b505afa158015611b89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611bad9190810190612404565b6001600160a01b031663c5ebeaec8a6040518263ffffffff1660e01b8152600401611bd89190612b3b565b602060405180830381600087803b158015611bf257600080fd5b505af1158015611c06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611c2a91908101906126e9565b156111a45760405162461bcd60e51b815260040161158090612bac565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b158015611c8257600080fd5b505afa158015611c96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611cba9190810190612707565b9050806001600160a01b031663f0217ce58360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d1757600080fd5b505afa158015611d2b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611d4f91908101906126e9565b846001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d8857600080fd5b505afa158015611d9c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611dc091908101906126e9565b6040518463ffffffff1660e01b815260040161067593929190612b64565b6000826001600160a01b031663bf7e214f6040518163ffffffff1660e01b815260040160206040518083038186803b158015611e1957600080fd5b505afa158015611e2d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611e519190810190612707565b9050806001600160a01b03166379d88d878360601b6bffffffffffffffffffffffff1916836001600160a01b031663a8542f666040518163ffffffff1660e01b815260040160206040518083038186803b158015611d1757600080fd5b600080856001600160a01b031663d9638d36846040518263ffffffff1660e01b8152600401611edd9190612b3b565b60a06040518083038186803b158015611ef557600080fd5b505afa158015611f09573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611f2d91908101906127f1565b5050509150506000866001600160a01b0316632424be5c85876040518363ffffffff1660e01b8152600401611f63929190612b49565b604080518083038186803b158015611f7a57600080fd5b505afa158015611f8e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250611fb29190810190612743565b9150506000876001600160a01b0316636c25b346886040518263ffffffff1660e01b8152600401611fe39190612abd565b60206040518083038186803b158015611ffb57600080fd5b505afa15801561200f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061203391908101906126e9565b9050600061204a61204484866121e4565b8361221b565b90506b033b2e3c9fd0803ce80000008104945080612074866b033b2e3c9fd0803ce80000006121e4565b1061207f5784612084565b846001015b9998505050505050505050565b8060008112156120b35760405162461bcd60e51b815260040161158090612bdc565b919050565b600061213c82846001600160a01b031663b3bcfa826040518163ffffffff1660e01b8152600401602060405180830381600087803b1580156120f957600080fd5b505af115801561210d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061213191908101906126e9565b601203600a0a6121e4565b9392505050565b6000826001600160a01b031663b3bcfa826040518163ffffffff1660e01b8152600401602060405180830381600087803b15801561218057600080fd5b505af1158015612194573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506121b891908101906126e9565b601203600a0a82816121c657fe5b0490505b92915050565b60008160ff16601203600a0a83816121c657fe5b60008115806121ff575050808202828282816121fc57fe5b04145b6121ca5760405162461bcd60e51b815260040161158090612b8c565b808203828111156121ca5760405162461bcd60e51b815260040161158090612b9c565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915290565b80356121ca81612cf3565b80516121ca81612cf3565b600082601f83011261229357600080fd5b81516122a66122a182612c3e565b612c17565b915081818352602084019350602081019050838560208402820111156122cb57600080fd5b60005b838110156122f757816122e18882612317565b84525060209283019291909101906001016122ce565b5050505092915050565b80516121ca81612d0a565b80356121ca81612d13565b80516121ca81612d13565b60008083601f84011261233457600080fd5b50813567ffffffffffffffff81111561234c57600080fd5b60208301915083600182028301111561236457600080fd5b9250929050565b80516121ca81612d1c565b600060a0828403121561238857600080fd5b61239260a0612c17565b905060006123a0848461226c565b82525060206123b18484830161230c565b60208301525060406123c58482850161226c565b60408301525060606123d98482850161226c565b60608301525060806123ed848285016123f9565b60808301525092915050565b80356121ca81612d25565b60006020828403121561241657600080fd5b6000610b3b8484612277565b60008060008060008060a0878903121561243b57600080fd5b6000612447898961226c565b965050602061245889828a0161226c565b955050604061246989828a0161226c565b945050606061247a89828a0161230c565b935050608087013567ffffffffffffffff81111561249757600080fd5b6124a389828a01612322565b92509250509295509295509295565b600080600080600060a086880312156124ca57600080fd5b60006124d6888861226c565b95505060206124e78882890161226c565b94505060406124f88882890161226c565b93505060606125098882890161230c565b925050608061251a8882890161230c565b9150509295509295909350565b60008060006060848603121561253c57600080fd5b6000612548868661226c565b93505060206125598682870161226c565b925050604061256a8682870161230c565b9150509250925092565b60008060006060848603121561258957600080fd5b6000612595868661226c565b93505060206125a68682870161230c565b925050604061256a8682870161226c565b600080604083850312156125ca57600080fd5b60006125d6858561226c565b92505060206125e78582860161230c565b9150509250929050565b6000806000806080858703121561260757600080fd5b6000612613878761226c565b94505060206126248782880161230c565b93505060406126358782880161226c565b92505060606126468782880161230c565b91505092959194509250565b6000806000806080858703121561266857600080fd5b6000612674878761226c565b94505060206126858782880161230c565b93505060406126358782880161230c565b6000602082840312156126a857600080fd5b815167ffffffffffffffff8111156126bf57600080fd5b610b3b84828501612282565b6000602082840312156126dd57600080fd5b6000610b3b8484612301565b6000602082840312156126fb57600080fd5b6000610b3b8484612317565b60006020828403121561271957600080fd5b6000610b3b848461236b565b600060a0828403121561273757600080fd5b6000610b3b8484612376565b6000806040838503121561275657600080fd5b60006127628585612317565b92505060206125e785828601612317565b60008060008060006080868803121561278b57600080fd5b6000612797888861230c565b95505060206127a88882890161230c565b94505060406127b98882890161230c565b935050606086013567ffffffffffffffff8111156127d657600080fd5b6127e288828901612322565b92509250509295509295909350565b600080600080600060a0868803121561280957600080fd5b60006128158888612317565b955050602061282688828901612317565b945050604061283788828901612317565b935050606061284888828901612317565b925050608061251a88828901612317565b6000612865838361287c565b505060200190565b61287681612ca2565b82525050565b61287681612c72565b600061289082612c65565b61289a8185612c69565b93506128a583612c5f565b8060005b838110156128d35781516128bd8882612859565b97506128c883612c5f565b9250506001016128a9565b509495945050505050565b61287681612c82565b60006128f383856120b3565b9350612900838584612cad565b50500190565b600061291182612c65565b61291b8185612c69565b935061292b818560208601612cb9565b61293481612ce9565b9093019392505050565b600061294982612c65565b61295381856120b3565b9350612963818560208601612cb9565b9290920192915050565b600061297a600c83612c69565b6b6d756c2d6f766572666c6f7760a01b815260200192915050565b60006129a2600c83612c69565b6b7375622d6f766572666c6f7760a01b815260200192915050565b60006129ca600f83612c69565b6e19185a4b589bdc9c9bddcb59985a5b608a1b815260200192915050565b60006129f5601483612c69565b731b5adc8b595b9d195c8b59d95b4b59985a5b195960621b815260200192915050565b6000612a25600f83612c69565b6e19d95b4b5cdd5c1c1b1e4b59985a5b608a1b815260200192915050565b6000612a50600c83612c69565b6b696e742d6f766572666c6f7760a01b815260200192915050565b6000612a78601483612c69565b731b5adc8b595b9d195c8b59185a4b59985a5b195960621b815260200192915050565b6000612aa7828661293e565b9150612ab48284866128e7565b95945050505050565b602081016121ca828461287c565b60808101612ad9828761286d565b612ae6602083018661287c565b612af360408301856128de565b8181036060830152612b058184612906565b9695505050505050565b60408101612b1d828561287c565b61213c60208301846128de565b6020808252810161213c8184612885565b602081016121ca82846128de565b60408101612b5782856128de565b61213c602083018461287c565b60608101612b7282866128de565b612b7f60208301856128de565b610b3b60408301846128de565b602080825281016121ca8161296d565b602080825281016121ca81612995565b602080825281016121ca816129bd565b602080825281016121ca816129e8565b602080825281016121ca81612a18565b602080825281016121ca81612a43565b602080825281016121ca81612a6b565b60608101612c0a82866128de565b612b7f602083018561287c565b60405181810167ffffffffffffffff81118282101715612c3657600080fd5b604052919050565b600067ffffffffffffffff821115612c5557600080fd5b5060209081020190565b60200190565b5190565b90815260200190565b60006121ca82612c90565b151590565b90565b60006121ca82612c72565b6001600160a01b031690565b60ff1690565b60006121ca82612c85565b82818337506000910152565b60005b83811015612cd4578181015183820152602001612cbc565b83811115612ce3576000848401525b50505050565b601f01601f191690565b612cfc81612c72565b8114612d0757600080fd5b50565b612cfc81612c7d565b612cfc81612c82565b612cfc81612c85565b612cfc81612c9c56fea365627a7a72315820b7290f9ca9156c1a63424e5933bfe3bb7ce4c9e808d7df6e46c440382958b9996c6578706572696d656e74616cf564736f6c63430005100040", "sourceMap": "845:8070:28:-;;;938:24;8:9:-1;5:2;;;30:1;27;20:12;5:2;938:24:28;845:8070;;;;;;", "deployedSourceMap": "845:8070:28:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7150:1763;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;7150:1763:28;;;;;;;;:::i;6211:166:22:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6211:166:22;;;;;;;;:::i;5884:143::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5884:143:22;;;;;;;;:::i;2153:360:28:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2153:360:28;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;2519:455;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2519:455:28;;;;;;;;:::i;5707:171:22:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;5707:171:22;;;;;;;;:::i;6554:1056::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6554:1056:22;;;;;;;;:::i;6383:165::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6383:165:22;;;;;;;;:::i;6033:172::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;6033:172:22;;;;;;;;:::i;7616:945::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;7616:945:22;;;;;;;;:::i;2663:409::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;2663:409:22;;;;;;;;:::i;3066:3151:28:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;3066:3151:28;;;;;;;;:::i;7150:1763::-;7431:31;7481:22;7431:73;;7567:18;7588:15;-1:-1:-1;;;;;7588:36:28;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7588:38:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7588:38:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;7588:38:28;;;;;;;;;7567:59;;7657:12;7672:31;7685:10;7697:5;7672:12;:31::i;:::-;7657:46;;7854:53;7951:24;7940:36;;;;;;;;;;;;;-1:-1:-1;;26:21;;;22:32;6:49;;7940:36:28;;;;7910:120;;7990:30;;;;49:4:-1;7910:120:28;;;;;;49:4:-1;39:7;30;26:21;22:32;13:7;6:49;7910:120:28;;;7854:176;;8085:24;8185:15;-1:-1:-1;;;;;8185:53:28;;:55;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8185:55:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8185:55:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;8185:55:28;;;;;;;;;-1:-1:-1;;;;;8138:131:28;;:133;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8138:133:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8138:133:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;8138:133:28;;;;;;;;;8085:196;;8292:84;8301:15;-1:-1:-1;;;;;8301:36:28;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8301:38:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8301:38:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;8301:38:28;;;;;;;;;8341:5;8348:24;8374:1;8292:8;:84::i;:::-;8386:56;8404:15;8429:11;8386:17;:56::i;:::-;8453:11;-1:-1:-1;;;;;8453:21:28;;8488:15;8517;-1:-1:-1;;;;;8517:26:28;;:28;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8517:28:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8517:28:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;8517:28:28;;;;;;;;;8559:7;8580:40;8453:177;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8453:177:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8453:177:28;;;;8716:63;8721:15;-1:-1:-1;;;;;8721:36:28;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8721:38:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8721:38:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;8721:38:28;;;;;;;;;8761:5;8776:1;8716:4;:63::i;:::-;8850:56;8868:15;8893:11;8850:17;:56::i;:::-;7150:1763;;;;;;;;;;;:::o;6211:166:22:-;6330:40;;-1:-1:-1;;;6330:40:22;;-1:-1:-1;;;;;6330:25:22;;;;;:40;;6356:3;;6361;;6366;;6330:40;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6330:40:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6330:40:22;;;;6211:166;;;;:::o;5884:143::-;5985:35;;-1:-1:-1;;;5985:35:22;;-1:-1:-1;;;;;5985:25:22;;;;;:35;;6011:3;;6016;;5985:35;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5985:35:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5985:35:22;;;;5884:143;;;:::o;2153:360:28:-;2223:9;2248:11;2274:7;-1:-1:-1;;;;;2262:24:28;;:26;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2262:26:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2262:26:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2262:26:28;;;;;;;;;2248:40;;2298:11;2324:7;-1:-1:-1;;;;;2312:25:28;;2338:3;2312:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2312:30:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2312:30:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2312:30:28;;;;;;;;;2298:44;;2352:11;2378:7;-1:-1:-1;;;;;2366:25:28;;2392:3;2366:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2366:30:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2366:30:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2366:30:28;;;;;;;;;2352:44;;2406:13;2434:7;-1:-1:-1;;;;;2422:25:28;;2448:3;2422:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2422:30:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2422:30:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2422:30:28;;;;;;;;;2406:46;;2470:36;2485:3;2490:5;2497:3;2502;2470:14;:36::i;:::-;2463:43;2153:360;-1:-1:-1;;;;;;;2153:360:28:o;2519:455::-;2617:8;2637:11;2663:7;-1:-1:-1;;;;;2651:24:28;;:26;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2651:26:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2651:26:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2651:26:28;;;;;;;;;2637:40;;2687:11;2713:7;-1:-1:-1;;;;;2701:25:28;;2727:3;2701:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2701:30:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2701:30:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2701:30:28;;;;;;;;;2687:44;;2741:11;2767:7;-1:-1:-1;;;;;2755:25:28;;2781:3;2755:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2755:30:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2755:30:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2755:30:28;;;;;;;;;2940:27;;-1:-1:-1;;;2940:27:28;;2741:44;;-1:-1:-1;;;;;;2940:17:28;;;;;:27;;2741:44;;2963:3;;2940:27;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2940:27:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2940:27:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2940:27:28;;;;;;;;;-1:-1:-1;2931:36:28;2519:455;-1:-1:-1;;;;;;2519:455:28:o;5707:171:22:-;5836:35;;-1:-1:-1;;;5836:35:22;;5810:8;;-1:-1:-1;;;;;5836:25:22;;;;;:35;;5862:3;;5867;;5836:35;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5836:35:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5836:35:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5836:35:22;;;;;;;;;5830:41;5707:171;-1:-1:-1;;;;5707:171:22:o;6554:1056::-;6716:11;6742:7;-1:-1:-1;;;;;6730:24:22;;:26;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6730:26:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6730:26:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6730:26:22;;;;;;;;;6716:40;;6766:11;6792:7;-1:-1:-1;;;;;6780:25:22;;6806:3;6780:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6780:30:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6780:30:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6780:30:22;;;;;;;;;6766:44;;6820:11;6846:7;-1:-1:-1;;;;;6834:25:22;;6860:3;6834:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6834:30:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6834:30:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6834:30:22;;;;;;;;;6820:44;;6877:8;6897:3;-1:-1:-1;;;;;6889:17:22;;6907:3;6912;6889:27;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6889:27:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6889:27:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6889:27:22;;;;;;;;;6874:42;;;6968:62;6981:7;6990:3;6995:34;7010:3;7015;7020;7025;6995:14;:34::i;6968:62::-;7108:101;7126:7;7147:3;7165:11;7171:4;7165:5;:11::i;:::-;7164:12;;7195:3;7190:9;;7108:4;:101::i;:::-;7283:39;7288:7;7297:3;7310:4;7317;7283;:39::i;:::-;7389:46;;-1:-1:-1;;;7389:46:22;;-1:-1:-1;;;;;7389:25:22;;;;;:46;;7423:4;;7430;;7389:46;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7389:46:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7389:46:22;;;;7489:7;-1:-1:-1;;;;;7477:24:22;;:26;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7477:26:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7477:26:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;7477:26:22;;;;;;;;;-1:-1:-1;;;;;7477:35:22;;7513:4;7477:41;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7477:41:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7477:41:22;;;;6554:1056;;;;;;;;;:::o;6383:165::-;6499:42;;-1:-1:-1;;;6499:42:22;;-1:-1:-1;;;;;6499:25:22;;;;;:42;;6525:3;;6530:4;;6536;;6499:42;;;;6033:172;6155:43;;-1:-1:-1;;;6155:43:22;;-1:-1:-1;;;;;6155:29:22;;;;;:43;;6185:3;;6190;;6195:2;;6155:43;;;;7616:945;7778:11;7804:7;-1:-1:-1;;;;;7792:24:22;;:26;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7792:26:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7792:26:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;7792:26:22;;;;;;;;;7778:40;;7828:11;7854:7;-1:-1:-1;;;;;7842:25:22;;7868:3;7842:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7842:30:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7842:30:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;7842:30:22;;;;;;;;;7828:44;;7882:11;7908:7;-1:-1:-1;;;;;7896:25:22;;7922:3;7896:30;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7896:30:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7896:30:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;7896:30:22;;;;;;;;;7882:44;;7939:8;7959:3;-1:-1:-1;;;;;7951:17:22;;7969:3;7974;7951:27;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;7951:27:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;7951:27:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;7951:27:22;;;;;;;;;7936:42;;;8030:62;8043:7;8052:3;8057:34;8072:3;8077;8082;8087;8057:14;:34::i;8030:62::-;8102:10;8115:26;8127:7;8136:4;8115:11;:26::i;:::-;8102:39;;8220:102;8238:7;8259:3;8277:12;8283:5;8277;:12::i;:::-;8276:13;;8308:3;8303:9;;8220:4;:102::i;:::-;8396:40;8401:7;8410:3;8423:4;8430:5;8396:4;:40::i;:::-;8508:46;;-1:-1:-1;;;8508:46:22;;-1:-1:-1;;;;;8508:25:22;;;;;:46;;8542:4;;8549;;8508:46;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;8508:46:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;8508:46:22;;;;7616:945;;;;;;;;;;:::o;2663:409::-;2962:3;-1:-1:-1;;;;;2950:20:22;;:22;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2950:22:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2950:22:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2950:22:22;;;;;;;;;-1:-1:-1;;;;;2950:30:22;;2981:3;2986;2950:40;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2950:40:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;-1:-1;;3034:31:22;;-1:-1:-1;;;3034:31:22;;-1:-1:-1;;;;;3034:21:22;;;-1:-1:-1;3034:21:22;;-1:-1:-1;3034:31:22;;3056:3;;3061;;3034:31;;;;3066:3151:28;3276:18;;;:33;;3348:43;;:::i;:::-;3394:45;;;;3405:5;3394:45;;;3348:91;;3483:31;3533:11;:34;;;3483:85;;3578:18;3599:15;-1:-1:-1;;;;;3599:36:28;;:38;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3599:38:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3599:38:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3599:38:28;;;;;;;;;3578:59;;3647:31;3681:11;:35;;;3647:69;;3770:17;3790:49;3809:10;3821:11;:17;;;3790:18;:49::i;:::-;3964:16;;;3978:1;3964:16;;;3926:35;3964:16;;;;;3770:69;;-1:-1:-1;3964:16:28;;;;;;;105:10:-1;3964:16:28;88:34:-1;136:17;;-1:-1;3964:16:28;3926:54;;4014:23;3990:18;4009:1;3990:21;;;;;;;;;;;;;:47;-1:-1:-1;;;;;3990:47:28;;;-1:-1:-1;;;;;3990:47:28;;;;;4071:15;-1:-1:-1;;;;;4071:27:28;;:29;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4071:29:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4071:29:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4071:29:28;;;;;;;;;4047:18;4066:1;4047:21;;;;;;;;;;;;;:53;-1:-1:-1;;;;;4047:53:28;;;-1:-1:-1;;;;;4047:53:28;;;;;4111:31;4171:15;-1:-1:-1;;;;;4171:42:28;;:44;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4171:44:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4171:44:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4171:44:28;;;;;;;;;-1:-1:-1;;;;;4145:93:28;;4239:18;4145:113;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4145:113:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4145:113:28;;;;;;39:16:-1;36:1;17:17;2:54;101:4;4145:113:28;80:15:-1;;;-1:-1;;76:31;65:43;;120:4;113:20;4145:113:28;;;;;;;;;4111:147;;4277:17;4295:1;4277:20;;;;;;;;;;;;;;4301:1;4277:25;4269:58;;;;-1:-1:-1;;;4269:58:28;;;;;;;;;;;;;;;;;4345:17;4363:1;4345:20;;;;;;;;;;;;;;4369:1;4345:25;4337:58;;;;-1:-1:-1;;;4337:58:28;;;;;;;;;4439:17;;;;4410:47;;-1:-1:-1;;;4410:47:28;;-1:-1:-1;;;4461:16:28;-1:-1:-1;;;;;4410:28:28;;;;;:47;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4410:47:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4410:47:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4410:47:28;;;;;;;;;:67;4406:1805;;;4493:224;4528:10;4556:15;-1:-1:-1;;;;;4556:30:28;;:32;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4556:32:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4556:32:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4556:32:28;;;;;;;;;4606:15;-1:-1:-1;;;;;4606:30:28;;:32;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4606:32:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4606:32:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4606:32:28;;;;;;;;;4656:11;:17;;;4691:12;4493:17;:224::i;:::-;4792:15;-1:-1:-1;;;;;4792:29:28;;:31;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4792:31:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4792:31:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4792:31:28;;;;;;;;;-1:-1:-1;;;;;4784:45:28;;4836:12;4784:67;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4784:67:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4784:67:28;;;;;4898:15;-1:-1:-1;;;;;4898:27:28;;:29;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4898:29:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4898:29:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4898:29:28;;;;;;;;;-1:-1:-1;;;;;4890:45:28;;4936:9;4890:56;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4890:56:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;4890:56:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;4890:56:28;;;;;;;;;:61;4865:135;;;;-1:-1:-1;;;4865:135:28;;;;;;;;;4406:1805;;;5055:340;5090:10;5118:11;:33;;;5169:15;-1:-1:-1;;;;;5169:30:28;;:32;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5169:32:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5169:32:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5169:32:28;;;;;;;;;5219:11;:17;;;5254:127;5296:11;:33;;;5351:12;5254:20;:127::i;5055:340::-;5471:23;5497:95;5534:12;5548:11;:30;;;5497:19;:95::i;:::-;5471:121;;5702:23;-1:-1:-1;;;;;5694:43:28;;:45;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5694:45:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5694:45:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5694:45:28;;;;;;;;;-1:-1:-1;;;;;5687:78:28;;5766:23;5791:18;5687:123;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5687:123:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5687:123:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5687:123:28;;;;;;;;;-1:-1:-1;5902:95:28;;-1:-1:-1;;;5902:95:28;;-1:-1:-1;;;;;5902:37:28;;;;;:95;;5961:18;;5902:95;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5902:95:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5902:95:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5902:95:28;;;;;;;;;:100;5877:174;;;;-1:-1:-1;;;5877:174:28;;;;;;;;;6098:15;-1:-1:-1;;;;;6098:27:28;;:29;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6098:29:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6098:29:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6098:29:28;;;;;;;;;-1:-1:-1;;;;;6090:45:28;;6136:9;6090:56;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;6090:56:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;6090:56:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;6090:56:28;;;;;;;;;:61;6065:135;;;;-1:-1:-1;;;6065:135:28;;;;;;;;1211:293;1300:9;1329:12;-1:-1:-1;;;;;1320:32:28;;:34;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1320:34:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1320:34:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1320:34:28;;;;;;;;;1300:55;;1374:1;-1:-1:-1;;;;;1366:17:28;;1421:3;1405:21;;1397:30;;;1449:1;-1:-1:-1;;;;;1441:14:28;;:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1441:16:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1441:16:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1441:16:28;;;;;;;;;1479:1;-1:-1:-1;;;;;1471:14:28;;:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1471:16:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1471:16:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1471:16:28;;;;;;;;;1366:131;;;;;;;;;;;;;;;;;;1510:293;1599:9;1628:12;-1:-1:-1;;;;;1619:32:28;;:34;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1619:34:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1619:34:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;1619:34:28;;;;;;;;;1599:55;;1673:1;-1:-1:-1;;;;;1665:17:28;;1720:3;1704:21;;1696:30;;;1748:1;-1:-1:-1;;;;;1740:14:28;;:16;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5058:643:22;5195:8;5259:9;5283:3;-1:-1:-1;;;;;5275:17:22;;5293:3;5275:22;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5275:22:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5275:22:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5275:22:22;;;;;;;;;5256:41;;;;;;5354:8;5374:3;-1:-1:-1;;;;;5366:17:22;;5384:3;5389;5366:27;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5366:27:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5366:27:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5366:27:22;;;;;;;;;5351:42;;;5448:8;5467:3;-1:-1:-1;;;;;5459:16:22;;5476:3;5459:21;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5459:21:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;5459:21:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;5459:21:22;;;;;;;;;5448:32;;5491:8;5502:24;5506:14;5510:3;5515:4;5506:3;:14::i;:::-;5522:3;5502;:24::i;:::-;5491:35;-1:-1:-1;2458:8:22;5491:35;5542:9;5536:15;;5675:3;5659:13;5663:3;2458:8;5659:3;:13::i;:::-;:19;:35;;5691:3;5659:35;;;5681:3;5687:1;5681:7;5659:35;5653:41;5058:643;-1:-1:-1;;;;;;;;;5058:643:22:o;3272:121::-;3343:1;3318:5;3363:6;;;3355:31;;;;-1:-1:-1;;;3355:31:22;;;;;;;;;3272:121;;;:::o;3504:398::-;3573:11;3812:83;3829:3;3870:7;-1:-1:-1;;;;;3858:24:22;;:26;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3858:26:22;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3858:26:22;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;3858:26:22;;;;;;;;;3853:2;:31;3846:2;:39;3812:3;:83::i;:::-;3806:89;3504:398;-1:-1:-1;;;3504:398:22:o;1959:155:28:-;2037:4;2091:7;-1:-1:-1;;;;;2079:24:28;;:26;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2079:26:28;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2079:26:28;;;;;;;101:4:-1;97:9;90:4;84;80:15;76:31;69:5;65:43;126:6;120:4;113:20;0:138;2079:26:28;;;;;;;;;2074:2;:31;2067:2;:39;2060:3;:47;;;;;;2053:54;;1959:155;;;;;:::o;1809:144::-;1885:4;1935:8;1930:14;;1925:2;:19;1918:2;:27;1908:6;:38;;;;2500:132:22;2552:6;2578;;;:30;;-1:-1:-1;;2593:5:22;;;2607:1;2602;2593:5;2602:1;2588:15;;;;;:20;2578:30;2570:55;;;;-1:-1:-1;;;2570:55:22;;;;;;;;3148:118;3231:5;;;3226:16;;;;3218:41;;;;-1:-1:-1;;;3218:41:22;;;;;;;;845:8070:28;;;;;;;;;-1:-1:-1;845:8070:28;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;5:130:-1:-;72:20;;97:33;72:20;97:33;;142:134;220:13;;238:33;220:13;238:33;;454:722;;582:3;575:4;567:6;563:17;559:27;549:2;;600:1;597;590:12;549:2;630:6;624:13;652:80;667:64;724:6;667:64;;;652:80;;;643:89;;749:5;774:6;767:5;760:21;804:4;796:6;792:17;782:27;;826:4;821:3;817:14;810:21;;879:6;926:3;918:4;910:6;906:17;901:3;897:27;894:36;891:2;;;943:1;940;933:12;891:2;968:1;953:217;978:6;975:1;972:13;953:217;;;1036:3;1058:48;1102:3;1090:10;1058:48;;;1046:61;;-1:-1;1130:4;1121:14;;;;1149;;;;;1000:1;993:9;953:217;;;957:14;542:634;;;;;;;;1184:128;1259:13;;1277:30;1259:13;1277:30;;1319:130;1386:20;;1411:33;1386:20;1411:33;;1456:134;1534:13;;1552:33;1534:13;1552:33;;1611:336;;;1725:3;1718:4;1710:6;1706:17;1702:27;1692:2;;1743:1;1740;1733:12;1692:2;-1:-1;1763:20;;1803:18;1792:30;;1789:2;;;1835:1;1832;1825:12;1789:2;1869:4;1861:6;1857:17;1845:29;;1920:3;1912:4;1904:6;1900:17;1890:8;1886:32;1883:41;1880:2;;;1937:1;1934;1927:12;1880:2;1685:262;;;;;;1955:174;2053:13;;2071:53;2053:13;2071:53;;2500:980;;2627:4;2615:9;2610:3;2606:19;2602:30;2599:2;;;2645:1;2642;2635:12;2599:2;2663:20;2678:4;2663:20;;;2654:29;-1:-1;2751:1;2783:49;2828:3;2808:9;2783:49;;;2758:75;;-1:-1;2895:2;2928:49;2973:3;2949:22;;;2928:49;;;2921:4;2914:5;2910:16;2903:75;2854:135;3058:2;3091:49;3136:3;3127:6;3116:9;3112:22;3091:49;;;3084:4;3077:5;3073:16;3066:75;2999:153;3219:2;3252:49;3297:3;3288:6;3277:9;3273:22;3252:49;;;3245:4;3238:5;3234:16;3227:75;3162:151;3377:3;3411:47;3454:3;3445:6;3434:9;3430:22;3411:47;;;3404:4;3397:5;3393:16;3386:73;3323:147;2593:887;;;;;3765:126;3830:20;;3855:31;3830:20;3855:31;;3898:263;;4013:2;4001:9;3992:7;3988:23;3984:32;3981:2;;;4029:1;4026;4019:12;3981:2;4064:1;4081:64;4137:7;4117:9;4081:64;;4168:883;;;;;;;4367:3;4355:9;4346:7;4342:23;4338:33;4335:2;;;4384:1;4381;4374:12;4335:2;4419:1;4436:53;4481:7;4461:9;4436:53;;;4426:63;;4398:97;4526:2;4544:61;4597:7;4588:6;4577:9;4573:22;4544:61;;;4534:71;;4505:106;4642:2;4660:53;4705:7;4696:6;4685:9;4681:22;4660:53;;;4650:63;;4621:98;4750:2;4768:53;4813:7;4804:6;4793:9;4789:22;4768:53;;;4758:63;;4729:98;4886:3;4875:9;4871:19;4858:33;4911:18;4903:6;4900:30;4897:2;;;4943:1;4940;4933:12;4897:2;4971:64;5027:7;5018:6;5007:9;5003:22;4971:64;;;4961:74;;;;4837:204;4329:722;;;;;;;;;5058:743;;;;;;5230:3;5218:9;5209:7;5205:23;5201:33;5198:2;;;5247:1;5244;5237:12;5198:2;5282:1;5299:53;5344:7;5324:9;5299:53;;;5289:63;;5261:97;5389:2;5407:53;5452:7;5443:6;5432:9;5428:22;5407:53;;;5397:63;;5368:98;5497:2;5515:53;5560:7;5551:6;5540:9;5536:22;5515:53;;;5505:63;;5476:98;5605:2;5623:53;5668:7;5659:6;5648:9;5644:22;5623:53;;;5613:63;;5584:98;5713:3;5732:53;5777:7;5768:6;5757:9;5753:22;5732:53;;;5722:63;;5692:99;5192:609;;;;;;;;;5808:491;;;;5946:2;5934:9;5925:7;5921:23;5917:32;5914:2;;;5962:1;5959;5952:12;5914:2;5997:1;6014:53;6059:7;6039:9;6014:53;;;6004:63;;5976:97;6104:2;6122:53;6167:7;6158:6;6147:9;6143:22;6122:53;;;6112:63;;6083:98;6212:2;6230:53;6275:7;6266:6;6255:9;6251:22;6230:53;;;6220:63;;6191:98;5908:391;;;;;;6306:491;;;;6444:2;6432:9;6423:7;6419:23;6415:32;6412:2;;;6460:1;6457;6450:12;6412:2;6495:1;6512:53;6557:7;6537:9;6512:53;;;6502:63;;6474:97;6602:2;6620:53;6665:7;6656:6;6645:9;6641:22;6620:53;;;6610:63;;6581:98;6710:2;6728:53;6773:7;6764:6;6753:9;6749:22;6728:53;;6804:366;;;6925:2;6913:9;6904:7;6900:23;6896:32;6893:2;;;6941:1;6938;6931:12;6893:2;6976:1;6993:53;7038:7;7018:9;6993:53;;;6983:63;;6955:97;7083:2;7101:53;7146:7;7137:6;7126:9;7122:22;7101:53;;;7091:63;;7062:98;6887:283;;;;;;7675:617;;;;;7830:3;7818:9;7809:7;7805:23;7801:33;7798:2;;;7847:1;7844;7837:12;7798:2;7882:1;7899:53;7944:7;7924:9;7899:53;;;7889:63;;7861:97;7989:2;8007:53;8052:7;8043:6;8032:9;8028:22;8007:53;;;7997:63;;7968:98;8097:2;8115:53;8160:7;8151:6;8140:9;8136:22;8115:53;;;8105:63;;8076:98;8205:2;8223:53;8268:7;8259:6;8248:9;8244:22;8223:53;;;8213:63;;8184:98;7792:500;;;;;;;;8299:613;;;;;8452:3;8440:9;8431:7;8427:23;8423:33;8420:2;;;8469:1;8466;8459:12;8420:2;8504:1;8521:53;8566:7;8546:9;8521:53;;;8511:63;;8483:97;8611:2;8629:53;8674:7;8665:6;8654:9;8650:22;8629:53;;;8619:63;;8590:98;8719:2;8737:52;8781:7;8772:6;8761:9;8757:22;8737:52;;8919:392;;9059:2;9047:9;9038:7;9034:23;9030:32;9027:2;;;9075:1;9072;9065:12;9027:2;9110:24;;9154:18;9143:30;;9140:2;;;9186:1;9183;9176:12;9140:2;9206:89;9287:7;9278:6;9267:9;9263:22;9206:89;;9318:257;;9430:2;9418:9;9409:7;9405:23;9401:32;9398:2;;;9446:1;9443;9436:12;9398:2;9481:1;9498:61;9551:7;9531:9;9498:61;;9582:263;;9697:2;9685:9;9676:7;9672:23;9668:32;9665:2;;;9713:1;9710;9703:12;9665:2;9748:1;9765:64;9821:7;9801:9;9765:64;;9852:303;;9987:2;9975:9;9966:7;9962:23;9958:32;9955:2;;;10003:1;10000;9993:12;9955:2;10038:1;10055:84;10131:7;10111:9;10055:84;;10464:318;;10606:3;10594:9;10585:7;10581:23;10577:33;10574:2;;;10623:1;10620;10613:12;10574:2;10658:1;10675:91;10758:7;10738:9;10675:91;;11059:399;;;11191:2;11179:9;11170:7;11166:23;11162:32;11159:2;;;11207:1;11204;11197:12;11159:2;11242:1;11259:64;11315:7;11295:9;11259:64;;;11249:74;;11221:108;11360:2;11378:64;11434:7;11425:6;11414:9;11410:22;11378:64;;11465:741;;;;;;11639:3;11627:9;11618:7;11614:23;11610:33;11607:2;;;11656:1;11653;11646:12;11607:2;11691:1;11708:53;11753:7;11733:9;11708:53;;;11698:63;;11670:97;11798:2;11816:53;11861:7;11852:6;11841:9;11837:22;11816:53;;;11806:63;;11777:98;11906:2;11924:53;11969:7;11960:6;11949:9;11945:22;11924:53;;;11914:63;;11885:98;12042:2;12031:9;12027:18;12014:32;12066:18;12058:6;12055:30;12052:2;;;12098:1;12095;12088:12;12052:2;12126:64;12182:7;12173:6;12162:9;12158:22;12126:64;;;12116:74;;;;11993:203;11601:605;;;;;;;;;12213:809;;;;;;12396:3;12384:9;12375:7;12371:23;12367:33;12364:2;;;12413:1;12410;12403:12;12364:2;12448:1;12465:64;12521:7;12501:9;12465:64;;;12455:74;;12427:108;12566:2;12584:64;12640:7;12631:6;12620:9;12616:22;12584:64;;;12574:74;;12545:109;12685:2;12703:64;12759:7;12750:6;12739:9;12735:22;12703:64;;;12693:74;;12664:109;12804:2;12822:64;12878:7;12869:6;12858:9;12854:22;12822:64;;;12812:74;;12783:109;12923:3;12942:64;12998:7;12989:6;12978:9;12974:22;12942:64;;13030:173;;13117:46;13159:3;13151:6;13117:46;;;-1:-1;;13192:4;13183:14;;13110:93;13211:142;13302:45;13341:5;13302:45;;;13297:3;13290:58;13284:69;;;13360:103;13433:24;13451:5;13433:24;;13621:690;;13766:54;13814:5;13766:54;;;13833:86;13912:6;13907:3;13833:86;;;13826:93;;13940:56;13990:5;13940:56;;;14016:7;14044:1;14029:260;14054:6;14051:1;14048:13;14029:260;;;14121:6;14115:13;14142:63;14201:3;14186:13;14142:63;;;14135:70;;14222:60;14275:6;14222:60;;;14212:70;-1:-1;;14076:1;14069:9;14029:260;;;-1:-1;14302:3;;13745:566;-1:-1;;;;;13745:566;14319:113;14402:24;14420:5;14402:24;;14462:310;;14594:88;14675:6;14670:3;14594:88;;;14587:95;;14694:43;14730:6;14725:3;14718:5;14694:43;;;-1:-1;;14750:16;;14580:192;14780:343;;14890:38;14922:5;14890:38;;;14940:70;15003:6;14998:3;14940:70;;;14933:77;;15015:52;15060:6;15055:3;15048:4;15041:5;15037:16;15015:52;;;15088:29;15110:6;15088:29;;;15079:39;;;;14870:253;-1:-1;;;14870:253;15130:356;;15258:38;15290:5;15258:38;;;15308:88;15389:6;15384:3;15308:88;;;15301:95;;15401:52;15446:6;15441:3;15434:4;15427:5;15423:16;15401:52;;;15465:16;;;;;15238:248;-1:-1;;15238:248;15611:312;;15771:67;15835:2;15830:3;15771:67;;;-1:-1;;;15851:35;;15914:2;15905:12;;15757:166;-1:-1;;15757:166;15932:312;;16092:67;16156:2;16151:3;16092:67;;;-1:-1;;;16172:35;;16235:2;16226:12;;16078:166;-1:-1;;16078:166;16253:315;;16413:67;16477:2;16472:3;16413:67;;;-1:-1;;;16493:38;;16559:2;16550:12;;16399:169;-1:-1;;16399:169;16577:320;;16737:67;16801:2;16796:3;16737:67;;;-1:-1;;;16817:43;;16888:2;16879:12;;16723:174;-1:-1;;16723:174;16906:315;;17066:67;17130:2;17125:3;17066:67;;;-1:-1;;;17146:38;;17212:2;17203:12;;17052:169;-1:-1;;17052:169;17230:312;;17390:67;17454:2;17449:3;17390:67;;;-1:-1;;;17470:35;;17533:2;17524:12;;17376:166;-1:-1;;17376:166;17551:320;;17711:67;17775:2;17770:3;17711:67;;;-1:-1;;;17791:43;;17862:2;17853:12;;17697:174;-1:-1;;17697:174;17999:439;;18199:93;18288:3;18279:6;18199:93;;;18192:100;;18310:103;18409:3;18400:6;18392;18310:103;;;18303:110;18180:258;-1:-1;;;;;18180:258;18445:213;18563:2;18548:18;;18577:71;18552:9;18621:6;18577:71;;18665:647;18893:3;18878:19;;18908:79;18882:9;18960:6;18908:79;;;18998:72;19066:2;19055:9;19051:18;19042:6;18998:72;;;19081;19149:2;19138:9;19134:18;19125:6;19081:72;;;19201:9;19195:4;19191:20;19186:2;19175:9;19171:18;19164:48;19226:76;19297:4;19288:6;19226:76;;;19218:84;18864:448;-1:-1;;;;;;18864:448;19319:324;19465:2;19450:18;;19479:71;19454:9;19523:6;19479:71;;;19561:72;19629:2;19618:9;19614:18;19605:6;19561:72;;19650:361;19818:2;19832:47;;;19803:18;;19893:108;19803:18;19987:6;19893:108;;20018:213;20136:2;20121:18;;20150:71;20125:9;20194:6;20150:71;;20238:324;20384:2;20369:18;;20398:71;20373:9;20442:6;20398:71;;;20480:72;20548:2;20537:9;20533:18;20524:6;20480:72;;20569:435;20743:2;20728:18;;20757:71;20732:9;20801:6;20757:71;;;20839:72;20907:2;20896:9;20892:18;20883:6;20839:72;;;20922;20990:2;20979:9;20975:18;20966:6;20922:72;;21011:407;21202:2;21216:47;;;21187:18;;21277:131;21187:18;21277:131;;21425:407;21616:2;21630:47;;;21601:18;;21691:131;21601:18;21691:131;;21839:407;22030:2;22044:47;;;22015:18;;22105:131;22015:18;22105:131;;22253:407;22444:2;22458:47;;;22429:18;;22519:131;22429:18;22519:131;;22667:407;22858:2;22872:47;;;22843:18;;22933:131;22843:18;22933:131;;23081:407;23272:2;23286:47;;;23257:18;;23347:131;23257:18;23347:131;;23495:407;23686:2;23700:47;;;23671:18;;23761:131;23671:18;23761:131;;24460:435;24634:2;24619:18;;24648:71;24623:9;24692:6;24648:71;;;24730:72;24798:2;24787:9;24783:18;24774:6;24730:72;;25336:256;25398:2;25392:9;25424:17;;;25499:18;25484:34;;25520:22;;;25481:62;25478:2;;;25556:1;25553;25546:12;25478:2;25572;25565:22;25376:216;;-1:-1;25376:216;25599:304;;25758:18;25750:6;25747:30;25744:2;;;25790:1;25787;25780:12;25744:2;-1:-1;25825:4;25813:17;;;25878:15;;25681:222;25910:151;26034:4;26025:14;;25982:79;26068:137;26171:12;;26142:63;26456:178;26574:19;;;26623:4;26614:14;;26567:67;27138:91;;27200:24;27218:5;27200:24;;27342:85;27408:13;27401:21;;27384:43;27434:72;27496:5;27479:27;27513:111;;27595:24;27613:5;27595:24;;27823:121;-1:-1;;;;;27885:54;;27868:76;28030:81;28101:4;28090:16;;28073:38;28118:129;;28205:37;28236:5;28205:37;;28498:145;28579:6;28574:3;28569;28556:30;-1:-1;28635:1;28617:16;;28610:27;28549:94;28652:268;28717:1;28724:101;28738:6;28735:1;28732:13;28724:101;;;28805:11;;;28799:18;28786:11;;;28779:39;28760:2;28753:10;28724:101;;;28840:6;28837:1;28834:13;28831:2;;;28905:1;28896:6;28891:3;28887:16;28880:27;28831:2;28701:219;;;;;28928:97;29016:2;28996:14;-1:-1;;28992:28;;28976:49;29033:117;29102:24;29120:5;29102:24;;;29095:5;29092:35;29082:2;;29141:1;29138;29131:12;29082:2;29076:74;;29297:111;29363:21;29378:5;29363:21;;29415:117;29484:24;29502:5;29484:24;;29539:157;29628:44;29666:5;29628:44;;30105:113;30172:22;30188:5;30172:22;", "source": "// Largely referenced from https://github.com/mrdavey/CollateralSwapFrontend\n\npragma solidity 0.5.16;\npragma experimental ABIEncoderV2;\n\nimport \"../lib/aave/FlashLoanReceiverBase.sol\";\n\nimport \"../lib/makerdao/DssProxyActionsBase.sol\";\n\nimport \"../lib/uniswap/UniswapBase.sol\";\n\nimport \"../lib/dapphub/Guard.sol\";\n\nimport \"../proxies/DACProxy.sol\";\n\n\nimport \"../interfaces/aave/ILendingPoolAddressesProvider.sol\";\nimport \"../interfaces/aave/ILendingPool.sol\";\n\nimport \"../interfaces/uniswap/IUniswapExchange.sol\";\nimport \"../interfaces/uniswap/IUniswapFactory.sol\";\n\nimport \"../interfaces/IERC20.sol\";\n\nimport \"../interfaces/compound/IComptroller.sol\";\nimport \"../interfaces/compound/ICToken.sol\";\nimport \"../interfaces/compound/ICEther.sol\";\n\nimport \"../interfaces/makerdao/IDssProxyActions.sol\";\n\nimport \"../registries/AddressRegistry.sol\";\n\n\ncontract DedgeMakerManager is DssProxyActionsBase {\n function () external payable {}\n\n constructor () public {}\n\n struct ImportMakerVaultCallData {\n address addressRegistryAddress;\n uint cdpId;\n address collateralCTokenAddress;\n address collateralJoinAddress;\n uint8 collateralDecimals;\n }\n\n // Helper functions\n function _proxyGuardPermit(address payable proxyAddress, address src) internal {\n address g = address(DACProxy(proxyAddress).authority());\n\n DSGuard(g).permit(\n bytes32(bytes20(address(src))),\n DSGuard(g).ANY(),\n DSGuard(g).ANY()\n );\n }\n\n function _proxyGuardForbid(address payable proxyAddress, address src) internal {\n address g = address(DACProxy(proxyAddress).authority());\n\n DSGuard(g).forbid(\n bytes32(bytes20(address(src))),\n DSGuard(g).ANY(),\n DSGuard(g).ANY()\n );\n }\n\n function _convert18ToDecimal(uint amount, uint8 decimals) internal returns (uint) {\n return amount / (10 ** (18 - uint(decimals)));\n }\n\n function _convert18ToGemUnits(address gemJoin, uint256 wad) internal returns (uint) {\n return wad / (10 ** (18 - GemJoinLike(gemJoin).dec()));\n }\n\n // Gets vault debt in 18 wei\n function getVaultDebt(address manager, uint cdp) public view returns (uint debt)\n {\n address vat = ManagerLike(manager).vat();\n address urn = ManagerLike(manager).urns(cdp);\n bytes32 ilk = ManagerLike(manager).ilks(cdp);\n address owner = ManagerLike(manager).owns(cdp);\n\n debt = _getWipeAllWad(vat, owner, urn, ilk);\n }\n\n function getVaultCollateral(\n address manager,\n uint cdp\n ) public view returns (uint ink) {\n address vat = ManagerLike(manager).vat();\n address urn = ManagerLike(manager).urns(cdp);\n bytes32 ilk = ManagerLike(manager).ilks(cdp);\n\n // Note: This returns in 18 decimals, need to\n // convert to gemUnits before passing it to\n // dss-proxy-actions\n (ink,) = VatLike(vat).urns(ilk, urn);\n }\n\n // Function to be called by proxy post loan\n // in order to import maker vault\n function importMakerVaultPostLoan(\n uint _amount,\n uint _aaveFee,\n uint _protocolFee,\n bytes calldata _data\n ) external {\n // Calculate total debt\n uint totalDebt = _amount + _aaveFee + _protocolFee;\n\n // Reconstruct data\n ImportMakerVaultCallData memory imvCalldata = abi.decode(_data, (ImportMakerVaultCallData));\n\n // Extract relevant data\n AddressRegistry addressRegistry = AddressRegistry(imvCalldata.addressRegistryAddress);\n address cdpManager = addressRegistry.DssCdpManagerAddress();\n address collateralCTokenAddress = imvCalldata.collateralCTokenAddress;\n\n // Collateral in 18 decimal places\n uint collateral18 = getVaultCollateral(cdpManager, imvCalldata.cdpId);\n\n // Joins the ETH/GEM/DAI market in compound if they haven't already\n address[] memory enterMarketsCToken = new address[](2);\n enterMarketsCToken[0] = collateralCTokenAddress;\n enterMarketsCToken[1] = addressRegistry.CDaiAddress();\n\n uint[] memory enterMarketErrors = IComptroller(\n addressRegistry.CompoundComptrollerAddress()\n ).enterMarkets(enterMarketsCToken);\n\n require(enterMarketErrors[0] == 0, \"mkr-enter-gem-failed\");\n require(enterMarketErrors[1] == 0, \"mkr-enter-dai-failed\");\n\n if (ManagerLike(cdpManager).ilks(imvCalldata.cdpId) == bytes32(\"ETH-A\")) {\n wipeAllAndFreeETH(\n cdpManager,\n addressRegistry.EthJoinAddress(),\n addressRegistry.DaiJoinAddress(),\n imvCalldata.cdpId,\n collateral18\n );\n\n // Supply ETH and Borrow DAI (Compound)\n ICEther(addressRegistry.CEtherAddress()).mint.value(collateral18)();\n require(\n ICToken(addressRegistry.CDaiAddress()).borrow(totalDebt) == 0,\n \"dai-borrow-fail\"\n );\n } else {\n // Free GEM\n wipeAllAndFreeGem(\n cdpManager,\n imvCalldata.collateralJoinAddress,\n addressRegistry.DaiJoinAddress(),\n imvCalldata.cdpId,\n _convert18ToGemUnits(\n imvCalldata.collateralJoinAddress,\n collateral18\n )\n );\n\n // Convert collateral to relevant decimal places\n uint collateralFixedDec = _convert18ToDecimal(\n collateral18, imvCalldata.collateralDecimals\n );\n\n // Approve CToken Collateral underlying to enable call transferFrom\n IERC20(ICToken(collateralCTokenAddress).underlying())\n .approve(collateralCTokenAddress, collateralFixedDec);\n\n // Supply GEM and Borrow DAI (Compound)\n require(\n ICToken(collateralCTokenAddress).mint(\n collateralFixedDec\n ) == 0,\n \"gem-supply-fail\"\n );\n require(\n ICToken(addressRegistry.CDaiAddress()).borrow(totalDebt) == 0,\n \"dai-borrow-fail\"\n );\n }\n }\n\n /* \n Main entry point maker vault into Dedge\n\n @params:\n dacProxyAddress: User's proxy address\n addressRegistryAddress: AddressRegistry's Address\n cdpId: User's cdpId\n executeOperationCalldataParams:\n Abi-encoded `data` used by User's proxy's `execute(address, )` function\n Used to delegatecall to another contract (i.e. this contract) in the context\n of the proxy. This allows for better flexibility and decoupling of logic from\n user's proxy. In this specific case, it is expecting the results from: (from JS)\n\n ```\n const IDedgeMakerManager = ethers.utils.Interface(DedgeMakerManager.abi)\n\n const executeOperationCalldataParams = IDedgeMakerManager\n .functions\n .importMakerVaultPostLoan\n .encode([ ])\n ```\n */\n function importMakerVault(\n address dedgeMakerManagerAddress,\n address payable dacProxyAddress,\n address addressRegistryAddress,\n uint cdpId,\n bytes calldata executeOperationCalldataParams\n ) external {\n // Get Address Registry\n AddressRegistry addressRegistry = AddressRegistry(addressRegistryAddress);\n\n // Get cdpManager and proxy's guard address\n address cdpManager = addressRegistry.DssCdpManagerAddress();\n\n // Get Debt\n uint daiDebt = getVaultDebt(cdpManager, cdpId);\n\n // Injects the target address into calldataParams\n // so user proxy knows which address it'll be calling `calldataParams` on\n bytes memory addressAndExecuteOperationCalldataParams = abi.encodePacked(\n abi.encode(dedgeMakerManagerAddress),\n executeOperationCalldataParams\n );\n \n // Get lending pool address\n ILendingPool lendingPool = ILendingPool(\n ILendingPoolAddressesProvider(\n addressRegistry.AaveLendingPoolAddressProviderAddress()\n ).getLendingPool()\n );\n\n cdpAllow(addressRegistry.DssCdpManagerAddress(), cdpId, dedgeMakerManagerAddress, 1);\n _proxyGuardPermit(dacProxyAddress, address(lendingPool));\n\n lendingPool.flashLoan(\n dacProxyAddress,\n addressRegistry.DaiAddress(),\n daiDebt,\n addressAndExecuteOperationCalldataParams\n );\n\n // Once we're done with the vault, give it away (its empty anyway)\n give(addressRegistry.DssCdpManagerAddress(), cdpId, address(1));\n // Lending pool can't call our proxy address anymore\n _proxyGuardForbid(dacProxyAddress, address(lendingPool));\n }\n}\n", @@ -382,14 +382,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeMakerManager.sol", "exportedSymbols": { "DedgeMakerManager": [ - 7077 + 7068 ] }, - "id": 7078, + "id": 7069, "nodeType": "SourceUnit", "nodes": [ { - "id": 6486, + "id": 6477, "literals": [ "solidity", "0.5", @@ -399,7 +399,7 @@ "src": "78:23:28" }, { - "id": 6487, + "id": 6478, "literals": [ "experimental", "ABIEncoderV2" @@ -410,10 +410,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/aave/FlashLoanReceiverBase.sol", "file": "../lib/aave/FlashLoanReceiverBase.sol", - "id": 6488, + "id": 6479, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 2139, + "scope": 7069, + "sourceUnit": 2165, "src": "137:47:28", "symbolAliases": [], "unitAlias": "" @@ -421,10 +421,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "file": "../lib/makerdao/DssProxyActionsBase.sol", - "id": 6489, + "id": 6480, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 4712, + "scope": 7069, + "sourceUnit": 4764, "src": "186:49:28", "symbolAliases": [], "unitAlias": "" @@ -432,10 +432,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapBase.sol", "file": "../lib/uniswap/UniswapBase.sol", - "id": 6490, + "id": 6481, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 4919, + "scope": 7069, + "sourceUnit": 4971, "src": "237:40:28", "symbolAliases": [], "unitAlias": "" @@ -443,10 +443,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "file": "../lib/dapphub/Guard.sol", - "id": 6491, + "id": 6482, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 3196, + "scope": 7069, + "sourceUnit": 3248, "src": "279:34:28", "symbolAliases": [], "unitAlias": "" @@ -454,10 +454,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol", "file": "../proxies/DACProxy.sol", - "id": 6492, + "id": 6483, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 7245, + "scope": 7069, + "sourceUnit": 7236, "src": "315:33:28", "symbolAliases": [], "unitAlias": "" @@ -465,9 +465,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol", "file": "../interfaces/aave/ILendingPoolAddressesProvider.sol", - "id": 6493, + "id": 6484, "nodeType": "ImportDirective", - "scope": 7078, + "scope": 7069, "sourceUnit": 660, "src": "351:62:28", "symbolAliases": [], @@ -476,9 +476,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol", "file": "../interfaces/aave/ILendingPool.sol", - "id": 6494, + "id": 6485, "nodeType": "ImportDirective", - "scope": 7078, + "scope": 7069, "sourceUnit": 547, "src": "414:45:28", "symbolAliases": [], @@ -487,10 +487,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol", "file": "../interfaces/uniswap/IUniswapExchange.sol", - "id": 6495, + "id": 6486, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 1910, + "scope": 7069, + "sourceUnit": 1936, "src": "461:52:28", "symbolAliases": [], "unitAlias": "" @@ -498,10 +498,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol", "file": "../interfaces/uniswap/IUniswapFactory.sol", - "id": 6496, + "id": 6487, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 1950, + "scope": 7069, + "sourceUnit": 1976, "src": "514:51:28", "symbolAliases": [], "unitAlias": "" @@ -509,9 +509,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../interfaces/IERC20.sol", - "id": 6497, + "id": 6488, "nodeType": "ImportDirective", - "scope": 7078, + "scope": 7069, "sourceUnit": 121, "src": "567:34:28", "symbolAliases": [], @@ -520,10 +520,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", "file": "../interfaces/compound/IComptroller.sol", - "id": 6498, + "id": 6489, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 1097, + "scope": 7069, + "sourceUnit": 1123, "src": "603:49:28", "symbolAliases": [], "unitAlias": "" @@ -531,10 +531,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol", "file": "../interfaces/compound/ICToken.sol", - "id": 6499, + "id": 6490, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 859, + "scope": 7069, + "sourceUnit": 885, "src": "653:44:28", "symbolAliases": [], "unitAlias": "" @@ -542,10 +542,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol", "file": "../interfaces/compound/ICEther.sol", - "id": 6500, + "id": 6491, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 733, + "scope": 7069, + "sourceUnit": 746, "src": "698:44:28", "symbolAliases": [], "unitAlias": "" @@ -553,10 +553,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/makerdao/IDssProxyActions.sol", "file": "../interfaces/makerdao/IDssProxyActions.sol", - "id": 6501, + "id": 6492, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 1566, + "scope": 7069, + "sourceUnit": 1592, "src": "744:53:28", "symbolAliases": [], "unitAlias": "" @@ -564,10 +564,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol", "file": "../registries/AddressRegistry.sol", - "id": 6502, + "id": 6493, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 7551, + "scope": 7069, + "sourceUnit": 7542, "src": "799:43:28", "symbolAliases": [], "unitAlias": "" @@ -578,64 +578,64 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 6503, + "id": 6494, "name": "DssProxyActionsBase", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4711, + "referencedDeclaration": 4763, "src": "875:19:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } }, - "id": 6504, + "id": 6495, "nodeType": "InheritanceSpecifier", "src": "875:19:28" } ], "contractDependencies": [ - 4144, - 4711 + 4196, + 4763 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 7077, + "id": 7068, "linearizedBaseContracts": [ - 7077, - 4711, - 4144 + 7068, + 4763, + 4196 ], "name": "DedgeMakerManager", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 6507, + "id": 6498, "nodeType": "Block", "src": "930:2:28", "statements": [] }, "documentation": null, - "id": 6508, + "id": 6499, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 6505, + "id": 6496, "nodeType": "ParameterList", "parameters": [], "src": "910:2:28" }, "returnParameters": { - "id": 6506, + "id": 6497, "nodeType": "ParameterList", "parameters": [], "src": "930:0:28" }, - "scope": 7077, + "scope": 7068, "src": "901:31:28", "stateMutability": "payable", "superFunction": null, @@ -643,31 +643,31 @@ }, { "body": { - "id": 6511, + "id": 6502, "nodeType": "Block", "src": "960:2:28", "statements": [] }, "documentation": null, - "id": 6512, + "id": 6503, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 6509, + "id": 6500, "nodeType": "ParameterList", "parameters": [], "src": "950:2:28" }, "returnParameters": { - "id": 6510, + "id": 6501, "nodeType": "ParameterList", "parameters": [], "src": "960:0:28" }, - "scope": 7077, + "scope": 7068, "src": "938:24:28", "stateMutability": "nonpayable", "superFunction": null, @@ -675,14 +675,14 @@ }, { "canonicalName": "DedgeMakerManager.ImportMakerVaultCallData", - "id": 6523, + "id": 6514, "members": [ { "constant": false, - "id": 6514, + "id": 6505, "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 6523, + "scope": 6514, "src": "1010:30:28", "stateVariable": false, "storageLocation": "default", @@ -691,7 +691,7 @@ "typeString": "address" }, "typeName": { - "id": 6513, + "id": 6504, "name": "address", "nodeType": "ElementaryTypeName", "src": "1010:7:28", @@ -706,10 +706,10 @@ }, { "constant": false, - "id": 6516, + "id": 6507, "name": "cdpId", "nodeType": "VariableDeclaration", - "scope": 6523, + "scope": 6514, "src": "1050:10:28", "stateVariable": false, "storageLocation": "default", @@ -718,7 +718,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6515, + "id": 6506, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1050:4:28", @@ -732,10 +732,10 @@ }, { "constant": false, - "id": 6518, + "id": 6509, "name": "collateralCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 6523, + "scope": 6514, "src": "1070:31:28", "stateVariable": false, "storageLocation": "default", @@ -744,7 +744,7 @@ "typeString": "address" }, "typeName": { - "id": 6517, + "id": 6508, "name": "address", "nodeType": "ElementaryTypeName", "src": "1070:7:28", @@ -759,10 +759,10 @@ }, { "constant": false, - "id": 6520, + "id": 6511, "name": "collateralJoinAddress", "nodeType": "VariableDeclaration", - "scope": 6523, + "scope": 6514, "src": "1111:29:28", "stateVariable": false, "storageLocation": "default", @@ -771,7 +771,7 @@ "typeString": "address" }, "typeName": { - "id": 6519, + "id": 6510, "name": "address", "nodeType": "ElementaryTypeName", "src": "1111:7:28", @@ -786,10 +786,10 @@ }, { "constant": false, - "id": 6522, + "id": 6513, "name": "collateralDecimals", "nodeType": "VariableDeclaration", - "scope": 6523, + "scope": 6514, "src": "1150:24:28", "stateVariable": false, "storageLocation": "default", @@ -798,7 +798,7 @@ "typeString": "uint8" }, "typeName": { - "id": 6521, + "id": 6512, "name": "uint8", "nodeType": "ElementaryTypeName", "src": "1150:5:28", @@ -813,27 +813,27 @@ ], "name": "ImportMakerVaultCallData", "nodeType": "StructDefinition", - "scope": 7077, + "scope": 7068, "src": "968:213:28", "visibility": "public" }, { "body": { - "id": 6563, + "id": 6554, "nodeType": "Block", "src": "1290:214:28", "statements": [ { "assignments": [ - 6531 + 6522 ], "declarations": [ { "constant": false, - "id": 6531, + "id": 6522, "name": "g", "nodeType": "VariableDeclaration", - "scope": 6563, + "scope": 6554, "src": "1300:9:28", "stateVariable": false, "storageLocation": "default", @@ -842,7 +842,7 @@ "typeString": "address" }, "typeName": { - "id": 6530, + "id": 6521, "name": "address", "nodeType": "ElementaryTypeName", "src": "1300:7:28", @@ -856,7 +856,7 @@ "visibility": "internal" } ], - "id": 6539, + "id": 6530, "initialValue": { "argumentTypes": null, "arguments": [ @@ -870,11 +870,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6534, + "id": 6525, "name": "proxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6525, + "referencedDeclaration": 6516, "src": "1329:12:28", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -889,18 +889,18 @@ "typeString": "address payable" } ], - "id": 6533, + "id": 6524, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1320:8:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 6535, + "id": 6526, "isConstant": false, "isLValue": false, "isPure": false, @@ -910,25 +910,25 @@ "nodeType": "FunctionCall", "src": "1320:22:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 6536, + "id": 6527, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "authority", "nodeType": "MemberAccess", - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1320:32:28", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2799_$", + "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2851_$", "typeString": "function () view external returns (contract DSAuthority)" } }, - "id": 6537, + "id": 6528, "isConstant": false, "isLValue": false, "isPure": false, @@ -938,7 +938,7 @@ "nodeType": "FunctionCall", "src": "1320:34:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -946,11 +946,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 6532, + "id": 6523, "isConstant": false, "isLValue": false, "isPure": true, @@ -963,7 +963,7 @@ }, "typeName": "address" }, - "id": 6538, + "id": 6529, "isConstant": false, "isLValue": false, "isPure": false, @@ -995,11 +995,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6547, + "id": 6538, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6527, + "referencedDeclaration": 6518, "src": "1421:3:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1014,7 +1014,7 @@ "typeString": "address" } ], - "id": 6546, + "id": 6537, "isConstant": false, "isLValue": false, "isPure": true, @@ -1027,7 +1027,7 @@ }, "typeName": "address" }, - "id": 6548, + "id": 6539, "isConstant": false, "isLValue": false, "isPure": false, @@ -1049,7 +1049,7 @@ "typeString": "address" } ], - "id": 6545, + "id": 6536, "isConstant": false, "isLValue": false, "isPure": true, @@ -1062,7 +1062,7 @@ }, "typeName": "bytes20" }, - "id": 6549, + "id": 6540, "isConstant": false, "isLValue": false, "isPure": false, @@ -1084,7 +1084,7 @@ "typeString": "bytes20" } ], - "id": 6544, + "id": 6535, "isConstant": false, "isLValue": false, "isPure": true, @@ -1097,7 +1097,7 @@ }, "typeName": "bytes32" }, - "id": 6550, + "id": 6541, "isConstant": false, "isLValue": false, "isPure": false, @@ -1121,11 +1121,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6552, + "id": 6543, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6531, + "referencedDeclaration": 6522, "src": "1449:1:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1140,18 +1140,18 @@ "typeString": "address" } ], - "id": 6551, + "id": 6542, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1441:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6553, + "id": 6544, "isConstant": false, "isLValue": false, "isPure": false, @@ -1161,25 +1161,25 @@ "nodeType": "FunctionCall", "src": "1441:10:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6554, + "id": 6545, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1441:14:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 6555, + "id": 6546, "isConstant": false, "isLValue": false, "isPure": false, @@ -1203,11 +1203,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6557, + "id": 6548, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6531, + "referencedDeclaration": 6522, "src": "1479:1:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1222,18 +1222,18 @@ "typeString": "address" } ], - "id": 6556, + "id": 6547, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1471:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6558, + "id": 6549, "isConstant": false, "isLValue": false, "isPure": false, @@ -1243,25 +1243,25 @@ "nodeType": "FunctionCall", "src": "1471:10:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6559, + "id": 6550, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1471:14:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 6560, + "id": 6551, "isConstant": false, "isLValue": false, "isPure": false, @@ -1296,11 +1296,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6541, + "id": 6532, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6531, + "referencedDeclaration": 6522, "src": "1374:1:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1315,18 +1315,18 @@ "typeString": "address" } ], - "id": 6540, + "id": 6531, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1366:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6542, + "id": 6533, "isConstant": false, "isLValue": false, "isPure": false, @@ -1336,25 +1336,25 @@ "nodeType": "FunctionCall", "src": "1366:10:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6543, + "id": 6534, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "permit", "nodeType": "MemberAccess", - "referencedDeclaration": 3086, + "referencedDeclaration": 3138, "src": "1366:17:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32) external" } }, - "id": 6561, + "id": 6552, "isConstant": false, "isLValue": false, "isPure": false, @@ -1368,29 +1368,29 @@ "typeString": "tuple()" } }, - "id": 6562, + "id": 6553, "nodeType": "ExpressionStatement", "src": "1366:131:28" } ] }, "documentation": null, - "id": 6564, + "id": 6555, "implemented": true, "kind": "function", "modifiers": [], "name": "_proxyGuardPermit", "nodeType": "FunctionDefinition", "parameters": { - "id": 6528, + "id": 6519, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6525, + "id": 6516, "name": "proxyAddress", "nodeType": "VariableDeclaration", - "scope": 6564, + "scope": 6555, "src": "1238:28:28", "stateVariable": false, "storageLocation": "default", @@ -1399,7 +1399,7 @@ "typeString": "address payable" }, "typeName": { - "id": 6524, + "id": 6515, "name": "address", "nodeType": "ElementaryTypeName", "src": "1238:15:28", @@ -1414,10 +1414,10 @@ }, { "constant": false, - "id": 6527, + "id": 6518, "name": "src", "nodeType": "VariableDeclaration", - "scope": 6564, + "scope": 6555, "src": "1268:11:28", "stateVariable": false, "storageLocation": "default", @@ -1426,7 +1426,7 @@ "typeString": "address" }, "typeName": { - "id": 6526, + "id": 6517, "name": "address", "nodeType": "ElementaryTypeName", "src": "1268:7:28", @@ -1443,12 +1443,12 @@ "src": "1237:43:28" }, "returnParameters": { - "id": 6529, + "id": 6520, "nodeType": "ParameterList", "parameters": [], "src": "1290:0:28" }, - "scope": 7077, + "scope": 7068, "src": "1211:293:28", "stateMutability": "nonpayable", "superFunction": null, @@ -1456,21 +1456,21 @@ }, { "body": { - "id": 6604, + "id": 6595, "nodeType": "Block", "src": "1589:214:28", "statements": [ { "assignments": [ - 6572 + 6563 ], "declarations": [ { "constant": false, - "id": 6572, + "id": 6563, "name": "g", "nodeType": "VariableDeclaration", - "scope": 6604, + "scope": 6595, "src": "1599:9:28", "stateVariable": false, "storageLocation": "default", @@ -1479,7 +1479,7 @@ "typeString": "address" }, "typeName": { - "id": 6571, + "id": 6562, "name": "address", "nodeType": "ElementaryTypeName", "src": "1599:7:28", @@ -1493,7 +1493,7 @@ "visibility": "internal" } ], - "id": 6580, + "id": 6571, "initialValue": { "argumentTypes": null, "arguments": [ @@ -1507,11 +1507,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6575, + "id": 6566, "name": "proxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6566, + "referencedDeclaration": 6557, "src": "1628:12:28", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -1526,18 +1526,18 @@ "typeString": "address payable" } ], - "id": 6574, + "id": 6565, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1619:8:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 6576, + "id": 6567, "isConstant": false, "isLValue": false, "isPure": false, @@ -1547,25 +1547,25 @@ "nodeType": "FunctionCall", "src": "1619:22:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 6577, + "id": 6568, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "authority", "nodeType": "MemberAccess", - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1619:32:28", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2799_$", + "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2851_$", "typeString": "function () view external returns (contract DSAuthority)" } }, - "id": 6578, + "id": 6569, "isConstant": false, "isLValue": false, "isPure": false, @@ -1575,7 +1575,7 @@ "nodeType": "FunctionCall", "src": "1619:34:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -1583,11 +1583,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 6573, + "id": 6564, "isConstant": false, "isLValue": false, "isPure": true, @@ -1600,7 +1600,7 @@ }, "typeName": "address" }, - "id": 6579, + "id": 6570, "isConstant": false, "isLValue": false, "isPure": false, @@ -1632,11 +1632,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6588, + "id": 6579, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6568, + "referencedDeclaration": 6559, "src": "1720:3:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1651,7 +1651,7 @@ "typeString": "address" } ], - "id": 6587, + "id": 6578, "isConstant": false, "isLValue": false, "isPure": true, @@ -1664,7 +1664,7 @@ }, "typeName": "address" }, - "id": 6589, + "id": 6580, "isConstant": false, "isLValue": false, "isPure": false, @@ -1686,7 +1686,7 @@ "typeString": "address" } ], - "id": 6586, + "id": 6577, "isConstant": false, "isLValue": false, "isPure": true, @@ -1699,7 +1699,7 @@ }, "typeName": "bytes20" }, - "id": 6590, + "id": 6581, "isConstant": false, "isLValue": false, "isPure": false, @@ -1721,7 +1721,7 @@ "typeString": "bytes20" } ], - "id": 6585, + "id": 6576, "isConstant": false, "isLValue": false, "isPure": true, @@ -1734,7 +1734,7 @@ }, "typeName": "bytes32" }, - "id": 6591, + "id": 6582, "isConstant": false, "isLValue": false, "isPure": false, @@ -1758,11 +1758,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6593, + "id": 6584, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6572, + "referencedDeclaration": 6563, "src": "1748:1:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1777,18 +1777,18 @@ "typeString": "address" } ], - "id": 6592, + "id": 6583, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1740:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6594, + "id": 6585, "isConstant": false, "isLValue": false, "isPure": false, @@ -1798,25 +1798,25 @@ "nodeType": "FunctionCall", "src": "1740:10:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6595, + "id": 6586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1740:14:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 6596, + "id": 6587, "isConstant": false, "isLValue": false, "isPure": false, @@ -1840,11 +1840,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6598, + "id": 6589, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6572, + "referencedDeclaration": 6563, "src": "1778:1:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1859,18 +1859,18 @@ "typeString": "address" } ], - "id": 6597, + "id": 6588, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1770:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6599, + "id": 6590, "isConstant": false, "isLValue": false, "isPure": false, @@ -1880,25 +1880,25 @@ "nodeType": "FunctionCall", "src": "1770:10:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6600, + "id": 6591, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1770:14:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 6601, + "id": 6592, "isConstant": false, "isLValue": false, "isPure": false, @@ -1933,11 +1933,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6582, + "id": 6573, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6572, + "referencedDeclaration": 6563, "src": "1673:1:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1952,18 +1952,18 @@ "typeString": "address" } ], - "id": 6581, + "id": 6572, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1665:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6583, + "id": 6574, "isConstant": false, "isLValue": false, "isPure": false, @@ -1973,25 +1973,25 @@ "nodeType": "FunctionCall", "src": "1665:10:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6584, + "id": 6575, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "forbid", "nodeType": "MemberAccess", - "referencedDeclaration": 3114, + "referencedDeclaration": 3166, "src": "1665:17:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32) external" } }, - "id": 6602, + "id": 6593, "isConstant": false, "isLValue": false, "isPure": false, @@ -2005,29 +2005,29 @@ "typeString": "tuple()" } }, - "id": 6603, + "id": 6594, "nodeType": "ExpressionStatement", "src": "1665:131:28" } ] }, "documentation": null, - "id": 6605, + "id": 6596, "implemented": true, "kind": "function", "modifiers": [], "name": "_proxyGuardForbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 6569, + "id": 6560, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6566, + "id": 6557, "name": "proxyAddress", "nodeType": "VariableDeclaration", - "scope": 6605, + "scope": 6596, "src": "1537:28:28", "stateVariable": false, "storageLocation": "default", @@ -2036,7 +2036,7 @@ "typeString": "address payable" }, "typeName": { - "id": 6565, + "id": 6556, "name": "address", "nodeType": "ElementaryTypeName", "src": "1537:15:28", @@ -2051,10 +2051,10 @@ }, { "constant": false, - "id": 6568, + "id": 6559, "name": "src", "nodeType": "VariableDeclaration", - "scope": 6605, + "scope": 6596, "src": "1567:11:28", "stateVariable": false, "storageLocation": "default", @@ -2063,7 +2063,7 @@ "typeString": "address" }, "typeName": { - "id": 6567, + "id": 6558, "name": "address", "nodeType": "ElementaryTypeName", "src": "1567:7:28", @@ -2080,12 +2080,12 @@ "src": "1536:43:28" }, "returnParameters": { - "id": 6570, + "id": 6561, "nodeType": "ParameterList", "parameters": [], "src": "1589:0:28" }, - "scope": 7077, + "scope": 7068, "src": "1510:293:28", "stateMutability": "nonpayable", "superFunction": null, @@ -2093,7 +2093,7 @@ }, { "body": { - "id": 6626, + "id": 6617, "nodeType": "Block", "src": "1891:62:28", "statements": [ @@ -2104,18 +2104,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6624, + "id": 6615, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6614, + "id": 6605, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6607, + "referencedDeclaration": 6598, "src": "1908:6:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2133,7 +2133,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6622, + "id": 6613, "isConstant": false, "isLValue": false, "isPure": false, @@ -2141,7 +2141,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 6615, + "id": 6606, "isConstant": false, "isLValue": false, "isPure": true, @@ -2167,7 +2167,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6620, + "id": 6611, "isConstant": false, "isLValue": false, "isPure": false, @@ -2175,7 +2175,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 6616, + "id": 6607, "isConstant": false, "isLValue": false, "isPure": true, @@ -2197,11 +2197,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6618, + "id": 6609, "name": "decimals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6609, + "referencedDeclaration": 6600, "src": "1935:8:28", "typeDescriptions": { "typeIdentifier": "t_uint8", @@ -2216,7 +2216,7 @@ "typeString": "uint8" } ], - "id": 6617, + "id": 6608, "isConstant": false, "isLValue": false, "isPure": true, @@ -2229,7 +2229,7 @@ }, "typeName": "uint" }, - "id": 6619, + "id": 6610, "isConstant": false, "isLValue": false, "isPure": false, @@ -2250,7 +2250,7 @@ } } ], - "id": 6621, + "id": 6612, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -2270,7 +2270,7 @@ } } ], - "id": 6623, + "id": 6614, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -2289,30 +2289,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 6613, - "id": 6625, + "functionReturnParameters": 6604, + "id": 6616, "nodeType": "Return", "src": "1901:45:28" } ] }, "documentation": null, - "id": 6627, + "id": 6618, "implemented": true, "kind": "function", "modifiers": [], "name": "_convert18ToDecimal", "nodeType": "FunctionDefinition", "parameters": { - "id": 6610, + "id": 6601, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6607, + "id": 6598, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6627, + "scope": 6618, "src": "1838:11:28", "stateVariable": false, "storageLocation": "default", @@ -2321,7 +2321,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6606, + "id": 6597, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1838:4:28", @@ -2335,10 +2335,10 @@ }, { "constant": false, - "id": 6609, + "id": 6600, "name": "decimals", "nodeType": "VariableDeclaration", - "scope": 6627, + "scope": 6618, "src": "1851:14:28", "stateVariable": false, "storageLocation": "default", @@ -2347,7 +2347,7 @@ "typeString": "uint8" }, "typeName": { - "id": 6608, + "id": 6599, "name": "uint8", "nodeType": "ElementaryTypeName", "src": "1851:5:28", @@ -2363,15 +2363,15 @@ "src": "1837:29:28" }, "returnParameters": { - "id": 6613, + "id": 6604, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6612, + "id": 6603, "name": "", "nodeType": "VariableDeclaration", - "scope": 6627, + "scope": 6618, "src": "1885:4:28", "stateVariable": false, "storageLocation": "default", @@ -2380,7 +2380,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6611, + "id": 6602, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1885:4:28", @@ -2395,7 +2395,7 @@ ], "src": "1884:6:28" }, - "scope": 7077, + "scope": 7068, "src": "1809:144:28", "stateMutability": "nonpayable", "superFunction": null, @@ -2403,7 +2403,7 @@ }, { "body": { - "id": 6650, + "id": 6641, "nodeType": "Block", "src": "2043:71:28", "statements": [ @@ -2414,18 +2414,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6648, + "id": 6639, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6636, + "id": 6627, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6631, + "referencedDeclaration": 6622, "src": "2060:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2443,7 +2443,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6646, + "id": 6637, "isConstant": false, "isLValue": false, "isPure": false, @@ -2451,7 +2451,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 6637, + "id": 6628, "isConstant": false, "isLValue": false, "isPure": true, @@ -2477,7 +2477,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6644, + "id": 6635, "isConstant": false, "isLValue": false, "isPure": false, @@ -2485,7 +2485,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 6638, + "id": 6629, "isConstant": false, "isLValue": false, "isPure": true, @@ -2512,11 +2512,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6640, + "id": 6631, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6629, + "referencedDeclaration": 6620, "src": "2091:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2531,18 +2531,18 @@ "typeString": "address" } ], - "id": 6639, + "id": 6630, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "2079:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 6641, + "id": 6632, "isConstant": false, "isLValue": false, "isPure": false, @@ -2552,25 +2552,25 @@ "nodeType": "FunctionCall", "src": "2079:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 6642, + "id": 6633, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "2079:24:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 6643, + "id": 6634, "isConstant": false, "isLValue": false, "isPure": false, @@ -2591,7 +2591,7 @@ } } ], - "id": 6645, + "id": 6636, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -2611,7 +2611,7 @@ } } ], - "id": 6647, + "id": 6638, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -2630,30 +2630,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 6635, - "id": 6649, + "functionReturnParameters": 6626, + "id": 6640, "nodeType": "Return", "src": "2053:54:28" } ] }, "documentation": null, - "id": 6651, + "id": 6642, "implemented": true, "kind": "function", "modifiers": [], "name": "_convert18ToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 6632, + "id": 6623, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6629, + "id": 6620, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 6651, + "scope": 6642, "src": "1989:15:28", "stateVariable": false, "storageLocation": "default", @@ -2662,7 +2662,7 @@ "typeString": "address" }, "typeName": { - "id": 6628, + "id": 6619, "name": "address", "nodeType": "ElementaryTypeName", "src": "1989:7:28", @@ -2677,10 +2677,10 @@ }, { "constant": false, - "id": 6631, + "id": 6622, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 6651, + "scope": 6642, "src": "2006:11:28", "stateVariable": false, "storageLocation": "default", @@ -2689,7 +2689,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6630, + "id": 6621, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2006:7:28", @@ -2705,15 +2705,15 @@ "src": "1988:30:28" }, "returnParameters": { - "id": 6635, + "id": 6626, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6634, + "id": 6625, "name": "", "nodeType": "VariableDeclaration", - "scope": 6651, + "scope": 6642, "src": "2037:4:28", "stateVariable": false, "storageLocation": "default", @@ -2722,7 +2722,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6633, + "id": 6624, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2037:4:28", @@ -2737,7 +2737,7 @@ ], "src": "2036:6:28" }, - "scope": 7077, + "scope": 7068, "src": "1959:155:28", "stateMutability": "nonpayable", "superFunction": null, @@ -2745,21 +2745,21 @@ }, { "body": { - "id": 6704, + "id": 6695, "nodeType": "Block", "src": "2238:275:28", "statements": [ { "assignments": [ - 6661 + 6652 ], "declarations": [ { "constant": false, - "id": 6661, + "id": 6652, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 6704, + "scope": 6695, "src": "2248:11:28", "stateVariable": false, "storageLocation": "default", @@ -2768,7 +2768,7 @@ "typeString": "address" }, "typeName": { - "id": 6660, + "id": 6651, "name": "address", "nodeType": "ElementaryTypeName", "src": "2248:7:28", @@ -2782,7 +2782,7 @@ "visibility": "internal" } ], - "id": 6667, + "id": 6658, "initialValue": { "argumentTypes": null, "arguments": [], @@ -2793,11 +2793,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6663, + "id": 6654, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6653, + "referencedDeclaration": 6644, "src": "2274:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2812,18 +2812,18 @@ "typeString": "address" } ], - "id": 6662, + "id": 6653, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2262:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6664, + "id": 6655, "isConstant": false, "isLValue": false, "isPure": false, @@ -2833,25 +2833,25 @@ "nodeType": "FunctionCall", "src": "2262:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6665, + "id": 6656, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "2262:24:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6666, + "id": 6657, "isConstant": false, "isLValue": false, "isPure": false, @@ -2870,15 +2870,15 @@ }, { "assignments": [ - 6669 + 6660 ], "declarations": [ { "constant": false, - "id": 6669, + "id": 6660, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 6704, + "scope": 6695, "src": "2298:11:28", "stateVariable": false, "storageLocation": "default", @@ -2887,7 +2887,7 @@ "typeString": "address" }, "typeName": { - "id": 6668, + "id": 6659, "name": "address", "nodeType": "ElementaryTypeName", "src": "2298:7:28", @@ -2901,17 +2901,17 @@ "visibility": "internal" } ], - "id": 6676, + "id": 6667, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6674, + "id": 6665, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6655, + "referencedDeclaration": 6646, "src": "2338:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2931,11 +2931,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6671, + "id": 6662, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6653, + "referencedDeclaration": 6644, "src": "2324:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2950,18 +2950,18 @@ "typeString": "address" } ], - "id": 6670, + "id": 6661, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2312:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6672, + "id": 6663, "isConstant": false, "isLValue": false, "isPure": false, @@ -2971,25 +2971,25 @@ "nodeType": "FunctionCall", "src": "2312:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6673, + "id": 6664, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "2312:25:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 6675, + "id": 6666, "isConstant": false, "isLValue": false, "isPure": false, @@ -3008,15 +3008,15 @@ }, { "assignments": [ - 6678 + 6669 ], "declarations": [ { "constant": false, - "id": 6678, + "id": 6669, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 6704, + "scope": 6695, "src": "2352:11:28", "stateVariable": false, "storageLocation": "default", @@ -3025,7 +3025,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 6677, + "id": 6668, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2352:7:28", @@ -3038,17 +3038,17 @@ "visibility": "internal" } ], - "id": 6685, + "id": 6676, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6683, + "id": 6674, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6655, + "referencedDeclaration": 6646, "src": "2392:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3068,11 +3068,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6680, + "id": 6671, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6653, + "referencedDeclaration": 6644, "src": "2378:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3087,18 +3087,18 @@ "typeString": "address" } ], - "id": 6679, + "id": 6670, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2366:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6681, + "id": 6672, "isConstant": false, "isLValue": false, "isPure": false, @@ -3108,25 +3108,25 @@ "nodeType": "FunctionCall", "src": "2366:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6682, + "id": 6673, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "2366:25:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 6684, + "id": 6675, "isConstant": false, "isLValue": false, "isPure": false, @@ -3145,15 +3145,15 @@ }, { "assignments": [ - 6687 + 6678 ], "declarations": [ { "constant": false, - "id": 6687, + "id": 6678, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 6704, + "scope": 6695, "src": "2406:13:28", "stateVariable": false, "storageLocation": "default", @@ -3162,7 +3162,7 @@ "typeString": "address" }, "typeName": { - "id": 6686, + "id": 6677, "name": "address", "nodeType": "ElementaryTypeName", "src": "2406:7:28", @@ -3176,17 +3176,17 @@ "visibility": "internal" } ], - "id": 6694, + "id": 6685, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6692, + "id": 6683, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6655, + "referencedDeclaration": 6646, "src": "2448:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3206,11 +3206,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6689, + "id": 6680, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6653, + "referencedDeclaration": 6644, "src": "2434:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3225,18 +3225,18 @@ "typeString": "address" } ], - "id": 6688, + "id": 6679, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2422:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6690, + "id": 6681, "isConstant": false, "isLValue": false, "isPure": false, @@ -3246,25 +3246,25 @@ "nodeType": "FunctionCall", "src": "2422:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6691, + "id": 6682, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "owns", "nodeType": "MemberAccess", - "referencedDeclaration": 3848, + "referencedDeclaration": 3900, "src": "2422:25:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 6693, + "id": 6684, "isConstant": false, "isLValue": false, "isPure": false, @@ -3284,18 +3284,18 @@ { "expression": { "argumentTypes": null, - "id": 6702, + "id": 6693, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 6695, + "id": 6686, "name": "debt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6658, + "referencedDeclaration": 6649, "src": "2463:4:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3309,11 +3309,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6697, + "id": 6688, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6661, + "referencedDeclaration": 6652, "src": "2485:3:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3322,11 +3322,11 @@ }, { "argumentTypes": null, - "id": 6698, + "id": 6689, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6687, + "referencedDeclaration": 6678, "src": "2490:5:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3335,11 +3335,11 @@ }, { "argumentTypes": null, - "id": 6699, + "id": 6690, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6669, + "referencedDeclaration": 6660, "src": "2497:3:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3348,11 +3348,11 @@ }, { "argumentTypes": null, - "id": 6700, + "id": 6691, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6678, + "referencedDeclaration": 6669, "src": "2502:3:28", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -3379,18 +3379,18 @@ "typeString": "bytes32" } ], - "id": 6696, + "id": 6687, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "2470:14:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 6701, + "id": 6692, "isConstant": false, "isLValue": false, "isPure": false, @@ -3410,29 +3410,29 @@ "typeString": "uint256" } }, - "id": 6703, + "id": 6694, "nodeType": "ExpressionStatement", "src": "2463:43:28" } ] }, "documentation": null, - "id": 6705, + "id": 6696, "implemented": true, "kind": "function", "modifiers": [], "name": "getVaultDebt", "nodeType": "FunctionDefinition", "parameters": { - "id": 6656, + "id": 6647, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6653, + "id": 6644, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 6705, + "scope": 6696, "src": "2175:15:28", "stateVariable": false, "storageLocation": "default", @@ -3441,7 +3441,7 @@ "typeString": "address" }, "typeName": { - "id": 6652, + "id": 6643, "name": "address", "nodeType": "ElementaryTypeName", "src": "2175:7:28", @@ -3456,10 +3456,10 @@ }, { "constant": false, - "id": 6655, + "id": 6646, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 6705, + "scope": 6696, "src": "2192:8:28", "stateVariable": false, "storageLocation": "default", @@ -3468,7 +3468,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6654, + "id": 6645, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2192:4:28", @@ -3484,15 +3484,15 @@ "src": "2174:27:28" }, "returnParameters": { - "id": 6659, + "id": 6650, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6658, + "id": 6649, "name": "debt", "nodeType": "VariableDeclaration", - "scope": 6705, + "scope": 6696, "src": "2223:9:28", "stateVariable": false, "storageLocation": "default", @@ -3501,7 +3501,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6657, + "id": 6648, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2223:4:28", @@ -3516,7 +3516,7 @@ ], "src": "2222:11:28" }, - "scope": 7077, + "scope": 7068, "src": "2153:360:28", "stateMutability": "view", "superFunction": null, @@ -3524,21 +3524,21 @@ }, { "body": { - "id": 6751, + "id": 6742, "nodeType": "Block", "src": "2627:347:28", "statements": [ { "assignments": [ - 6715 + 6706 ], "declarations": [ { "constant": false, - "id": 6715, + "id": 6706, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 6751, + "scope": 6742, "src": "2637:11:28", "stateVariable": false, "storageLocation": "default", @@ -3547,7 +3547,7 @@ "typeString": "address" }, "typeName": { - "id": 6714, + "id": 6705, "name": "address", "nodeType": "ElementaryTypeName", "src": "2637:7:28", @@ -3561,7 +3561,7 @@ "visibility": "internal" } ], - "id": 6721, + "id": 6712, "initialValue": { "argumentTypes": null, "arguments": [], @@ -3572,11 +3572,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6717, + "id": 6708, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6707, + "referencedDeclaration": 6698, "src": "2663:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3591,18 +3591,18 @@ "typeString": "address" } ], - "id": 6716, + "id": 6707, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2651:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6718, + "id": 6709, "isConstant": false, "isLValue": false, "isPure": false, @@ -3612,25 +3612,25 @@ "nodeType": "FunctionCall", "src": "2651:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6719, + "id": 6710, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "2651:24:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6720, + "id": 6711, "isConstant": false, "isLValue": false, "isPure": false, @@ -3649,15 +3649,15 @@ }, { "assignments": [ - 6723 + 6714 ], "declarations": [ { "constant": false, - "id": 6723, + "id": 6714, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 6751, + "scope": 6742, "src": "2687:11:28", "stateVariable": false, "storageLocation": "default", @@ -3666,7 +3666,7 @@ "typeString": "address" }, "typeName": { - "id": 6722, + "id": 6713, "name": "address", "nodeType": "ElementaryTypeName", "src": "2687:7:28", @@ -3680,17 +3680,17 @@ "visibility": "internal" } ], - "id": 6730, + "id": 6721, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6728, + "id": 6719, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6709, + "referencedDeclaration": 6700, "src": "2727:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3710,11 +3710,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6725, + "id": 6716, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6707, + "referencedDeclaration": 6698, "src": "2713:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3729,18 +3729,18 @@ "typeString": "address" } ], - "id": 6724, + "id": 6715, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2701:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6726, + "id": 6717, "isConstant": false, "isLValue": false, "isPure": false, @@ -3750,25 +3750,25 @@ "nodeType": "FunctionCall", "src": "2701:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6727, + "id": 6718, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "2701:25:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 6729, + "id": 6720, "isConstant": false, "isLValue": false, "isPure": false, @@ -3787,15 +3787,15 @@ }, { "assignments": [ - 6732 + 6723 ], "declarations": [ { "constant": false, - "id": 6732, + "id": 6723, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 6751, + "scope": 6742, "src": "2741:11:28", "stateVariable": false, "storageLocation": "default", @@ -3804,7 +3804,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 6731, + "id": 6722, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2741:7:28", @@ -3817,17 +3817,17 @@ "visibility": "internal" } ], - "id": 6739, + "id": 6730, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6737, + "id": 6728, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6709, + "referencedDeclaration": 6700, "src": "2781:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3847,11 +3847,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6734, + "id": 6725, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6707, + "referencedDeclaration": 6698, "src": "2767:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3866,18 +3866,18 @@ "typeString": "address" } ], - "id": 6733, + "id": 6724, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2755:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6735, + "id": 6726, "isConstant": false, "isLValue": false, "isPure": false, @@ -3887,25 +3887,25 @@ "nodeType": "FunctionCall", "src": "2755:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6736, + "id": 6727, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "2755:25:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 6738, + "id": 6729, "isConstant": false, "isLValue": false, "isPure": false, @@ -3925,7 +3925,7 @@ { "expression": { "argumentTypes": null, - "id": 6749, + "id": 6740, "isConstant": false, "isLValue": false, "isPure": false, @@ -3935,11 +3935,11 @@ "components": [ { "argumentTypes": null, - "id": 6740, + "id": 6731, "name": "ink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6712, + "referencedDeclaration": 6703, "src": "2932:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3948,7 +3948,7 @@ }, null ], - "id": 6741, + "id": 6732, "isConstant": false, "isInlineArray": false, "isLValue": true, @@ -3968,11 +3968,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6746, + "id": 6737, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6732, + "referencedDeclaration": 6723, "src": "2958:3:28", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -3981,11 +3981,11 @@ }, { "argumentTypes": null, - "id": 6747, + "id": 6738, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6723, + "referencedDeclaration": 6714, "src": "2963:3:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4009,11 +4009,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6743, + "id": 6734, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6715, + "referencedDeclaration": 6706, "src": "2948:3:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4028,18 +4028,18 @@ "typeString": "address" } ], - "id": 6742, + "id": 6733, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "2940:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 6744, + "id": 6735, "isConstant": false, "isLValue": false, "isPure": false, @@ -4049,25 +4049,25 @@ "nodeType": "FunctionCall", "src": "2940:12:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 6745, + "id": 6736, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "2940:17:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 6748, + "id": 6739, "isConstant": false, "isLValue": false, "isPure": false, @@ -4087,29 +4087,29 @@ "typeString": "tuple()" } }, - "id": 6750, + "id": 6741, "nodeType": "ExpressionStatement", "src": "2931:36:28" } ] }, "documentation": null, - "id": 6752, + "id": 6743, "implemented": true, "kind": "function", "modifiers": [], "name": "getVaultCollateral", "nodeType": "FunctionDefinition", "parameters": { - "id": 6710, + "id": 6701, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6707, + "id": 6698, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 6752, + "scope": 6743, "src": "2556:15:28", "stateVariable": false, "storageLocation": "default", @@ -4118,7 +4118,7 @@ "typeString": "address" }, "typeName": { - "id": 6706, + "id": 6697, "name": "address", "nodeType": "ElementaryTypeName", "src": "2556:7:28", @@ -4133,10 +4133,10 @@ }, { "constant": false, - "id": 6709, + "id": 6700, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 6752, + "scope": 6743, "src": "2581:8:28", "stateVariable": false, "storageLocation": "default", @@ -4145,7 +4145,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6708, + "id": 6699, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2581:4:28", @@ -4161,15 +4161,15 @@ "src": "2546:49:28" }, "returnParameters": { - "id": 6713, + "id": 6704, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6712, + "id": 6703, "name": "ink", "nodeType": "VariableDeclaration", - "scope": 6752, + "scope": 6743, "src": "2617:8:28", "stateVariable": false, "storageLocation": "default", @@ -4178,7 +4178,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6711, + "id": 6702, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2617:4:28", @@ -4193,7 +4193,7 @@ ], "src": "2616:10:28" }, - "scope": 7077, + "scope": 7068, "src": "2519:455:28", "stateMutability": "view", "superFunction": null, @@ -4201,21 +4201,21 @@ }, { "body": { - "id": 6975, + "id": 6966, "nodeType": "Block", "src": "3217:3000:28", "statements": [ { "assignments": [ - 6764 + 6755 ], "declarations": [ { "constant": false, - "id": 6764, + "id": 6755, "name": "totalDebt", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3259:14:28", "stateVariable": false, "storageLocation": "default", @@ -4224,7 +4224,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6763, + "id": 6754, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3259:4:28", @@ -4237,14 +4237,14 @@ "visibility": "internal" } ], - "id": 6770, + "id": 6761, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6769, + "id": 6760, "isConstant": false, "isLValue": false, "isPure": false, @@ -4255,18 +4255,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6767, + "id": 6758, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6765, + "id": 6756, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6754, + "referencedDeclaration": 6745, "src": "3276:7:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4277,11 +4277,11 @@ "operator": "+", "rightExpression": { "argumentTypes": null, - "id": 6766, + "id": 6757, "name": "_aaveFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6756, + "referencedDeclaration": 6747, "src": "3286:8:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4298,11 +4298,11 @@ "operator": "+", "rightExpression": { "argumentTypes": null, - "id": 6768, + "id": 6759, "name": "_protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6758, + "referencedDeclaration": 6749, "src": "3297:12:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4320,31 +4320,31 @@ }, { "assignments": [ - 6772 + 6763 ], "declarations": [ { "constant": false, - "id": 6772, + "id": 6763, "name": "imvCalldata", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3348:43:28", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData" }, "typeName": { "contractScope": null, - "id": 6771, + "id": 6762, "name": "ImportMakerVaultCallData", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 6523, + "referencedDeclaration": 6514, "src": "3348:24:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_storage_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_storage_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData" } }, @@ -4352,17 +4352,17 @@ "visibility": "internal" } ], - "id": 6779, + "id": 6770, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6775, + "id": 6766, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6760, + "referencedDeclaration": 6751, "src": "3405:5:28", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -4374,19 +4374,19 @@ "components": [ { "argumentTypes": null, - "id": 6776, + "id": 6767, "name": "ImportMakerVaultCallData", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6523, + "referencedDeclaration": 6514, "src": "3413:24:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_ImportMakerVaultCallData_$6523_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ImportMakerVaultCallData_$6514_storage_ptr_$", "typeString": "type(struct DedgeMakerManager.ImportMakerVaultCallData storage pointer)" } } ], - "id": 6777, + "id": 6768, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4395,7 +4395,7 @@ "nodeType": "TupleExpression", "src": "3412:26:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_ImportMakerVaultCallData_$6523_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ImportMakerVaultCallData_$6514_storage_ptr_$", "typeString": "type(struct DedgeMakerManager.ImportMakerVaultCallData storage pointer)" } } @@ -4407,24 +4407,24 @@ "typeString": "bytes calldata" }, { - "typeIdentifier": "t_type$_t_struct$_ImportMakerVaultCallData_$6523_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ImportMakerVaultCallData_$6514_storage_ptr_$", "typeString": "type(struct DedgeMakerManager.ImportMakerVaultCallData storage pointer)" } ], "expression": { "argumentTypes": null, - "id": 6773, + "id": 6764, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "3394:3:28", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 6774, + "id": 6765, "isConstant": false, "isLValue": false, "isPure": true, @@ -4438,7 +4438,7 @@ "typeString": "function () pure" } }, - "id": 6778, + "id": 6769, "isConstant": false, "isLValue": false, "isPure": false, @@ -4448,7 +4448,7 @@ "nodeType": "FunctionCall", "src": "3394:45:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, @@ -4457,31 +4457,31 @@ }, { "assignments": [ - 6781 + 6772 ], "declarations": [ { "constant": false, - "id": 6781, + "id": 6772, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3483:31:28", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 6780, + "id": 6771, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "3483:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -4489,7 +4489,7 @@ "visibility": "internal" } ], - "id": 6786, + "id": 6777, "initialValue": { "argumentTypes": null, "arguments": [ @@ -4497,25 +4497,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6783, + "id": 6774, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "3533:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6784, + "id": 6775, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "addressRegistryAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 6514, + "referencedDeclaration": 6505, "src": "3533:34:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4530,18 +4530,18 @@ "typeString": "address" } ], - "id": 6782, + "id": 6773, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "3517:15:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 6785, + "id": 6776, "isConstant": false, "isLValue": false, "isPure": false, @@ -4551,7 +4551,7 @@ "nodeType": "FunctionCall", "src": "3517:51:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -4560,15 +4560,15 @@ }, { "assignments": [ - 6788 + 6779 ], "declarations": [ { "constant": false, - "id": 6788, + "id": 6779, "name": "cdpManager", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3578:18:28", "stateVariable": false, "storageLocation": "default", @@ -4577,7 +4577,7 @@ "typeString": "address" }, "typeName": { - "id": 6787, + "id": 6778, "name": "address", "nodeType": "ElementaryTypeName", "src": "3578:7:28", @@ -4591,7 +4591,7 @@ "visibility": "internal" } ], - "id": 6792, + "id": 6783, "initialValue": { "argumentTypes": null, "arguments": [], @@ -4599,32 +4599,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6789, + "id": 6780, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "3599:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6790, + "id": 6781, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DssCdpManagerAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7549, + "referencedDeclaration": 7540, "src": "3599:36:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6791, + "id": 6782, "isConstant": false, "isLValue": false, "isPure": false, @@ -4643,15 +4643,15 @@ }, { "assignments": [ - 6794 + 6785 ], "declarations": [ { "constant": false, - "id": 6794, + "id": 6785, "name": "collateralCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3647:31:28", "stateVariable": false, "storageLocation": "default", @@ -4660,7 +4660,7 @@ "typeString": "address" }, "typeName": { - "id": 6793, + "id": 6784, "name": "address", "nodeType": "ElementaryTypeName", "src": "3647:7:28", @@ -4674,30 +4674,30 @@ "visibility": "internal" } ], - "id": 6797, + "id": 6788, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6795, + "id": 6786, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "3681:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6796, + "id": 6787, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralCTokenAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 6518, + "referencedDeclaration": 6509, "src": "3681:35:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4709,15 +4709,15 @@ }, { "assignments": [ - 6799 + 6790 ], "declarations": [ { "constant": false, - "id": 6799, + "id": 6790, "name": "collateral18", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3770:17:28", "stateVariable": false, "storageLocation": "default", @@ -4726,7 +4726,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6798, + "id": 6789, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3770:4:28", @@ -4739,17 +4739,17 @@ "visibility": "internal" } ], - "id": 6805, + "id": 6796, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6801, + "id": 6792, "name": "cdpManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6788, + "referencedDeclaration": 6779, "src": "3809:10:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4760,25 +4760,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6802, + "id": 6793, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "3821:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6803, + "id": 6794, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "cdpId", "nodeType": "MemberAccess", - "referencedDeclaration": 6516, + "referencedDeclaration": 6507, "src": "3821:17:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4797,18 +4797,18 @@ "typeString": "uint256" } ], - "id": 6800, + "id": 6791, "name": "getVaultCollateral", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6752, + "referencedDeclaration": 6743, "src": "3790:18:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 6804, + "id": 6795, "isConstant": false, "isLValue": false, "isPure": false, @@ -4827,15 +4827,15 @@ }, { "assignments": [ - 6809 + 6800 ], "declarations": [ { "constant": false, - "id": 6809, + "id": 6800, "name": "enterMarketsCToken", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3926:35:28", "stateVariable": false, "storageLocation": "memory", @@ -4845,7 +4845,7 @@ }, "typeName": { "baseType": { - "id": 6807, + "id": 6798, "name": "address", "nodeType": "ElementaryTypeName", "src": "3926:7:28", @@ -4854,7 +4854,7 @@ "typeString": "address" } }, - "id": 6808, + "id": 6799, "length": null, "nodeType": "ArrayTypeName", "src": "3926:9:28", @@ -4867,14 +4867,14 @@ "visibility": "internal" } ], - "id": 6815, + "id": 6806, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "32", - "id": 6813, + "id": 6804, "isConstant": false, "isLValue": false, "isPure": true, @@ -4897,7 +4897,7 @@ "typeString": "int_const 2" } ], - "id": 6812, + "id": 6803, "isConstant": false, "isLValue": false, "isPure": true, @@ -4910,7 +4910,7 @@ }, "typeName": { "baseType": { - "id": 6810, + "id": 6801, "name": "address", "nodeType": "ElementaryTypeName", "src": "3968:7:28", @@ -4920,7 +4920,7 @@ "typeString": "address" } }, - "id": 6811, + "id": 6802, "length": null, "nodeType": "ArrayTypeName", "src": "3968:9:28", @@ -4930,7 +4930,7 @@ } } }, - "id": 6814, + "id": 6805, "isConstant": false, "isLValue": false, "isPure": true, @@ -4950,7 +4950,7 @@ { "expression": { "argumentTypes": null, - "id": 6820, + "id": 6811, "isConstant": false, "isLValue": false, "isPure": false, @@ -4959,22 +4959,22 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 6816, + "id": 6807, "name": "enterMarketsCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6809, + "referencedDeclaration": 6800, "src": "3990:18:28", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 6818, + "id": 6809, "indexExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6817, + "id": 6808, "isConstant": false, "isLValue": false, "isPure": true, @@ -5004,11 +5004,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 6819, + "id": 6810, "name": "collateralCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6794, + "referencedDeclaration": 6785, "src": "4014:23:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5021,14 +5021,14 @@ "typeString": "address" } }, - "id": 6821, + "id": 6812, "nodeType": "ExpressionStatement", "src": "3990:47:28" }, { "expression": { "argumentTypes": null, - "id": 6828, + "id": 6819, "isConstant": false, "isLValue": false, "isPure": false, @@ -5037,22 +5037,22 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 6822, + "id": 6813, "name": "enterMarketsCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6809, + "referencedDeclaration": 6800, "src": "4047:18:28", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 6824, + "id": 6815, "indexExpression": { "argumentTypes": null, "hexValue": "31", - "id": 6823, + "id": 6814, "isConstant": false, "isLValue": false, "isPure": true, @@ -5087,32 +5087,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6825, + "id": 6816, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "4071:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6826, + "id": 6817, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CDaiAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7516, + "referencedDeclaration": 7507, "src": "4071:27:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6827, + "id": 6818, "isConstant": false, "isLValue": false, "isPure": false, @@ -5132,21 +5132,21 @@ "typeString": "address" } }, - "id": 6829, + "id": 6820, "nodeType": "ExpressionStatement", "src": "4047:53:28" }, { "assignments": [ - 6833 + 6824 ], "declarations": [ { "constant": false, - "id": 6833, + "id": 6824, "name": "enterMarketErrors", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "4111:31:28", "stateVariable": false, "storageLocation": "memory", @@ -5156,7 +5156,7 @@ }, "typeName": { "baseType": { - "id": 6831, + "id": 6822, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4111:4:28", @@ -5165,7 +5165,7 @@ "typeString": "uint256" } }, - "id": 6832, + "id": 6823, "length": null, "nodeType": "ArrayTypeName", "src": "4111:6:28", @@ -5178,17 +5178,17 @@ "visibility": "internal" } ], - "id": 6842, + "id": 6833, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6840, + "id": 6831, "name": "enterMarketsCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6809, + "referencedDeclaration": 6800, "src": "4239:18:28", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", @@ -5213,32 +5213,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6835, + "id": 6826, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "4171:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6836, + "id": 6827, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CompoundComptrollerAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7507, + "referencedDeclaration": 7498, "src": "4171:42:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6837, + "id": 6828, "isConstant": false, "isLValue": false, "isPure": false, @@ -5260,18 +5260,18 @@ "typeString": "address" } ], - "id": 6834, + "id": 6825, "name": "IComptroller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1096, + "referencedDeclaration": 1122, "src": "4145:12:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IComptroller_$1096_$", + "typeIdentifier": "t_type$_t_contract$_IComptroller_$1122_$", "typeString": "type(contract IComptroller)" } }, - "id": 6838, + "id": 6829, "isConstant": false, "isLValue": false, "isPure": false, @@ -5281,25 +5281,25 @@ "nodeType": "FunctionCall", "src": "4145:80:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_IComptroller_$1096", + "typeIdentifier": "t_contract$_IComptroller_$1122", "typeString": "contract IComptroller" } }, - "id": 6839, + "id": 6830, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "enterMarkets", "nodeType": "MemberAccess", - "referencedDeclaration": 884, + "referencedDeclaration": 910, "src": "4145:93:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_array$_t_address_$dyn_memory_ptr_$returns$_t_array$_t_uint256_$dyn_memory_ptr_$", "typeString": "function (address[] memory) external returns (uint256[] memory)" } }, - "id": 6841, + "id": 6832, "isConstant": false, "isLValue": false, "isPure": false, @@ -5326,7 +5326,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6848, + "id": 6839, "isConstant": false, "isLValue": false, "isPure": false, @@ -5335,22 +5335,22 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 6844, + "id": 6835, "name": "enterMarketErrors", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6833, + "referencedDeclaration": 6824, "src": "4277:17:28", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 6846, + "id": 6837, "indexExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6845, + "id": 6836, "isConstant": false, "isLValue": false, "isPure": true, @@ -5381,7 +5381,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6847, + "id": 6838, "isConstant": false, "isLValue": false, "isPure": true, @@ -5405,7 +5405,7 @@ { "argumentTypes": null, "hexValue": "6d6b722d656e7465722d67656d2d6661696c6564", - "id": 6849, + "id": 6840, "isConstant": false, "isLValue": false, "isPure": true, @@ -5432,21 +5432,21 @@ "typeString": "literal_string \"mkr-enter-gem-failed\"" } ], - "id": 6843, + "id": 6834, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "4269:7:28", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6850, + "id": 6841, "isConstant": false, "isLValue": false, "isPure": false, @@ -5460,7 +5460,7 @@ "typeString": "tuple()" } }, - "id": 6851, + "id": 6842, "nodeType": "ExpressionStatement", "src": "4269:58:28" }, @@ -5474,7 +5474,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6857, + "id": 6848, "isConstant": false, "isLValue": false, "isPure": false, @@ -5483,22 +5483,22 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 6853, + "id": 6844, "name": "enterMarketErrors", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6833, + "referencedDeclaration": 6824, "src": "4345:17:28", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 6855, + "id": 6846, "indexExpression": { "argumentTypes": null, "hexValue": "31", - "id": 6854, + "id": 6845, "isConstant": false, "isLValue": false, "isPure": true, @@ -5529,7 +5529,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6856, + "id": 6847, "isConstant": false, "isLValue": false, "isPure": true, @@ -5553,7 +5553,7 @@ { "argumentTypes": null, "hexValue": "6d6b722d656e7465722d6461692d6661696c6564", - "id": 6858, + "id": 6849, "isConstant": false, "isLValue": false, "isPure": true, @@ -5580,21 +5580,21 @@ "typeString": "literal_string \"mkr-enter-dai-failed\"" } ], - "id": 6852, + "id": 6843, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "4337:7:28", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6859, + "id": 6850, "isConstant": false, "isLValue": false, "isPure": false, @@ -5608,7 +5608,7 @@ "typeString": "tuple()" } }, - "id": 6860, + "id": 6851, "nodeType": "ExpressionStatement", "src": "4337:58:28" }, @@ -5619,7 +5619,7 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 6871, + "id": 6862, "isConstant": false, "isLValue": false, "isPure": false, @@ -5631,25 +5631,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6865, + "id": 6856, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "4439:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6866, + "id": 6857, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "cdpId", "nodeType": "MemberAccess", - "referencedDeclaration": 6516, + "referencedDeclaration": 6507, "src": "4439:17:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5669,11 +5669,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6862, + "id": 6853, "name": "cdpManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6788, + "referencedDeclaration": 6779, "src": "4422:10:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5688,18 +5688,18 @@ "typeString": "address" } ], - "id": 6861, + "id": 6852, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "4410:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6863, + "id": 6854, "isConstant": false, "isLValue": false, "isPure": false, @@ -5709,25 +5709,25 @@ "nodeType": "FunctionCall", "src": "4410:23:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6864, + "id": 6855, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "4410:28:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 6867, + "id": 6858, "isConstant": false, "isLValue": false, "isPure": false, @@ -5749,7 +5749,7 @@ { "argumentTypes": null, "hexValue": "4554482d41", - "id": 6869, + "id": 6860, "isConstant": false, "isLValue": false, "isPure": true, @@ -5772,7 +5772,7 @@ "typeString": "literal_string \"ETH-A\"" } ], - "id": 6868, + "id": 6859, "isConstant": false, "isLValue": false, "isPure": true, @@ -5785,7 +5785,7 @@ }, "typeName": "bytes32" }, - "id": 6870, + "id": 6861, "isConstant": false, "isLValue": false, "isPure": true, @@ -5806,7 +5806,7 @@ } }, "falseBody": { - "id": 6973, + "id": 6964, "nodeType": "Block", "src": "5017:1194:28", "statements": [ @@ -5816,11 +5816,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6912, + "id": 6903, "name": "cdpManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6788, + "referencedDeclaration": 6779, "src": "5090:10:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5831,25 +5831,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6913, + "id": 6904, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "5118:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6914, + "id": 6905, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralJoinAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 6520, + "referencedDeclaration": 6511, "src": "5118:33:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5863,32 +5863,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6915, + "id": 6906, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "5169:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6916, + "id": 6907, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DaiJoinAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7540, + "referencedDeclaration": 7531, "src": "5169:30:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6917, + "id": 6908, "isConstant": false, "isLValue": false, "isPure": false, @@ -5906,25 +5906,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6918, + "id": 6909, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "5219:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6919, + "id": 6910, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "cdpId", "nodeType": "MemberAccess", - "referencedDeclaration": 6516, + "referencedDeclaration": 6507, "src": "5219:17:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5938,25 +5938,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6921, + "id": 6912, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "5296:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6922, + "id": 6913, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralJoinAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 6520, + "referencedDeclaration": 6511, "src": "5296:33:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5965,11 +5965,11 @@ }, { "argumentTypes": null, - "id": 6923, + "id": 6914, "name": "collateral18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6799, + "referencedDeclaration": 6790, "src": "5351:12:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5988,18 +5988,18 @@ "typeString": "uint256" } ], - "id": 6920, + "id": 6911, "name": "_convert18ToGemUnits", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6651, + "referencedDeclaration": 6642, "src": "5254:20:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 6924, + "id": 6915, "isConstant": false, "isLValue": false, "isPure": false, @@ -6037,18 +6037,18 @@ "typeString": "uint256" } ], - "id": 6911, + "id": 6902, "name": "wipeAllAndFreeGem", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4710, + "referencedDeclaration": 4762, "src": "5055:17:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (address,address,address,uint256,uint256)" } }, - "id": 6925, + "id": 6916, "isConstant": false, "isLValue": false, "isPure": false, @@ -6062,21 +6062,21 @@ "typeString": "tuple()" } }, - "id": 6926, + "id": 6917, "nodeType": "ExpressionStatement", "src": "5055:340:28" }, { "assignments": [ - 6928 + 6919 ], "declarations": [ { "constant": false, - "id": 6928, + "id": 6919, "name": "collateralFixedDec", "nodeType": "VariableDeclaration", - "scope": 6973, + "scope": 6964, "src": "5471:23:28", "stateVariable": false, "storageLocation": "default", @@ -6085,7 +6085,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6927, + "id": 6918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5471:4:28", @@ -6098,17 +6098,17 @@ "visibility": "internal" } ], - "id": 6934, + "id": 6925, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6930, + "id": 6921, "name": "collateral18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6799, + "referencedDeclaration": 6790, "src": "5534:12:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6119,25 +6119,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6931, + "id": 6922, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "5548:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6932, + "id": 6923, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralDecimals", "nodeType": "MemberAccess", - "referencedDeclaration": 6522, + "referencedDeclaration": 6513, "src": "5548:30:28", "typeDescriptions": { "typeIdentifier": "t_uint8", @@ -6156,18 +6156,18 @@ "typeString": "uint8" } ], - "id": 6929, + "id": 6920, "name": "_convert18ToDecimal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6627, + "referencedDeclaration": 6618, "src": "5497:19:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_uint8_$returns$_t_uint256_$", "typeString": "function (uint256,uint8) returns (uint256)" } }, - "id": 6933, + "id": 6924, "isConstant": false, "isLValue": false, "isPure": false, @@ -6190,11 +6190,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6943, + "id": 6934, "name": "collateralCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6794, + "referencedDeclaration": 6785, "src": "5766:23:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6203,11 +6203,11 @@ }, { "argumentTypes": null, - "id": 6944, + "id": 6935, "name": "collateralFixedDec", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6928, + "referencedDeclaration": 6919, "src": "5791:18:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6239,11 +6239,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6937, + "id": 6928, "name": "collateralCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6794, + "referencedDeclaration": 6785, "src": "5702:23:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6258,18 +6258,18 @@ "typeString": "address" } ], - "id": 6936, + "id": 6927, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "5694:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6938, + "id": 6929, "isConstant": false, "isLValue": false, "isPure": false, @@ -6279,25 +6279,25 @@ "nodeType": "FunctionCall", "src": "5694:32:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6939, + "id": 6930, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, + "referencedDeclaration": 835, "src": "5694:43:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6940, + "id": 6931, "isConstant": false, "isLValue": false, "isPure": false, @@ -6319,7 +6319,7 @@ "typeString": "address" } ], - "id": 6935, + "id": 6926, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -6330,7 +6330,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 6941, + "id": 6932, "isConstant": false, "isLValue": false, "isPure": false, @@ -6344,7 +6344,7 @@ "typeString": "contract IERC20" } }, - "id": 6942, + "id": 6933, "isConstant": false, "isLValue": false, "isPure": false, @@ -6358,7 +6358,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 6945, + "id": 6936, "isConstant": false, "isLValue": false, "isPure": false, @@ -6372,7 +6372,7 @@ "typeString": "bool" } }, - "id": 6946, + "id": 6937, "nodeType": "ExpressionStatement", "src": "5687:123:28" }, @@ -6386,7 +6386,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6955, + "id": 6946, "isConstant": false, "isLValue": false, "isPure": false, @@ -6396,11 +6396,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6952, + "id": 6943, "name": "collateralFixedDec", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6928, + "referencedDeclaration": 6919, "src": "5961:18:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6420,11 +6420,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6949, + "id": 6940, "name": "collateralCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6794, + "referencedDeclaration": 6785, "src": "5910:23:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6439,18 +6439,18 @@ "typeString": "address" } ], - "id": 6948, + "id": 6939, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "5902:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6950, + "id": 6941, "isConstant": false, "isLValue": false, "isPure": false, @@ -6460,25 +6460,25 @@ "nodeType": "FunctionCall", "src": "5902:32:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6951, + "id": 6942, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "mint", "nodeType": "MemberAccess", - "referencedDeclaration": 741, + "referencedDeclaration": 754, "src": "5902:37:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 6953, + "id": 6944, "isConstant": false, "isLValue": false, "isPure": false, @@ -6497,7 +6497,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6954, + "id": 6945, "isConstant": false, "isLValue": false, "isPure": true, @@ -6521,7 +6521,7 @@ { "argumentTypes": null, "hexValue": "67656d2d737570706c792d6661696c", - "id": 6956, + "id": 6947, "isConstant": false, "isLValue": false, "isPure": true, @@ -6548,21 +6548,21 @@ "typeString": "literal_string \"gem-supply-fail\"" } ], - "id": 6947, + "id": 6938, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "5877:7:28", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6957, + "id": 6948, "isConstant": false, "isLValue": false, "isPure": false, @@ -6576,7 +6576,7 @@ "typeString": "tuple()" } }, - "id": 6958, + "id": 6949, "nodeType": "ExpressionStatement", "src": "5877:174:28" }, @@ -6590,7 +6590,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6969, + "id": 6960, "isConstant": false, "isLValue": false, "isPure": false, @@ -6600,11 +6600,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6966, + "id": 6957, "name": "totalDebt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6764, + "referencedDeclaration": 6755, "src": "6136:9:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6629,32 +6629,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6961, + "id": 6952, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "6098:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6962, + "id": 6953, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CDaiAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7516, + "referencedDeclaration": 7507, "src": "6098:27:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6963, + "id": 6954, "isConstant": false, "isLValue": false, "isPure": false, @@ -6676,18 +6676,18 @@ "typeString": "address" } ], - "id": 6960, + "id": 6951, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "6090:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6964, + "id": 6955, "isConstant": false, "isLValue": false, "isPure": false, @@ -6697,25 +6697,25 @@ "nodeType": "FunctionCall", "src": "6090:38:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6965, + "id": 6956, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "borrow", "nodeType": "MemberAccess", - "referencedDeclaration": 762, + "referencedDeclaration": 775, "src": "6090:45:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 6967, + "id": 6958, "isConstant": false, "isLValue": false, "isPure": false, @@ -6734,7 +6734,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6968, + "id": 6959, "isConstant": false, "isLValue": false, "isPure": true, @@ -6758,7 +6758,7 @@ { "argumentTypes": null, "hexValue": "6461692d626f72726f772d6661696c", - "id": 6970, + "id": 6961, "isConstant": false, "isLValue": false, "isPure": true, @@ -6785,21 +6785,21 @@ "typeString": "literal_string \"dai-borrow-fail\"" } ], - "id": 6959, + "id": 6950, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "6065:7:28", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6971, + "id": 6962, "isConstant": false, "isLValue": false, "isPure": false, @@ -6813,17 +6813,17 @@ "typeString": "tuple()" } }, - "id": 6972, + "id": 6963, "nodeType": "ExpressionStatement", "src": "6065:135:28" } ] }, - "id": 6974, + "id": 6965, "nodeType": "IfStatement", "src": "4406:1805:28", "trueBody": { - "id": 6910, + "id": 6901, "nodeType": "Block", "src": "4479:532:28", "statements": [ @@ -6833,11 +6833,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6873, + "id": 6864, "name": "cdpManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6788, + "referencedDeclaration": 6779, "src": "4528:10:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6851,32 +6851,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6874, + "id": 6865, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "4556:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6875, + "id": 6866, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "EthJoinAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7531, + "referencedDeclaration": 7522, "src": "4556:30:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6876, + "id": 6867, "isConstant": false, "isLValue": false, "isPure": false, @@ -6897,32 +6897,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6877, + "id": 6868, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "4606:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6878, + "id": 6869, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DaiJoinAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7540, + "referencedDeclaration": 7531, "src": "4606:30:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6879, + "id": 6870, "isConstant": false, "isLValue": false, "isPure": false, @@ -6940,25 +6940,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6880, + "id": 6871, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "4656:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6881, + "id": 6872, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "cdpId", "nodeType": "MemberAccess", - "referencedDeclaration": 6516, + "referencedDeclaration": 6507, "src": "4656:17:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6967,11 +6967,11 @@ }, { "argumentTypes": null, - "id": 6882, + "id": 6873, "name": "collateral18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6799, + "referencedDeclaration": 6790, "src": "4691:12:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7002,18 +7002,18 @@ "typeString": "uint256" } ], - "id": 6872, + "id": 6863, "name": "wipeAllAndFreeETH", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4610, + "referencedDeclaration": 4662, "src": "4493:17:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (address,address,address,uint256,uint256)" } }, - "id": 6883, + "id": 6874, "isConstant": false, "isLValue": false, "isPure": false, @@ -7027,7 +7027,7 @@ "typeString": "tuple()" } }, - "id": 6884, + "id": 6875, "nodeType": "ExpressionStatement", "src": "4493:224:28" }, @@ -7040,11 +7040,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6892, + "id": 6883, "name": "collateral18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6799, + "referencedDeclaration": 6790, "src": "4836:12:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7071,32 +7071,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6886, + "id": 6877, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "4792:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6887, + "id": 6878, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, + "referencedDeclaration": 7501, "src": "4792:29:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6888, + "id": 6879, "isConstant": false, "isLValue": false, "isPure": false, @@ -7118,18 +7118,18 @@ "typeString": "address" } ], - "id": 6885, + "id": 6876, "name": "ICEther", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 732, + "referencedDeclaration": 745, "src": "4784:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICEther_$732_$", + "typeIdentifier": "t_type$_t_contract$_ICEther_$745_$", "typeString": "type(contract ICEther)" } }, - "id": 6889, + "id": 6880, "isConstant": false, "isLValue": false, "isPure": false, @@ -7139,11 +7139,11 @@ "nodeType": "FunctionCall", "src": "4784:40:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICEther_$732", + "typeIdentifier": "t_contract$_ICEther_$745", "typeString": "contract ICEther" } }, - "id": 6890, + "id": 6881, "isConstant": false, "isLValue": false, "isPure": false, @@ -7157,7 +7157,7 @@ "typeString": "function () payable external" } }, - "id": 6891, + "id": 6882, "isConstant": false, "isLValue": false, "isPure": false, @@ -7171,7 +7171,7 @@ "typeString": "function (uint256) pure returns (function () payable external)" } }, - "id": 6893, + "id": 6884, "isConstant": false, "isLValue": false, "isPure": false, @@ -7185,7 +7185,7 @@ "typeString": "function () payable external" } }, - "id": 6894, + "id": 6885, "isConstant": false, "isLValue": false, "isPure": false, @@ -7199,7 +7199,7 @@ "typeString": "tuple()" } }, - "id": 6895, + "id": 6886, "nodeType": "ExpressionStatement", "src": "4784:67:28" }, @@ -7213,7 +7213,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6906, + "id": 6897, "isConstant": false, "isLValue": false, "isPure": false, @@ -7223,11 +7223,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6903, + "id": 6894, "name": "totalDebt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6764, + "referencedDeclaration": 6755, "src": "4936:9:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7252,32 +7252,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6898, + "id": 6889, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "4898:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6899, + "id": 6890, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CDaiAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7516, + "referencedDeclaration": 7507, "src": "4898:27:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6900, + "id": 6891, "isConstant": false, "isLValue": false, "isPure": false, @@ -7299,18 +7299,18 @@ "typeString": "address" } ], - "id": 6897, + "id": 6888, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "4890:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6901, + "id": 6892, "isConstant": false, "isLValue": false, "isPure": false, @@ -7320,25 +7320,25 @@ "nodeType": "FunctionCall", "src": "4890:38:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6902, + "id": 6893, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "borrow", "nodeType": "MemberAccess", - "referencedDeclaration": 762, + "referencedDeclaration": 775, "src": "4890:45:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 6904, + "id": 6895, "isConstant": false, "isLValue": false, "isPure": false, @@ -7357,7 +7357,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6905, + "id": 6896, "isConstant": false, "isLValue": false, "isPure": true, @@ -7381,7 +7381,7 @@ { "argumentTypes": null, "hexValue": "6461692d626f72726f772d6661696c", - "id": 6907, + "id": 6898, "isConstant": false, "isLValue": false, "isPure": true, @@ -7408,21 +7408,21 @@ "typeString": "literal_string \"dai-borrow-fail\"" } ], - "id": 6896, + "id": 6887, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "4865:7:28", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6908, + "id": 6899, "isConstant": false, "isLValue": false, "isPure": false, @@ -7436,7 +7436,7 @@ "typeString": "tuple()" } }, - "id": 6909, + "id": 6900, "nodeType": "ExpressionStatement", "src": "4865:135:28" } @@ -7446,22 +7446,22 @@ ] }, "documentation": null, - "id": 6976, + "id": 6967, "implemented": true, "kind": "function", "modifiers": [], "name": "importMakerVaultPostLoan", "nodeType": "FunctionDefinition", "parameters": { - "id": 6761, + "id": 6752, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6754, + "id": 6745, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 6976, + "scope": 6967, "src": "3109:12:28", "stateVariable": false, "storageLocation": "default", @@ -7470,7 +7470,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6753, + "id": 6744, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3109:4:28", @@ -7484,10 +7484,10 @@ }, { "constant": false, - "id": 6756, + "id": 6747, "name": "_aaveFee", "nodeType": "VariableDeclaration", - "scope": 6976, + "scope": 6967, "src": "3131:13:28", "stateVariable": false, "storageLocation": "default", @@ -7496,7 +7496,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6755, + "id": 6746, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3131:4:28", @@ -7510,10 +7510,10 @@ }, { "constant": false, - "id": 6758, + "id": 6749, "name": "_protocolFee", "nodeType": "VariableDeclaration", - "scope": 6976, + "scope": 6967, "src": "3154:17:28", "stateVariable": false, "storageLocation": "default", @@ -7522,7 +7522,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6757, + "id": 6748, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3154:4:28", @@ -7536,10 +7536,10 @@ }, { "constant": false, - "id": 6760, + "id": 6751, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 6976, + "scope": 6967, "src": "3181:20:28", "stateVariable": false, "storageLocation": "calldata", @@ -7548,7 +7548,7 @@ "typeString": "bytes" }, "typeName": { - "id": 6759, + "id": 6750, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "3181:5:28", @@ -7564,12 +7564,12 @@ "src": "3099:108:28" }, "returnParameters": { - "id": 6762, + "id": 6753, "nodeType": "ParameterList", "parameters": [], "src": "3217:0:28" }, - "scope": 7077, + "scope": 7068, "src": "3066:3151:28", "stateMutability": "nonpayable", "superFunction": null, @@ -7577,37 +7577,37 @@ }, { "body": { - "id": 7075, + "id": 7066, "nodeType": "Block", "src": "7389:1524:28", "statements": [ { "assignments": [ - 6990 + 6981 ], "declarations": [ { "constant": false, - "id": 6990, + "id": 6981, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 7075, + "scope": 7066, "src": "7431:31:28", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 6989, + "id": 6980, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "7431:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -7615,17 +7615,17 @@ "visibility": "internal" } ], - "id": 6994, + "id": 6985, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6992, + "id": 6983, "name": "addressRegistryAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6982, + "referencedDeclaration": 6973, "src": "7481:22:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7640,18 +7640,18 @@ "typeString": "address" } ], - "id": 6991, + "id": 6982, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "7465:15:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 6993, + "id": 6984, "isConstant": false, "isLValue": false, "isPure": false, @@ -7661,7 +7661,7 @@ "nodeType": "FunctionCall", "src": "7465:39:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -7670,15 +7670,15 @@ }, { "assignments": [ - 6996 + 6987 ], "declarations": [ { "constant": false, - "id": 6996, + "id": 6987, "name": "cdpManager", "nodeType": "VariableDeclaration", - "scope": 7075, + "scope": 7066, "src": "7567:18:28", "stateVariable": false, "storageLocation": "default", @@ -7687,7 +7687,7 @@ "typeString": "address" }, "typeName": { - "id": 6995, + "id": 6986, "name": "address", "nodeType": "ElementaryTypeName", "src": "7567:7:28", @@ -7701,7 +7701,7 @@ "visibility": "internal" } ], - "id": 7000, + "id": 6991, "initialValue": { "argumentTypes": null, "arguments": [], @@ -7709,32 +7709,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6997, + "id": 6988, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6990, + "referencedDeclaration": 6981, "src": "7588:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6998, + "id": 6989, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DssCdpManagerAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7549, + "referencedDeclaration": 7540, "src": "7588:36:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6999, + "id": 6990, "isConstant": false, "isLValue": false, "isPure": false, @@ -7753,15 +7753,15 @@ }, { "assignments": [ - 7002 + 6993 ], "declarations": [ { "constant": false, - "id": 7002, + "id": 6993, "name": "daiDebt", "nodeType": "VariableDeclaration", - "scope": 7075, + "scope": 7066, "src": "7657:12:28", "stateVariable": false, "storageLocation": "default", @@ -7770,7 +7770,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7001, + "id": 6992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7657:4:28", @@ -7783,17 +7783,17 @@ "visibility": "internal" } ], - "id": 7007, + "id": 6998, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 7004, + "id": 6995, "name": "cdpManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6996, + "referencedDeclaration": 6987, "src": "7685:10:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7802,11 +7802,11 @@ }, { "argumentTypes": null, - "id": 7005, + "id": 6996, "name": "cdpId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6984, + "referencedDeclaration": 6975, "src": "7697:5:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7825,18 +7825,18 @@ "typeString": "uint256" } ], - "id": 7003, + "id": 6994, "name": "getVaultDebt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6705, + "referencedDeclaration": 6696, "src": "7672:12:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 7006, + "id": 6997, "isConstant": false, "isLValue": false, "isPure": false, @@ -7855,15 +7855,15 @@ }, { "assignments": [ - 7009 + 7000 ], "declarations": [ { "constant": false, - "id": 7009, + "id": 7000, "name": "addressAndExecuteOperationCalldataParams", "nodeType": "VariableDeclaration", - "scope": 7075, + "scope": 7066, "src": "7854:53:28", "stateVariable": false, "storageLocation": "memory", @@ -7872,7 +7872,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7008, + "id": 6999, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "7854:5:28", @@ -7885,7 +7885,7 @@ "visibility": "internal" } ], - "id": 7018, + "id": 7009, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7894,11 +7894,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7014, + "id": 7005, "name": "dedgeMakerManagerAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6978, + "referencedDeclaration": 6969, "src": "7951:24:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7915,18 +7915,18 @@ ], "expression": { "argumentTypes": null, - "id": 7012, + "id": 7003, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "7940:3:28", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 7013, + "id": 7004, "isConstant": false, "isLValue": false, "isPure": true, @@ -7940,7 +7940,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 7015, + "id": 7006, "isConstant": false, "isLValue": false, "isPure": false, @@ -7956,11 +7956,11 @@ }, { "argumentTypes": null, - "id": 7016, + "id": 7007, "name": "executeOperationCalldataParams", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6986, + "referencedDeclaration": 6977, "src": "7990:30:28", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -7981,18 +7981,18 @@ ], "expression": { "argumentTypes": null, - "id": 7010, + "id": 7001, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "7910:3:28", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 7011, + "id": 7002, "isConstant": false, "isLValue": false, "isPure": true, @@ -8006,7 +8006,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 7017, + "id": 7008, "isConstant": false, "isLValue": false, "isPure": false, @@ -8025,15 +8025,15 @@ }, { "assignments": [ - 7020 + 7011 ], "declarations": [ { "constant": false, - "id": 7020, + "id": 7011, "name": "lendingPool", "nodeType": "VariableDeclaration", - "scope": 7075, + "scope": 7066, "src": "8085:24:28", "stateVariable": false, "storageLocation": "default", @@ -8043,7 +8043,7 @@ }, "typeName": { "contractScope": null, - "id": 7019, + "id": 7010, "name": "ILendingPool", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 546, @@ -8057,7 +8057,7 @@ "visibility": "internal" } ], - "id": 7030, + "id": 7021, "initialValue": { "argumentTypes": null, "arguments": [ @@ -8076,32 +8076,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 7023, + "id": 7014, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6990, + "referencedDeclaration": 6981, "src": "8185:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 7024, + "id": 7015, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "AaveLendingPoolAddressProviderAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7495, + "referencedDeclaration": 7486, "src": "8185:53:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 7025, + "id": 7016, "isConstant": false, "isLValue": false, "isPure": false, @@ -8123,7 +8123,7 @@ "typeString": "address" } ], - "id": 7022, + "id": 7013, "name": "ILendingPoolAddressesProvider", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -8134,7 +8134,7 @@ "typeString": "type(contract ILendingPoolAddressesProvider)" } }, - "id": 7026, + "id": 7017, "isConstant": false, "isLValue": false, "isPure": false, @@ -8148,7 +8148,7 @@ "typeString": "contract ILendingPoolAddressesProvider" } }, - "id": 7027, + "id": 7018, "isConstant": false, "isLValue": false, "isPure": false, @@ -8162,7 +8162,7 @@ "typeString": "function () view external returns (address)" } }, - "id": 7028, + "id": 7019, "isConstant": false, "isLValue": false, "isPure": false, @@ -8184,7 +8184,7 @@ "typeString": "address" } ], - "id": 7021, + "id": 7012, "name": "ILendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -8195,7 +8195,7 @@ "typeString": "type(contract ILendingPool)" } }, - "id": 7029, + "id": 7020, "isConstant": false, "isLValue": false, "isPure": false, @@ -8223,32 +8223,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 7032, + "id": 7023, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6990, + "referencedDeclaration": 6981, "src": "8301:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 7033, + "id": 7024, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DssCdpManagerAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7549, + "referencedDeclaration": 7540, "src": "8301:36:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 7034, + "id": 7025, "isConstant": false, "isLValue": false, "isPure": false, @@ -8264,11 +8264,11 @@ }, { "argumentTypes": null, - "id": 7035, + "id": 7026, "name": "cdpId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6984, + "referencedDeclaration": 6975, "src": "8341:5:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8277,11 +8277,11 @@ }, { "argumentTypes": null, - "id": 7036, + "id": 7027, "name": "dedgeMakerManagerAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6978, + "referencedDeclaration": 6969, "src": "8348:24:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8291,7 +8291,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 7037, + "id": 7028, "isConstant": false, "isLValue": false, "isPure": true, @@ -8326,18 +8326,18 @@ "typeString": "int_const 1" } ], - "id": 7031, + "id": 7022, "name": "cdpAllow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4466, + "referencedDeclaration": 4518, "src": "8292:8:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 7038, + "id": 7029, "isConstant": false, "isLValue": false, "isPure": false, @@ -8351,7 +8351,7 @@ "typeString": "tuple()" } }, - "id": 7039, + "id": 7030, "nodeType": "ExpressionStatement", "src": "8292:84:28" }, @@ -8361,11 +8361,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7041, + "id": 7032, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6980, + "referencedDeclaration": 6971, "src": "8404:15:28", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -8377,11 +8377,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7043, + "id": 7034, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7020, + "referencedDeclaration": 7011, "src": "8429:11:28", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", @@ -8396,7 +8396,7 @@ "typeString": "contract ILendingPool" } ], - "id": 7042, + "id": 7033, "isConstant": false, "isLValue": false, "isPure": true, @@ -8409,7 +8409,7 @@ }, "typeName": "address" }, - "id": 7044, + "id": 7035, "isConstant": false, "isLValue": false, "isPure": false, @@ -8435,18 +8435,18 @@ "typeString": "address" } ], - "id": 7040, + "id": 7031, "name": "_proxyGuardPermit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6564, + "referencedDeclaration": 6555, "src": "8386:17:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", "typeString": "function (address payable,address)" } }, - "id": 7045, + "id": 7036, "isConstant": false, "isLValue": false, "isPure": false, @@ -8460,7 +8460,7 @@ "typeString": "tuple()" } }, - "id": 7046, + "id": 7037, "nodeType": "ExpressionStatement", "src": "8386:56:28" }, @@ -8470,11 +8470,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7050, + "id": 7041, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6980, + "referencedDeclaration": 6971, "src": "8488:15:28", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -8488,32 +8488,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 7051, + "id": 7042, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6990, + "referencedDeclaration": 6981, "src": "8517:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 7052, + "id": 7043, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DaiAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7522, + "referencedDeclaration": 7513, "src": "8517:26:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 7053, + "id": 7044, "isConstant": false, "isLValue": false, "isPure": false, @@ -8529,11 +8529,11 @@ }, { "argumentTypes": null, - "id": 7054, + "id": 7045, "name": "daiDebt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7002, + "referencedDeclaration": 6993, "src": "8559:7:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8542,11 +8542,11 @@ }, { "argumentTypes": null, - "id": 7055, + "id": 7046, "name": "addressAndExecuteOperationCalldataParams", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7009, + "referencedDeclaration": 7000, "src": "8580:40:28", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -8575,18 +8575,18 @@ ], "expression": { "argumentTypes": null, - "id": 7047, + "id": 7038, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7020, + "referencedDeclaration": 7011, "src": "8453:11:28", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", "typeString": "contract ILendingPool" } }, - "id": 7049, + "id": 7040, "isConstant": false, "isLValue": false, "isPure": false, @@ -8600,7 +8600,7 @@ "typeString": "function (address,address,uint256,bytes memory) external" } }, - "id": 7056, + "id": 7047, "isConstant": false, "isLValue": false, "isPure": false, @@ -8614,7 +8614,7 @@ "typeString": "tuple()" } }, - "id": 7057, + "id": 7048, "nodeType": "ExpressionStatement", "src": "8453:177:28" }, @@ -8629,32 +8629,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 7059, + "id": 7050, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6990, + "referencedDeclaration": 6981, "src": "8721:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 7060, + "id": 7051, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DssCdpManagerAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7549, + "referencedDeclaration": 7540, "src": "8721:36:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 7061, + "id": 7052, "isConstant": false, "isLValue": false, "isPure": false, @@ -8670,11 +8670,11 @@ }, { "argumentTypes": null, - "id": 7062, + "id": 7053, "name": "cdpId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6984, + "referencedDeclaration": 6975, "src": "8761:5:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8687,7 +8687,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 7064, + "id": 7055, "isConstant": false, "isLValue": false, "isPure": true, @@ -8710,7 +8710,7 @@ "typeString": "int_const 1" } ], - "id": 7063, + "id": 7054, "isConstant": false, "isLValue": false, "isPure": true, @@ -8723,7 +8723,7 @@ }, "typeName": "address" }, - "id": 7065, + "id": 7056, "isConstant": false, "isLValue": false, "isPure": true, @@ -8753,18 +8753,18 @@ "typeString": "address payable" } ], - "id": 7058, + "id": 7049, "name": "give", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4445, + "referencedDeclaration": 4497, "src": "8716:4:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (address,uint256,address)" } }, - "id": 7066, + "id": 7057, "isConstant": false, "isLValue": false, "isPure": false, @@ -8778,7 +8778,7 @@ "typeString": "tuple()" } }, - "id": 7067, + "id": 7058, "nodeType": "ExpressionStatement", "src": "8716:63:28" }, @@ -8788,11 +8788,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7069, + "id": 7060, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6980, + "referencedDeclaration": 6971, "src": "8868:15:28", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -8804,11 +8804,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7071, + "id": 7062, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7020, + "referencedDeclaration": 7011, "src": "8893:11:28", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", @@ -8823,7 +8823,7 @@ "typeString": "contract ILendingPool" } ], - "id": 7070, + "id": 7061, "isConstant": false, "isLValue": false, "isPure": true, @@ -8836,7 +8836,7 @@ }, "typeName": "address" }, - "id": 7072, + "id": 7063, "isConstant": false, "isLValue": false, "isPure": false, @@ -8862,18 +8862,18 @@ "typeString": "address" } ], - "id": 7068, + "id": 7059, "name": "_proxyGuardForbid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6605, + "referencedDeclaration": 6596, "src": "8850:17:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", "typeString": "function (address payable,address)" } }, - "id": 7073, + "id": 7064, "isConstant": false, "isLValue": false, "isPure": false, @@ -8887,29 +8887,29 @@ "typeString": "tuple()" } }, - "id": 7074, + "id": 7065, "nodeType": "ExpressionStatement", "src": "8850:56:28" } ] }, "documentation": null, - "id": 7076, + "id": 7067, "implemented": true, "kind": "function", "modifiers": [], "name": "importMakerVault", "nodeType": "FunctionDefinition", "parameters": { - "id": 6987, + "id": 6978, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6978, + "id": 6969, "name": "dedgeMakerManagerAddress", "nodeType": "VariableDeclaration", - "scope": 7076, + "scope": 7067, "src": "7185:32:28", "stateVariable": false, "storageLocation": "default", @@ -8918,7 +8918,7 @@ "typeString": "address" }, "typeName": { - "id": 6977, + "id": 6968, "name": "address", "nodeType": "ElementaryTypeName", "src": "7185:7:28", @@ -8933,10 +8933,10 @@ }, { "constant": false, - "id": 6980, + "id": 6971, "name": "dacProxyAddress", "nodeType": "VariableDeclaration", - "scope": 7076, + "scope": 7067, "src": "7227:31:28", "stateVariable": false, "storageLocation": "default", @@ -8945,7 +8945,7 @@ "typeString": "address payable" }, "typeName": { - "id": 6979, + "id": 6970, "name": "address", "nodeType": "ElementaryTypeName", "src": "7227:15:28", @@ -8960,10 +8960,10 @@ }, { "constant": false, - "id": 6982, + "id": 6973, "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 7076, + "scope": 7067, "src": "7268:30:28", "stateVariable": false, "storageLocation": "default", @@ -8972,7 +8972,7 @@ "typeString": "address" }, "typeName": { - "id": 6981, + "id": 6972, "name": "address", "nodeType": "ElementaryTypeName", "src": "7268:7:28", @@ -8987,10 +8987,10 @@ }, { "constant": false, - "id": 6984, + "id": 6975, "name": "cdpId", "nodeType": "VariableDeclaration", - "scope": 7076, + "scope": 7067, "src": "7308:10:28", "stateVariable": false, "storageLocation": "default", @@ -8999,7 +8999,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6983, + "id": 6974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7308:4:28", @@ -9013,10 +9013,10 @@ }, { "constant": false, - "id": 6986, + "id": 6977, "name": "executeOperationCalldataParams", "nodeType": "VariableDeclaration", - "scope": 7076, + "scope": 7067, "src": "7328:45:28", "stateVariable": false, "storageLocation": "calldata", @@ -9025,7 +9025,7 @@ "typeString": "bytes" }, "typeName": { - "id": 6985, + "id": 6976, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "7328:5:28", @@ -9041,19 +9041,19 @@ "src": "7175:204:28" }, "returnParameters": { - "id": 6988, + "id": 6979, "nodeType": "ParameterList", "parameters": [], "src": "7389:0:28" }, - "scope": 7077, + "scope": 7068, "src": "7150:1763:28", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 7078, + "scope": 7069, "src": "845:8070:28" } ], @@ -9063,14 +9063,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/managers/DedgeMakerManager.sol", "exportedSymbols": { "DedgeMakerManager": [ - 7077 + 7068 ] }, - "id": 7078, + "id": 7069, "nodeType": "SourceUnit", "nodes": [ { - "id": 6486, + "id": 6477, "literals": [ "solidity", "0.5", @@ -9080,7 +9080,7 @@ "src": "78:23:28" }, { - "id": 6487, + "id": 6478, "literals": [ "experimental", "ABIEncoderV2" @@ -9091,10 +9091,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/aave/FlashLoanReceiverBase.sol", "file": "../lib/aave/FlashLoanReceiverBase.sol", - "id": 6488, + "id": 6479, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 2139, + "scope": 7069, + "sourceUnit": 2165, "src": "137:47:28", "symbolAliases": [], "unitAlias": "" @@ -9102,10 +9102,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "file": "../lib/makerdao/DssProxyActionsBase.sol", - "id": 6489, + "id": 6480, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 4712, + "scope": 7069, + "sourceUnit": 4764, "src": "186:49:28", "symbolAliases": [], "unitAlias": "" @@ -9113,10 +9113,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapBase.sol", "file": "../lib/uniswap/UniswapBase.sol", - "id": 6490, + "id": 6481, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 4919, + "scope": 7069, + "sourceUnit": 4971, "src": "237:40:28", "symbolAliases": [], "unitAlias": "" @@ -9124,10 +9124,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/dapphub/Guard.sol", "file": "../lib/dapphub/Guard.sol", - "id": 6491, + "id": 6482, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 3196, + "scope": 7069, + "sourceUnit": 3248, "src": "279:34:28", "symbolAliases": [], "unitAlias": "" @@ -9135,10 +9135,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/proxies/DACProxy.sol", "file": "../proxies/DACProxy.sol", - "id": 6492, + "id": 6483, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 7245, + "scope": 7069, + "sourceUnit": 7236, "src": "315:33:28", "symbolAliases": [], "unitAlias": "" @@ -9146,9 +9146,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol", "file": "../interfaces/aave/ILendingPoolAddressesProvider.sol", - "id": 6493, + "id": 6484, "nodeType": "ImportDirective", - "scope": 7078, + "scope": 7069, "sourceUnit": 660, "src": "351:62:28", "symbolAliases": [], @@ -9157,9 +9157,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPool.sol", "file": "../interfaces/aave/ILendingPool.sol", - "id": 6494, + "id": 6485, "nodeType": "ImportDirective", - "scope": 7078, + "scope": 7069, "sourceUnit": 547, "src": "414:45:28", "symbolAliases": [], @@ -9168,10 +9168,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol", "file": "../interfaces/uniswap/IUniswapExchange.sol", - "id": 6495, + "id": 6486, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 1910, + "scope": 7069, + "sourceUnit": 1936, "src": "461:52:28", "symbolAliases": [], "unitAlias": "" @@ -9179,10 +9179,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol", "file": "../interfaces/uniswap/IUniswapFactory.sol", - "id": 6496, + "id": 6487, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 1950, + "scope": 7069, + "sourceUnit": 1976, "src": "514:51:28", "symbolAliases": [], "unitAlias": "" @@ -9190,9 +9190,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../interfaces/IERC20.sol", - "id": 6497, + "id": 6488, "nodeType": "ImportDirective", - "scope": 7078, + "scope": 7069, "sourceUnit": 121, "src": "567:34:28", "symbolAliases": [], @@ -9201,10 +9201,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", "file": "../interfaces/compound/IComptroller.sol", - "id": 6498, + "id": 6489, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 1097, + "scope": 7069, + "sourceUnit": 1123, "src": "603:49:28", "symbolAliases": [], "unitAlias": "" @@ -9212,10 +9212,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol", "file": "../interfaces/compound/ICToken.sol", - "id": 6499, + "id": 6490, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 859, + "scope": 7069, + "sourceUnit": 885, "src": "653:44:28", "symbolAliases": [], "unitAlias": "" @@ -9223,10 +9223,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol", "file": "../interfaces/compound/ICEther.sol", - "id": 6500, + "id": 6491, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 733, + "scope": 7069, + "sourceUnit": 746, "src": "698:44:28", "symbolAliases": [], "unitAlias": "" @@ -9234,10 +9234,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/makerdao/IDssProxyActions.sol", "file": "../interfaces/makerdao/IDssProxyActions.sol", - "id": 6501, + "id": 6492, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 1566, + "scope": 7069, + "sourceUnit": 1592, "src": "744:53:28", "symbolAliases": [], "unitAlias": "" @@ -9245,10 +9245,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/registries/AddressRegistry.sol", "file": "../registries/AddressRegistry.sol", - "id": 6502, + "id": 6493, "nodeType": "ImportDirective", - "scope": 7078, - "sourceUnit": 7551, + "scope": 7069, + "sourceUnit": 7542, "src": "799:43:28", "symbolAliases": [], "unitAlias": "" @@ -9259,64 +9259,64 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 6503, + "id": 6494, "name": "DssProxyActionsBase", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4711, + "referencedDeclaration": 4763, "src": "875:19:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } }, - "id": 6504, + "id": 6495, "nodeType": "InheritanceSpecifier", "src": "875:19:28" } ], "contractDependencies": [ - 4144, - 4711 + 4196, + 4763 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 7077, + "id": 7068, "linearizedBaseContracts": [ - 7077, - 4711, - 4144 + 7068, + 4763, + 4196 ], "name": "DedgeMakerManager", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 6507, + "id": 6498, "nodeType": "Block", "src": "930:2:28", "statements": [] }, "documentation": null, - "id": 6508, + "id": 6499, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 6505, + "id": 6496, "nodeType": "ParameterList", "parameters": [], "src": "910:2:28" }, "returnParameters": { - "id": 6506, + "id": 6497, "nodeType": "ParameterList", "parameters": [], "src": "930:0:28" }, - "scope": 7077, + "scope": 7068, "src": "901:31:28", "stateMutability": "payable", "superFunction": null, @@ -9324,31 +9324,31 @@ }, { "body": { - "id": 6511, + "id": 6502, "nodeType": "Block", "src": "960:2:28", "statements": [] }, "documentation": null, - "id": 6512, + "id": 6503, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 6509, + "id": 6500, "nodeType": "ParameterList", "parameters": [], "src": "950:2:28" }, "returnParameters": { - "id": 6510, + "id": 6501, "nodeType": "ParameterList", "parameters": [], "src": "960:0:28" }, - "scope": 7077, + "scope": 7068, "src": "938:24:28", "stateMutability": "nonpayable", "superFunction": null, @@ -9356,14 +9356,14 @@ }, { "canonicalName": "DedgeMakerManager.ImportMakerVaultCallData", - "id": 6523, + "id": 6514, "members": [ { "constant": false, - "id": 6514, + "id": 6505, "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 6523, + "scope": 6514, "src": "1010:30:28", "stateVariable": false, "storageLocation": "default", @@ -9372,7 +9372,7 @@ "typeString": "address" }, "typeName": { - "id": 6513, + "id": 6504, "name": "address", "nodeType": "ElementaryTypeName", "src": "1010:7:28", @@ -9387,10 +9387,10 @@ }, { "constant": false, - "id": 6516, + "id": 6507, "name": "cdpId", "nodeType": "VariableDeclaration", - "scope": 6523, + "scope": 6514, "src": "1050:10:28", "stateVariable": false, "storageLocation": "default", @@ -9399,7 +9399,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6515, + "id": 6506, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1050:4:28", @@ -9413,10 +9413,10 @@ }, { "constant": false, - "id": 6518, + "id": 6509, "name": "collateralCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 6523, + "scope": 6514, "src": "1070:31:28", "stateVariable": false, "storageLocation": "default", @@ -9425,7 +9425,7 @@ "typeString": "address" }, "typeName": { - "id": 6517, + "id": 6508, "name": "address", "nodeType": "ElementaryTypeName", "src": "1070:7:28", @@ -9440,10 +9440,10 @@ }, { "constant": false, - "id": 6520, + "id": 6511, "name": "collateralJoinAddress", "nodeType": "VariableDeclaration", - "scope": 6523, + "scope": 6514, "src": "1111:29:28", "stateVariable": false, "storageLocation": "default", @@ -9452,7 +9452,7 @@ "typeString": "address" }, "typeName": { - "id": 6519, + "id": 6510, "name": "address", "nodeType": "ElementaryTypeName", "src": "1111:7:28", @@ -9467,10 +9467,10 @@ }, { "constant": false, - "id": 6522, + "id": 6513, "name": "collateralDecimals", "nodeType": "VariableDeclaration", - "scope": 6523, + "scope": 6514, "src": "1150:24:28", "stateVariable": false, "storageLocation": "default", @@ -9479,7 +9479,7 @@ "typeString": "uint8" }, "typeName": { - "id": 6521, + "id": 6512, "name": "uint8", "nodeType": "ElementaryTypeName", "src": "1150:5:28", @@ -9494,27 +9494,27 @@ ], "name": "ImportMakerVaultCallData", "nodeType": "StructDefinition", - "scope": 7077, + "scope": 7068, "src": "968:213:28", "visibility": "public" }, { "body": { - "id": 6563, + "id": 6554, "nodeType": "Block", "src": "1290:214:28", "statements": [ { "assignments": [ - 6531 + 6522 ], "declarations": [ { "constant": false, - "id": 6531, + "id": 6522, "name": "g", "nodeType": "VariableDeclaration", - "scope": 6563, + "scope": 6554, "src": "1300:9:28", "stateVariable": false, "storageLocation": "default", @@ -9523,7 +9523,7 @@ "typeString": "address" }, "typeName": { - "id": 6530, + "id": 6521, "name": "address", "nodeType": "ElementaryTypeName", "src": "1300:7:28", @@ -9537,7 +9537,7 @@ "visibility": "internal" } ], - "id": 6539, + "id": 6530, "initialValue": { "argumentTypes": null, "arguments": [ @@ -9551,11 +9551,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6534, + "id": 6525, "name": "proxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6525, + "referencedDeclaration": 6516, "src": "1329:12:28", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -9570,18 +9570,18 @@ "typeString": "address payable" } ], - "id": 6533, + "id": 6524, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1320:8:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 6535, + "id": 6526, "isConstant": false, "isLValue": false, "isPure": false, @@ -9591,25 +9591,25 @@ "nodeType": "FunctionCall", "src": "1320:22:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 6536, + "id": 6527, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "authority", "nodeType": "MemberAccess", - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1320:32:28", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2799_$", + "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2851_$", "typeString": "function () view external returns (contract DSAuthority)" } }, - "id": 6537, + "id": 6528, "isConstant": false, "isLValue": false, "isPure": false, @@ -9619,7 +9619,7 @@ "nodeType": "FunctionCall", "src": "1320:34:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -9627,11 +9627,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 6532, + "id": 6523, "isConstant": false, "isLValue": false, "isPure": true, @@ -9644,7 +9644,7 @@ }, "typeName": "address" }, - "id": 6538, + "id": 6529, "isConstant": false, "isLValue": false, "isPure": false, @@ -9676,11 +9676,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6547, + "id": 6538, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6527, + "referencedDeclaration": 6518, "src": "1421:3:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9695,7 +9695,7 @@ "typeString": "address" } ], - "id": 6546, + "id": 6537, "isConstant": false, "isLValue": false, "isPure": true, @@ -9708,7 +9708,7 @@ }, "typeName": "address" }, - "id": 6548, + "id": 6539, "isConstant": false, "isLValue": false, "isPure": false, @@ -9730,7 +9730,7 @@ "typeString": "address" } ], - "id": 6545, + "id": 6536, "isConstant": false, "isLValue": false, "isPure": true, @@ -9743,7 +9743,7 @@ }, "typeName": "bytes20" }, - "id": 6549, + "id": 6540, "isConstant": false, "isLValue": false, "isPure": false, @@ -9765,7 +9765,7 @@ "typeString": "bytes20" } ], - "id": 6544, + "id": 6535, "isConstant": false, "isLValue": false, "isPure": true, @@ -9778,7 +9778,7 @@ }, "typeName": "bytes32" }, - "id": 6550, + "id": 6541, "isConstant": false, "isLValue": false, "isPure": false, @@ -9802,11 +9802,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6552, + "id": 6543, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6531, + "referencedDeclaration": 6522, "src": "1449:1:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9821,18 +9821,18 @@ "typeString": "address" } ], - "id": 6551, + "id": 6542, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1441:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6553, + "id": 6544, "isConstant": false, "isLValue": false, "isPure": false, @@ -9842,25 +9842,25 @@ "nodeType": "FunctionCall", "src": "1441:10:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6554, + "id": 6545, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1441:14:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 6555, + "id": 6546, "isConstant": false, "isLValue": false, "isPure": false, @@ -9884,11 +9884,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6557, + "id": 6548, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6531, + "referencedDeclaration": 6522, "src": "1479:1:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9903,18 +9903,18 @@ "typeString": "address" } ], - "id": 6556, + "id": 6547, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1471:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6558, + "id": 6549, "isConstant": false, "isLValue": false, "isPure": false, @@ -9924,25 +9924,25 @@ "nodeType": "FunctionCall", "src": "1471:10:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6559, + "id": 6550, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1471:14:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 6560, + "id": 6551, "isConstant": false, "isLValue": false, "isPure": false, @@ -9977,11 +9977,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6541, + "id": 6532, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6531, + "referencedDeclaration": 6522, "src": "1374:1:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9996,18 +9996,18 @@ "typeString": "address" } ], - "id": 6540, + "id": 6531, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1366:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6542, + "id": 6533, "isConstant": false, "isLValue": false, "isPure": false, @@ -10017,25 +10017,25 @@ "nodeType": "FunctionCall", "src": "1366:10:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6543, + "id": 6534, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "permit", "nodeType": "MemberAccess", - "referencedDeclaration": 3086, + "referencedDeclaration": 3138, "src": "1366:17:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32) external" } }, - "id": 6561, + "id": 6552, "isConstant": false, "isLValue": false, "isPure": false, @@ -10049,29 +10049,29 @@ "typeString": "tuple()" } }, - "id": 6562, + "id": 6553, "nodeType": "ExpressionStatement", "src": "1366:131:28" } ] }, "documentation": null, - "id": 6564, + "id": 6555, "implemented": true, "kind": "function", "modifiers": [], "name": "_proxyGuardPermit", "nodeType": "FunctionDefinition", "parameters": { - "id": 6528, + "id": 6519, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6525, + "id": 6516, "name": "proxyAddress", "nodeType": "VariableDeclaration", - "scope": 6564, + "scope": 6555, "src": "1238:28:28", "stateVariable": false, "storageLocation": "default", @@ -10080,7 +10080,7 @@ "typeString": "address payable" }, "typeName": { - "id": 6524, + "id": 6515, "name": "address", "nodeType": "ElementaryTypeName", "src": "1238:15:28", @@ -10095,10 +10095,10 @@ }, { "constant": false, - "id": 6527, + "id": 6518, "name": "src", "nodeType": "VariableDeclaration", - "scope": 6564, + "scope": 6555, "src": "1268:11:28", "stateVariable": false, "storageLocation": "default", @@ -10107,7 +10107,7 @@ "typeString": "address" }, "typeName": { - "id": 6526, + "id": 6517, "name": "address", "nodeType": "ElementaryTypeName", "src": "1268:7:28", @@ -10124,12 +10124,12 @@ "src": "1237:43:28" }, "returnParameters": { - "id": 6529, + "id": 6520, "nodeType": "ParameterList", "parameters": [], "src": "1290:0:28" }, - "scope": 7077, + "scope": 7068, "src": "1211:293:28", "stateMutability": "nonpayable", "superFunction": null, @@ -10137,21 +10137,21 @@ }, { "body": { - "id": 6604, + "id": 6595, "nodeType": "Block", "src": "1589:214:28", "statements": [ { "assignments": [ - 6572 + 6563 ], "declarations": [ { "constant": false, - "id": 6572, + "id": 6563, "name": "g", "nodeType": "VariableDeclaration", - "scope": 6604, + "scope": 6595, "src": "1599:9:28", "stateVariable": false, "storageLocation": "default", @@ -10160,7 +10160,7 @@ "typeString": "address" }, "typeName": { - "id": 6571, + "id": 6562, "name": "address", "nodeType": "ElementaryTypeName", "src": "1599:7:28", @@ -10174,7 +10174,7 @@ "visibility": "internal" } ], - "id": 6580, + "id": 6571, "initialValue": { "argumentTypes": null, "arguments": [ @@ -10188,11 +10188,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6575, + "id": 6566, "name": "proxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6566, + "referencedDeclaration": 6557, "src": "1628:12:28", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -10207,18 +10207,18 @@ "typeString": "address payable" } ], - "id": 6574, + "id": 6565, "name": "DACProxy", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7244, + "referencedDeclaration": 7235, "src": "1619:8:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DACProxy_$7244_$", + "typeIdentifier": "t_type$_t_contract$_DACProxy_$7235_$", "typeString": "type(contract DACProxy)" } }, - "id": 6576, + "id": 6567, "isConstant": false, "isLValue": false, "isPure": false, @@ -10228,25 +10228,25 @@ "nodeType": "FunctionCall", "src": "1619:22:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DACProxy_$7244", + "typeIdentifier": "t_contract$_DACProxy_$7235", "typeString": "contract DACProxy" } }, - "id": 6577, + "id": 6568, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "authority", "nodeType": "MemberAccess", - "referencedDeclaration": 2812, + "referencedDeclaration": 2864, "src": "1619:32:28", "typeDescriptions": { - "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2799_$", + "typeIdentifier": "t_function_external_view$__$returns$_t_contract$_DSAuthority_$2851_$", "typeString": "function () view external returns (contract DSAuthority)" } }, - "id": 6578, + "id": 6569, "isConstant": false, "isLValue": false, "isPure": false, @@ -10256,7 +10256,7 @@ "nodeType": "FunctionCall", "src": "1619:34:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } } @@ -10264,11 +10264,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DSAuthority_$2799", + "typeIdentifier": "t_contract$_DSAuthority_$2851", "typeString": "contract DSAuthority" } ], - "id": 6573, + "id": 6564, "isConstant": false, "isLValue": false, "isPure": true, @@ -10281,7 +10281,7 @@ }, "typeName": "address" }, - "id": 6579, + "id": 6570, "isConstant": false, "isLValue": false, "isPure": false, @@ -10313,11 +10313,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6588, + "id": 6579, "name": "src", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6568, + "referencedDeclaration": 6559, "src": "1720:3:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10332,7 +10332,7 @@ "typeString": "address" } ], - "id": 6587, + "id": 6578, "isConstant": false, "isLValue": false, "isPure": true, @@ -10345,7 +10345,7 @@ }, "typeName": "address" }, - "id": 6589, + "id": 6580, "isConstant": false, "isLValue": false, "isPure": false, @@ -10367,7 +10367,7 @@ "typeString": "address" } ], - "id": 6586, + "id": 6577, "isConstant": false, "isLValue": false, "isPure": true, @@ -10380,7 +10380,7 @@ }, "typeName": "bytes20" }, - "id": 6590, + "id": 6581, "isConstant": false, "isLValue": false, "isPure": false, @@ -10402,7 +10402,7 @@ "typeString": "bytes20" } ], - "id": 6585, + "id": 6576, "isConstant": false, "isLValue": false, "isPure": true, @@ -10415,7 +10415,7 @@ }, "typeName": "bytes32" }, - "id": 6591, + "id": 6582, "isConstant": false, "isLValue": false, "isPure": false, @@ -10439,11 +10439,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6593, + "id": 6584, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6572, + "referencedDeclaration": 6563, "src": "1748:1:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10458,18 +10458,18 @@ "typeString": "address" } ], - "id": 6592, + "id": 6583, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1740:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6594, + "id": 6585, "isConstant": false, "isLValue": false, "isPure": false, @@ -10479,25 +10479,25 @@ "nodeType": "FunctionCall", "src": "1740:10:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6595, + "id": 6586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1740:14:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 6596, + "id": 6587, "isConstant": false, "isLValue": false, "isPure": false, @@ -10521,11 +10521,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6598, + "id": 6589, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6572, + "referencedDeclaration": 6563, "src": "1778:1:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10540,18 +10540,18 @@ "typeString": "address" } ], - "id": 6597, + "id": 6588, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1770:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6599, + "id": 6590, "isConstant": false, "isLValue": false, "isPure": false, @@ -10561,25 +10561,25 @@ "nodeType": "FunctionCall", "src": "1770:10:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6600, + "id": 6591, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ANY", "nodeType": "MemberAccess", - "referencedDeclaration": 2958, + "referencedDeclaration": 3010, "src": "1770:14:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_bytes32_$", "typeString": "function () view external returns (bytes32)" } }, - "id": 6601, + "id": 6592, "isConstant": false, "isLValue": false, "isPure": false, @@ -10614,11 +10614,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6582, + "id": 6573, "name": "g", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6572, + "referencedDeclaration": 6563, "src": "1673:1:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10633,18 +10633,18 @@ "typeString": "address" } ], - "id": 6581, + "id": 6572, "name": "DSGuard", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3163, + "referencedDeclaration": 3215, "src": "1665:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DSGuard_$3163_$", + "typeIdentifier": "t_type$_t_contract$_DSGuard_$3215_$", "typeString": "type(contract DSGuard)" } }, - "id": 6583, + "id": 6574, "isConstant": false, "isLValue": false, "isPure": false, @@ -10654,25 +10654,25 @@ "nodeType": "FunctionCall", "src": "1665:10:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_DSGuard_$3163", + "typeIdentifier": "t_contract$_DSGuard_$3215", "typeString": "contract DSGuard" } }, - "id": 6584, + "id": 6575, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "forbid", "nodeType": "MemberAccess", - "referencedDeclaration": 3114, + "referencedDeclaration": 3166, "src": "1665:17:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_bytes32_$_t_bytes32_$returns$__$", "typeString": "function (bytes32,bytes32,bytes32) external" } }, - "id": 6602, + "id": 6593, "isConstant": false, "isLValue": false, "isPure": false, @@ -10686,29 +10686,29 @@ "typeString": "tuple()" } }, - "id": 6603, + "id": 6594, "nodeType": "ExpressionStatement", "src": "1665:131:28" } ] }, "documentation": null, - "id": 6605, + "id": 6596, "implemented": true, "kind": "function", "modifiers": [], "name": "_proxyGuardForbid", "nodeType": "FunctionDefinition", "parameters": { - "id": 6569, + "id": 6560, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6566, + "id": 6557, "name": "proxyAddress", "nodeType": "VariableDeclaration", - "scope": 6605, + "scope": 6596, "src": "1537:28:28", "stateVariable": false, "storageLocation": "default", @@ -10717,7 +10717,7 @@ "typeString": "address payable" }, "typeName": { - "id": 6565, + "id": 6556, "name": "address", "nodeType": "ElementaryTypeName", "src": "1537:15:28", @@ -10732,10 +10732,10 @@ }, { "constant": false, - "id": 6568, + "id": 6559, "name": "src", "nodeType": "VariableDeclaration", - "scope": 6605, + "scope": 6596, "src": "1567:11:28", "stateVariable": false, "storageLocation": "default", @@ -10744,7 +10744,7 @@ "typeString": "address" }, "typeName": { - "id": 6567, + "id": 6558, "name": "address", "nodeType": "ElementaryTypeName", "src": "1567:7:28", @@ -10761,12 +10761,12 @@ "src": "1536:43:28" }, "returnParameters": { - "id": 6570, + "id": 6561, "nodeType": "ParameterList", "parameters": [], "src": "1589:0:28" }, - "scope": 7077, + "scope": 7068, "src": "1510:293:28", "stateMutability": "nonpayable", "superFunction": null, @@ -10774,7 +10774,7 @@ }, { "body": { - "id": 6626, + "id": 6617, "nodeType": "Block", "src": "1891:62:28", "statements": [ @@ -10785,18 +10785,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6624, + "id": 6615, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6614, + "id": 6605, "name": "amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6607, + "referencedDeclaration": 6598, "src": "1908:6:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10814,7 +10814,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6622, + "id": 6613, "isConstant": false, "isLValue": false, "isPure": false, @@ -10822,7 +10822,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 6615, + "id": 6606, "isConstant": false, "isLValue": false, "isPure": true, @@ -10848,7 +10848,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6620, + "id": 6611, "isConstant": false, "isLValue": false, "isPure": false, @@ -10856,7 +10856,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 6616, + "id": 6607, "isConstant": false, "isLValue": false, "isPure": true, @@ -10878,11 +10878,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6618, + "id": 6609, "name": "decimals", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6609, + "referencedDeclaration": 6600, "src": "1935:8:28", "typeDescriptions": { "typeIdentifier": "t_uint8", @@ -10897,7 +10897,7 @@ "typeString": "uint8" } ], - "id": 6617, + "id": 6608, "isConstant": false, "isLValue": false, "isPure": true, @@ -10910,7 +10910,7 @@ }, "typeName": "uint" }, - "id": 6619, + "id": 6610, "isConstant": false, "isLValue": false, "isPure": false, @@ -10931,7 +10931,7 @@ } } ], - "id": 6621, + "id": 6612, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -10951,7 +10951,7 @@ } } ], - "id": 6623, + "id": 6614, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -10970,30 +10970,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 6613, - "id": 6625, + "functionReturnParameters": 6604, + "id": 6616, "nodeType": "Return", "src": "1901:45:28" } ] }, "documentation": null, - "id": 6627, + "id": 6618, "implemented": true, "kind": "function", "modifiers": [], "name": "_convert18ToDecimal", "nodeType": "FunctionDefinition", "parameters": { - "id": 6610, + "id": 6601, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6607, + "id": 6598, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 6627, + "scope": 6618, "src": "1838:11:28", "stateVariable": false, "storageLocation": "default", @@ -11002,7 +11002,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6606, + "id": 6597, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1838:4:28", @@ -11016,10 +11016,10 @@ }, { "constant": false, - "id": 6609, + "id": 6600, "name": "decimals", "nodeType": "VariableDeclaration", - "scope": 6627, + "scope": 6618, "src": "1851:14:28", "stateVariable": false, "storageLocation": "default", @@ -11028,7 +11028,7 @@ "typeString": "uint8" }, "typeName": { - "id": 6608, + "id": 6599, "name": "uint8", "nodeType": "ElementaryTypeName", "src": "1851:5:28", @@ -11044,15 +11044,15 @@ "src": "1837:29:28" }, "returnParameters": { - "id": 6613, + "id": 6604, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6612, + "id": 6603, "name": "", "nodeType": "VariableDeclaration", - "scope": 6627, + "scope": 6618, "src": "1885:4:28", "stateVariable": false, "storageLocation": "default", @@ -11061,7 +11061,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6611, + "id": 6602, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1885:4:28", @@ -11076,7 +11076,7 @@ ], "src": "1884:6:28" }, - "scope": 7077, + "scope": 7068, "src": "1809:144:28", "stateMutability": "nonpayable", "superFunction": null, @@ -11084,7 +11084,7 @@ }, { "body": { - "id": 6650, + "id": 6641, "nodeType": "Block", "src": "2043:71:28", "statements": [ @@ -11095,18 +11095,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6648, + "id": 6639, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6636, + "id": 6627, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6631, + "referencedDeclaration": 6622, "src": "2060:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11124,7 +11124,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6646, + "id": 6637, "isConstant": false, "isLValue": false, "isPure": false, @@ -11132,7 +11132,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 6637, + "id": 6628, "isConstant": false, "isLValue": false, "isPure": true, @@ -11158,7 +11158,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6644, + "id": 6635, "isConstant": false, "isLValue": false, "isPure": false, @@ -11166,7 +11166,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 6638, + "id": 6629, "isConstant": false, "isLValue": false, "isPure": true, @@ -11193,11 +11193,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6640, + "id": 6631, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6629, + "referencedDeclaration": 6620, "src": "2091:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11212,18 +11212,18 @@ "typeString": "address" } ], - "id": 6639, + "id": 6630, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "2079:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 6641, + "id": 6632, "isConstant": false, "isLValue": false, "isPure": false, @@ -11233,25 +11233,25 @@ "nodeType": "FunctionCall", "src": "2079:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 6642, + "id": 6633, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "2079:24:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 6643, + "id": 6634, "isConstant": false, "isLValue": false, "isPure": false, @@ -11272,7 +11272,7 @@ } } ], - "id": 6645, + "id": 6636, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -11292,7 +11292,7 @@ } } ], - "id": 6647, + "id": 6638, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -11311,30 +11311,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 6635, - "id": 6649, + "functionReturnParameters": 6626, + "id": 6640, "nodeType": "Return", "src": "2053:54:28" } ] }, "documentation": null, - "id": 6651, + "id": 6642, "implemented": true, "kind": "function", "modifiers": [], "name": "_convert18ToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 6632, + "id": 6623, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6629, + "id": 6620, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 6651, + "scope": 6642, "src": "1989:15:28", "stateVariable": false, "storageLocation": "default", @@ -11343,7 +11343,7 @@ "typeString": "address" }, "typeName": { - "id": 6628, + "id": 6619, "name": "address", "nodeType": "ElementaryTypeName", "src": "1989:7:28", @@ -11358,10 +11358,10 @@ }, { "constant": false, - "id": 6631, + "id": 6622, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 6651, + "scope": 6642, "src": "2006:11:28", "stateVariable": false, "storageLocation": "default", @@ -11370,7 +11370,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6630, + "id": 6621, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2006:7:28", @@ -11386,15 +11386,15 @@ "src": "1988:30:28" }, "returnParameters": { - "id": 6635, + "id": 6626, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6634, + "id": 6625, "name": "", "nodeType": "VariableDeclaration", - "scope": 6651, + "scope": 6642, "src": "2037:4:28", "stateVariable": false, "storageLocation": "default", @@ -11403,7 +11403,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6633, + "id": 6624, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2037:4:28", @@ -11418,7 +11418,7 @@ ], "src": "2036:6:28" }, - "scope": 7077, + "scope": 7068, "src": "1959:155:28", "stateMutability": "nonpayable", "superFunction": null, @@ -11426,21 +11426,21 @@ }, { "body": { - "id": 6704, + "id": 6695, "nodeType": "Block", "src": "2238:275:28", "statements": [ { "assignments": [ - 6661 + 6652 ], "declarations": [ { "constant": false, - "id": 6661, + "id": 6652, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 6704, + "scope": 6695, "src": "2248:11:28", "stateVariable": false, "storageLocation": "default", @@ -11449,7 +11449,7 @@ "typeString": "address" }, "typeName": { - "id": 6660, + "id": 6651, "name": "address", "nodeType": "ElementaryTypeName", "src": "2248:7:28", @@ -11463,7 +11463,7 @@ "visibility": "internal" } ], - "id": 6667, + "id": 6658, "initialValue": { "argumentTypes": null, "arguments": [], @@ -11474,11 +11474,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6663, + "id": 6654, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6653, + "referencedDeclaration": 6644, "src": "2274:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11493,18 +11493,18 @@ "typeString": "address" } ], - "id": 6662, + "id": 6653, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2262:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6664, + "id": 6655, "isConstant": false, "isLValue": false, "isPure": false, @@ -11514,25 +11514,25 @@ "nodeType": "FunctionCall", "src": "2262:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6665, + "id": 6656, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "2262:24:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6666, + "id": 6657, "isConstant": false, "isLValue": false, "isPure": false, @@ -11551,15 +11551,15 @@ }, { "assignments": [ - 6669 + 6660 ], "declarations": [ { "constant": false, - "id": 6669, + "id": 6660, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 6704, + "scope": 6695, "src": "2298:11:28", "stateVariable": false, "storageLocation": "default", @@ -11568,7 +11568,7 @@ "typeString": "address" }, "typeName": { - "id": 6668, + "id": 6659, "name": "address", "nodeType": "ElementaryTypeName", "src": "2298:7:28", @@ -11582,17 +11582,17 @@ "visibility": "internal" } ], - "id": 6676, + "id": 6667, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6674, + "id": 6665, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6655, + "referencedDeclaration": 6646, "src": "2338:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11612,11 +11612,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6671, + "id": 6662, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6653, + "referencedDeclaration": 6644, "src": "2324:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11631,18 +11631,18 @@ "typeString": "address" } ], - "id": 6670, + "id": 6661, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2312:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6672, + "id": 6663, "isConstant": false, "isLValue": false, "isPure": false, @@ -11652,25 +11652,25 @@ "nodeType": "FunctionCall", "src": "2312:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6673, + "id": 6664, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "2312:25:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 6675, + "id": 6666, "isConstant": false, "isLValue": false, "isPure": false, @@ -11689,15 +11689,15 @@ }, { "assignments": [ - 6678 + 6669 ], "declarations": [ { "constant": false, - "id": 6678, + "id": 6669, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 6704, + "scope": 6695, "src": "2352:11:28", "stateVariable": false, "storageLocation": "default", @@ -11706,7 +11706,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 6677, + "id": 6668, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2352:7:28", @@ -11719,17 +11719,17 @@ "visibility": "internal" } ], - "id": 6685, + "id": 6676, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6683, + "id": 6674, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6655, + "referencedDeclaration": 6646, "src": "2392:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11749,11 +11749,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6680, + "id": 6671, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6653, + "referencedDeclaration": 6644, "src": "2378:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11768,18 +11768,18 @@ "typeString": "address" } ], - "id": 6679, + "id": 6670, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2366:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6681, + "id": 6672, "isConstant": false, "isLValue": false, "isPure": false, @@ -11789,25 +11789,25 @@ "nodeType": "FunctionCall", "src": "2366:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6682, + "id": 6673, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "2366:25:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 6684, + "id": 6675, "isConstant": false, "isLValue": false, "isPure": false, @@ -11826,15 +11826,15 @@ }, { "assignments": [ - 6687 + 6678 ], "declarations": [ { "constant": false, - "id": 6687, + "id": 6678, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 6704, + "scope": 6695, "src": "2406:13:28", "stateVariable": false, "storageLocation": "default", @@ -11843,7 +11843,7 @@ "typeString": "address" }, "typeName": { - "id": 6686, + "id": 6677, "name": "address", "nodeType": "ElementaryTypeName", "src": "2406:7:28", @@ -11857,17 +11857,17 @@ "visibility": "internal" } ], - "id": 6694, + "id": 6685, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6692, + "id": 6683, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6655, + "referencedDeclaration": 6646, "src": "2448:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11887,11 +11887,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6689, + "id": 6680, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6653, + "referencedDeclaration": 6644, "src": "2434:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11906,18 +11906,18 @@ "typeString": "address" } ], - "id": 6688, + "id": 6679, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2422:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6690, + "id": 6681, "isConstant": false, "isLValue": false, "isPure": false, @@ -11927,25 +11927,25 @@ "nodeType": "FunctionCall", "src": "2422:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6691, + "id": 6682, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "owns", "nodeType": "MemberAccess", - "referencedDeclaration": 3848, + "referencedDeclaration": 3900, "src": "2422:25:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 6693, + "id": 6684, "isConstant": false, "isLValue": false, "isPure": false, @@ -11965,18 +11965,18 @@ { "expression": { "argumentTypes": null, - "id": 6702, + "id": 6693, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 6695, + "id": 6686, "name": "debt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6658, + "referencedDeclaration": 6649, "src": "2463:4:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11990,11 +11990,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6697, + "id": 6688, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6661, + "referencedDeclaration": 6652, "src": "2485:3:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12003,11 +12003,11 @@ }, { "argumentTypes": null, - "id": 6698, + "id": 6689, "name": "owner", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6687, + "referencedDeclaration": 6678, "src": "2490:5:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12016,11 +12016,11 @@ }, { "argumentTypes": null, - "id": 6699, + "id": 6690, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6669, + "referencedDeclaration": 6660, "src": "2497:3:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12029,11 +12029,11 @@ }, { "argumentTypes": null, - "id": 6700, + "id": 6691, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6678, + "referencedDeclaration": 6669, "src": "2502:3:28", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -12060,18 +12060,18 @@ "typeString": "bytes32" } ], - "id": 6696, + "id": 6687, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "2470:14:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 6701, + "id": 6692, "isConstant": false, "isLValue": false, "isPure": false, @@ -12091,29 +12091,29 @@ "typeString": "uint256" } }, - "id": 6703, + "id": 6694, "nodeType": "ExpressionStatement", "src": "2463:43:28" } ] }, "documentation": null, - "id": 6705, + "id": 6696, "implemented": true, "kind": "function", "modifiers": [], "name": "getVaultDebt", "nodeType": "FunctionDefinition", "parameters": { - "id": 6656, + "id": 6647, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6653, + "id": 6644, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 6705, + "scope": 6696, "src": "2175:15:28", "stateVariable": false, "storageLocation": "default", @@ -12122,7 +12122,7 @@ "typeString": "address" }, "typeName": { - "id": 6652, + "id": 6643, "name": "address", "nodeType": "ElementaryTypeName", "src": "2175:7:28", @@ -12137,10 +12137,10 @@ }, { "constant": false, - "id": 6655, + "id": 6646, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 6705, + "scope": 6696, "src": "2192:8:28", "stateVariable": false, "storageLocation": "default", @@ -12149,7 +12149,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6654, + "id": 6645, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2192:4:28", @@ -12165,15 +12165,15 @@ "src": "2174:27:28" }, "returnParameters": { - "id": 6659, + "id": 6650, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6658, + "id": 6649, "name": "debt", "nodeType": "VariableDeclaration", - "scope": 6705, + "scope": 6696, "src": "2223:9:28", "stateVariable": false, "storageLocation": "default", @@ -12182,7 +12182,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6657, + "id": 6648, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2223:4:28", @@ -12197,7 +12197,7 @@ ], "src": "2222:11:28" }, - "scope": 7077, + "scope": 7068, "src": "2153:360:28", "stateMutability": "view", "superFunction": null, @@ -12205,21 +12205,21 @@ }, { "body": { - "id": 6751, + "id": 6742, "nodeType": "Block", "src": "2627:347:28", "statements": [ { "assignments": [ - 6715 + 6706 ], "declarations": [ { "constant": false, - "id": 6715, + "id": 6706, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 6751, + "scope": 6742, "src": "2637:11:28", "stateVariable": false, "storageLocation": "default", @@ -12228,7 +12228,7 @@ "typeString": "address" }, "typeName": { - "id": 6714, + "id": 6705, "name": "address", "nodeType": "ElementaryTypeName", "src": "2637:7:28", @@ -12242,7 +12242,7 @@ "visibility": "internal" } ], - "id": 6721, + "id": 6712, "initialValue": { "argumentTypes": null, "arguments": [], @@ -12253,11 +12253,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6717, + "id": 6708, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6707, + "referencedDeclaration": 6698, "src": "2663:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12272,18 +12272,18 @@ "typeString": "address" } ], - "id": 6716, + "id": 6707, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2651:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6718, + "id": 6709, "isConstant": false, "isLValue": false, "isPure": false, @@ -12293,25 +12293,25 @@ "nodeType": "FunctionCall", "src": "2651:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6719, + "id": 6710, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "2651:24:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6720, + "id": 6711, "isConstant": false, "isLValue": false, "isPure": false, @@ -12330,15 +12330,15 @@ }, { "assignments": [ - 6723 + 6714 ], "declarations": [ { "constant": false, - "id": 6723, + "id": 6714, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 6751, + "scope": 6742, "src": "2687:11:28", "stateVariable": false, "storageLocation": "default", @@ -12347,7 +12347,7 @@ "typeString": "address" }, "typeName": { - "id": 6722, + "id": 6713, "name": "address", "nodeType": "ElementaryTypeName", "src": "2687:7:28", @@ -12361,17 +12361,17 @@ "visibility": "internal" } ], - "id": 6730, + "id": 6721, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6728, + "id": 6719, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6709, + "referencedDeclaration": 6700, "src": "2727:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12391,11 +12391,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6725, + "id": 6716, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6707, + "referencedDeclaration": 6698, "src": "2713:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12410,18 +12410,18 @@ "typeString": "address" } ], - "id": 6724, + "id": 6715, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2701:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6726, + "id": 6717, "isConstant": false, "isLValue": false, "isPure": false, @@ -12431,25 +12431,25 @@ "nodeType": "FunctionCall", "src": "2701:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6727, + "id": 6718, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "2701:25:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 6729, + "id": 6720, "isConstant": false, "isLValue": false, "isPure": false, @@ -12468,15 +12468,15 @@ }, { "assignments": [ - 6732 + 6723 ], "declarations": [ { "constant": false, - "id": 6732, + "id": 6723, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 6751, + "scope": 6742, "src": "2741:11:28", "stateVariable": false, "storageLocation": "default", @@ -12485,7 +12485,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 6731, + "id": 6722, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2741:7:28", @@ -12498,17 +12498,17 @@ "visibility": "internal" } ], - "id": 6739, + "id": 6730, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6737, + "id": 6728, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6709, + "referencedDeclaration": 6700, "src": "2781:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12528,11 +12528,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6734, + "id": 6725, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6707, + "referencedDeclaration": 6698, "src": "2767:7:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12547,18 +12547,18 @@ "typeString": "address" } ], - "id": 6733, + "id": 6724, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "2755:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6735, + "id": 6726, "isConstant": false, "isLValue": false, "isPure": false, @@ -12568,25 +12568,25 @@ "nodeType": "FunctionCall", "src": "2755:20:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6736, + "id": 6727, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "2755:25:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 6738, + "id": 6729, "isConstant": false, "isLValue": false, "isPure": false, @@ -12606,7 +12606,7 @@ { "expression": { "argumentTypes": null, - "id": 6749, + "id": 6740, "isConstant": false, "isLValue": false, "isPure": false, @@ -12616,11 +12616,11 @@ "components": [ { "argumentTypes": null, - "id": 6740, + "id": 6731, "name": "ink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6712, + "referencedDeclaration": 6703, "src": "2932:3:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12629,7 +12629,7 @@ }, null ], - "id": 6741, + "id": 6732, "isConstant": false, "isInlineArray": false, "isLValue": true, @@ -12649,11 +12649,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6746, + "id": 6737, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6732, + "referencedDeclaration": 6723, "src": "2958:3:28", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -12662,11 +12662,11 @@ }, { "argumentTypes": null, - "id": 6747, + "id": 6738, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6723, + "referencedDeclaration": 6714, "src": "2963:3:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12690,11 +12690,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6743, + "id": 6734, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6715, + "referencedDeclaration": 6706, "src": "2948:3:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12709,18 +12709,18 @@ "typeString": "address" } ], - "id": 6742, + "id": 6733, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "2940:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 6744, + "id": 6735, "isConstant": false, "isLValue": false, "isPure": false, @@ -12730,25 +12730,25 @@ "nodeType": "FunctionCall", "src": "2940:12:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 6745, + "id": 6736, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "2940:17:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 6748, + "id": 6739, "isConstant": false, "isLValue": false, "isPure": false, @@ -12768,29 +12768,29 @@ "typeString": "tuple()" } }, - "id": 6750, + "id": 6741, "nodeType": "ExpressionStatement", "src": "2931:36:28" } ] }, "documentation": null, - "id": 6752, + "id": 6743, "implemented": true, "kind": "function", "modifiers": [], "name": "getVaultCollateral", "nodeType": "FunctionDefinition", "parameters": { - "id": 6710, + "id": 6701, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6707, + "id": 6698, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 6752, + "scope": 6743, "src": "2556:15:28", "stateVariable": false, "storageLocation": "default", @@ -12799,7 +12799,7 @@ "typeString": "address" }, "typeName": { - "id": 6706, + "id": 6697, "name": "address", "nodeType": "ElementaryTypeName", "src": "2556:7:28", @@ -12814,10 +12814,10 @@ }, { "constant": false, - "id": 6709, + "id": 6700, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 6752, + "scope": 6743, "src": "2581:8:28", "stateVariable": false, "storageLocation": "default", @@ -12826,7 +12826,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6708, + "id": 6699, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2581:4:28", @@ -12842,15 +12842,15 @@ "src": "2546:49:28" }, "returnParameters": { - "id": 6713, + "id": 6704, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6712, + "id": 6703, "name": "ink", "nodeType": "VariableDeclaration", - "scope": 6752, + "scope": 6743, "src": "2617:8:28", "stateVariable": false, "storageLocation": "default", @@ -12859,7 +12859,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6711, + "id": 6702, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2617:4:28", @@ -12874,7 +12874,7 @@ ], "src": "2616:10:28" }, - "scope": 7077, + "scope": 7068, "src": "2519:455:28", "stateMutability": "view", "superFunction": null, @@ -12882,21 +12882,21 @@ }, { "body": { - "id": 6975, + "id": 6966, "nodeType": "Block", "src": "3217:3000:28", "statements": [ { "assignments": [ - 6764 + 6755 ], "declarations": [ { "constant": false, - "id": 6764, + "id": 6755, "name": "totalDebt", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3259:14:28", "stateVariable": false, "storageLocation": "default", @@ -12905,7 +12905,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6763, + "id": 6754, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3259:4:28", @@ -12918,14 +12918,14 @@ "visibility": "internal" } ], - "id": 6770, + "id": 6761, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6769, + "id": 6760, "isConstant": false, "isLValue": false, "isPure": false, @@ -12936,18 +12936,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6767, + "id": 6758, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 6765, + "id": 6756, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6754, + "referencedDeclaration": 6745, "src": "3276:7:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12958,11 +12958,11 @@ "operator": "+", "rightExpression": { "argumentTypes": null, - "id": 6766, + "id": 6757, "name": "_aaveFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6756, + "referencedDeclaration": 6747, "src": "3286:8:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12979,11 +12979,11 @@ "operator": "+", "rightExpression": { "argumentTypes": null, - "id": 6768, + "id": 6759, "name": "_protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6758, + "referencedDeclaration": 6749, "src": "3297:12:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -13001,31 +13001,31 @@ }, { "assignments": [ - 6772 + 6763 ], "declarations": [ { "constant": false, - "id": 6772, + "id": 6763, "name": "imvCalldata", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3348:43:28", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData" }, "typeName": { "contractScope": null, - "id": 6771, + "id": 6762, "name": "ImportMakerVaultCallData", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 6523, + "referencedDeclaration": 6514, "src": "3348:24:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_storage_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_storage_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData" } }, @@ -13033,17 +13033,17 @@ "visibility": "internal" } ], - "id": 6779, + "id": 6770, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6775, + "id": 6766, "name": "_data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6760, + "referencedDeclaration": 6751, "src": "3405:5:28", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -13055,19 +13055,19 @@ "components": [ { "argumentTypes": null, - "id": 6776, + "id": 6767, "name": "ImportMakerVaultCallData", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6523, + "referencedDeclaration": 6514, "src": "3413:24:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_ImportMakerVaultCallData_$6523_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ImportMakerVaultCallData_$6514_storage_ptr_$", "typeString": "type(struct DedgeMakerManager.ImportMakerVaultCallData storage pointer)" } } ], - "id": 6777, + "id": 6768, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -13076,7 +13076,7 @@ "nodeType": "TupleExpression", "src": "3412:26:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_struct$_ImportMakerVaultCallData_$6523_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ImportMakerVaultCallData_$6514_storage_ptr_$", "typeString": "type(struct DedgeMakerManager.ImportMakerVaultCallData storage pointer)" } } @@ -13088,24 +13088,24 @@ "typeString": "bytes calldata" }, { - "typeIdentifier": "t_type$_t_struct$_ImportMakerVaultCallData_$6523_storage_ptr_$", + "typeIdentifier": "t_type$_t_struct$_ImportMakerVaultCallData_$6514_storage_ptr_$", "typeString": "type(struct DedgeMakerManager.ImportMakerVaultCallData storage pointer)" } ], "expression": { "argumentTypes": null, - "id": 6773, + "id": 6764, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "3394:3:28", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 6774, + "id": 6765, "isConstant": false, "isLValue": false, "isPure": true, @@ -13119,7 +13119,7 @@ "typeString": "function () pure" } }, - "id": 6778, + "id": 6769, "isConstant": false, "isLValue": false, "isPure": false, @@ -13129,7 +13129,7 @@ "nodeType": "FunctionCall", "src": "3394:45:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, @@ -13138,31 +13138,31 @@ }, { "assignments": [ - 6781 + 6772 ], "declarations": [ { "constant": false, - "id": 6781, + "id": 6772, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3483:31:28", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 6780, + "id": 6771, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "3483:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -13170,7 +13170,7 @@ "visibility": "internal" } ], - "id": 6786, + "id": 6777, "initialValue": { "argumentTypes": null, "arguments": [ @@ -13178,25 +13178,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6783, + "id": 6774, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "3533:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6784, + "id": 6775, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "addressRegistryAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 6514, + "referencedDeclaration": 6505, "src": "3533:34:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -13211,18 +13211,18 @@ "typeString": "address" } ], - "id": 6782, + "id": 6773, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "3517:15:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 6785, + "id": 6776, "isConstant": false, "isLValue": false, "isPure": false, @@ -13232,7 +13232,7 @@ "nodeType": "FunctionCall", "src": "3517:51:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -13241,15 +13241,15 @@ }, { "assignments": [ - 6788 + 6779 ], "declarations": [ { "constant": false, - "id": 6788, + "id": 6779, "name": "cdpManager", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3578:18:28", "stateVariable": false, "storageLocation": "default", @@ -13258,7 +13258,7 @@ "typeString": "address" }, "typeName": { - "id": 6787, + "id": 6778, "name": "address", "nodeType": "ElementaryTypeName", "src": "3578:7:28", @@ -13272,7 +13272,7 @@ "visibility": "internal" } ], - "id": 6792, + "id": 6783, "initialValue": { "argumentTypes": null, "arguments": [], @@ -13280,32 +13280,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6789, + "id": 6780, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "3599:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6790, + "id": 6781, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DssCdpManagerAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7549, + "referencedDeclaration": 7540, "src": "3599:36:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6791, + "id": 6782, "isConstant": false, "isLValue": false, "isPure": false, @@ -13324,15 +13324,15 @@ }, { "assignments": [ - 6794 + 6785 ], "declarations": [ { "constant": false, - "id": 6794, + "id": 6785, "name": "collateralCTokenAddress", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3647:31:28", "stateVariable": false, "storageLocation": "default", @@ -13341,7 +13341,7 @@ "typeString": "address" }, "typeName": { - "id": 6793, + "id": 6784, "name": "address", "nodeType": "ElementaryTypeName", "src": "3647:7:28", @@ -13355,30 +13355,30 @@ "visibility": "internal" } ], - "id": 6797, + "id": 6788, "initialValue": { "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6795, + "id": 6786, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "3681:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6796, + "id": 6787, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralCTokenAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 6518, + "referencedDeclaration": 6509, "src": "3681:35:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -13390,15 +13390,15 @@ }, { "assignments": [ - 6799 + 6790 ], "declarations": [ { "constant": false, - "id": 6799, + "id": 6790, "name": "collateral18", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3770:17:28", "stateVariable": false, "storageLocation": "default", @@ -13407,7 +13407,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6798, + "id": 6789, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3770:4:28", @@ -13420,17 +13420,17 @@ "visibility": "internal" } ], - "id": 6805, + "id": 6796, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6801, + "id": 6792, "name": "cdpManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6788, + "referencedDeclaration": 6779, "src": "3809:10:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -13441,25 +13441,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6802, + "id": 6793, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "3821:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6803, + "id": 6794, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "cdpId", "nodeType": "MemberAccess", - "referencedDeclaration": 6516, + "referencedDeclaration": 6507, "src": "3821:17:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -13478,18 +13478,18 @@ "typeString": "uint256" } ], - "id": 6800, + "id": 6791, "name": "getVaultCollateral", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6752, + "referencedDeclaration": 6743, "src": "3790:18:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 6804, + "id": 6795, "isConstant": false, "isLValue": false, "isPure": false, @@ -13508,15 +13508,15 @@ }, { "assignments": [ - 6809 + 6800 ], "declarations": [ { "constant": false, - "id": 6809, + "id": 6800, "name": "enterMarketsCToken", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "3926:35:28", "stateVariable": false, "storageLocation": "memory", @@ -13526,7 +13526,7 @@ }, "typeName": { "baseType": { - "id": 6807, + "id": 6798, "name": "address", "nodeType": "ElementaryTypeName", "src": "3926:7:28", @@ -13535,7 +13535,7 @@ "typeString": "address" } }, - "id": 6808, + "id": 6799, "length": null, "nodeType": "ArrayTypeName", "src": "3926:9:28", @@ -13548,14 +13548,14 @@ "visibility": "internal" } ], - "id": 6815, + "id": 6806, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "32", - "id": 6813, + "id": 6804, "isConstant": false, "isLValue": false, "isPure": true, @@ -13578,7 +13578,7 @@ "typeString": "int_const 2" } ], - "id": 6812, + "id": 6803, "isConstant": false, "isLValue": false, "isPure": true, @@ -13591,7 +13591,7 @@ }, "typeName": { "baseType": { - "id": 6810, + "id": 6801, "name": "address", "nodeType": "ElementaryTypeName", "src": "3968:7:28", @@ -13601,7 +13601,7 @@ "typeString": "address" } }, - "id": 6811, + "id": 6802, "length": null, "nodeType": "ArrayTypeName", "src": "3968:9:28", @@ -13611,7 +13611,7 @@ } } }, - "id": 6814, + "id": 6805, "isConstant": false, "isLValue": false, "isPure": true, @@ -13631,7 +13631,7 @@ { "expression": { "argumentTypes": null, - "id": 6820, + "id": 6811, "isConstant": false, "isLValue": false, "isPure": false, @@ -13640,22 +13640,22 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 6816, + "id": 6807, "name": "enterMarketsCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6809, + "referencedDeclaration": 6800, "src": "3990:18:28", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 6818, + "id": 6809, "indexExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6817, + "id": 6808, "isConstant": false, "isLValue": false, "isPure": true, @@ -13685,11 +13685,11 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 6819, + "id": 6810, "name": "collateralCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6794, + "referencedDeclaration": 6785, "src": "4014:23:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -13702,14 +13702,14 @@ "typeString": "address" } }, - "id": 6821, + "id": 6812, "nodeType": "ExpressionStatement", "src": "3990:47:28" }, { "expression": { "argumentTypes": null, - "id": 6828, + "id": 6819, "isConstant": false, "isLValue": false, "isPure": false, @@ -13718,22 +13718,22 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 6822, + "id": 6813, "name": "enterMarketsCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6809, + "referencedDeclaration": 6800, "src": "4047:18:28", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" } }, - "id": 6824, + "id": 6815, "indexExpression": { "argumentTypes": null, "hexValue": "31", - "id": 6823, + "id": 6814, "isConstant": false, "isLValue": false, "isPure": true, @@ -13768,32 +13768,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6825, + "id": 6816, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "4071:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6826, + "id": 6817, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CDaiAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7516, + "referencedDeclaration": 7507, "src": "4071:27:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6827, + "id": 6818, "isConstant": false, "isLValue": false, "isPure": false, @@ -13813,21 +13813,21 @@ "typeString": "address" } }, - "id": 6829, + "id": 6820, "nodeType": "ExpressionStatement", "src": "4047:53:28" }, { "assignments": [ - 6833 + 6824 ], "declarations": [ { "constant": false, - "id": 6833, + "id": 6824, "name": "enterMarketErrors", "nodeType": "VariableDeclaration", - "scope": 6975, + "scope": 6966, "src": "4111:31:28", "stateVariable": false, "storageLocation": "memory", @@ -13837,7 +13837,7 @@ }, "typeName": { "baseType": { - "id": 6831, + "id": 6822, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4111:4:28", @@ -13846,7 +13846,7 @@ "typeString": "uint256" } }, - "id": 6832, + "id": 6823, "length": null, "nodeType": "ArrayTypeName", "src": "4111:6:28", @@ -13859,17 +13859,17 @@ "visibility": "internal" } ], - "id": 6842, + "id": 6833, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6840, + "id": 6831, "name": "enterMarketsCToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6809, + "referencedDeclaration": 6800, "src": "4239:18:28", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", @@ -13894,32 +13894,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6835, + "id": 6826, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "4171:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6836, + "id": 6827, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CompoundComptrollerAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7507, + "referencedDeclaration": 7498, "src": "4171:42:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6837, + "id": 6828, "isConstant": false, "isLValue": false, "isPure": false, @@ -13941,18 +13941,18 @@ "typeString": "address" } ], - "id": 6834, + "id": 6825, "name": "IComptroller", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1096, + "referencedDeclaration": 1122, "src": "4145:12:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IComptroller_$1096_$", + "typeIdentifier": "t_type$_t_contract$_IComptroller_$1122_$", "typeString": "type(contract IComptroller)" } }, - "id": 6838, + "id": 6829, "isConstant": false, "isLValue": false, "isPure": false, @@ -13962,25 +13962,25 @@ "nodeType": "FunctionCall", "src": "4145:80:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_IComptroller_$1096", + "typeIdentifier": "t_contract$_IComptroller_$1122", "typeString": "contract IComptroller" } }, - "id": 6839, + "id": 6830, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "enterMarkets", "nodeType": "MemberAccess", - "referencedDeclaration": 884, + "referencedDeclaration": 910, "src": "4145:93:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_array$_t_address_$dyn_memory_ptr_$returns$_t_array$_t_uint256_$dyn_memory_ptr_$", "typeString": "function (address[] memory) external returns (uint256[] memory)" } }, - "id": 6841, + "id": 6832, "isConstant": false, "isLValue": false, "isPure": false, @@ -14007,7 +14007,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6848, + "id": 6839, "isConstant": false, "isLValue": false, "isPure": false, @@ -14016,22 +14016,22 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 6844, + "id": 6835, "name": "enterMarketErrors", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6833, + "referencedDeclaration": 6824, "src": "4277:17:28", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 6846, + "id": 6837, "indexExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6845, + "id": 6836, "isConstant": false, "isLValue": false, "isPure": true, @@ -14062,7 +14062,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6847, + "id": 6838, "isConstant": false, "isLValue": false, "isPure": true, @@ -14086,7 +14086,7 @@ { "argumentTypes": null, "hexValue": "6d6b722d656e7465722d67656d2d6661696c6564", - "id": 6849, + "id": 6840, "isConstant": false, "isLValue": false, "isPure": true, @@ -14113,21 +14113,21 @@ "typeString": "literal_string \"mkr-enter-gem-failed\"" } ], - "id": 6843, + "id": 6834, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "4269:7:28", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6850, + "id": 6841, "isConstant": false, "isLValue": false, "isPure": false, @@ -14141,7 +14141,7 @@ "typeString": "tuple()" } }, - "id": 6851, + "id": 6842, "nodeType": "ExpressionStatement", "src": "4269:58:28" }, @@ -14155,7 +14155,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6857, + "id": 6848, "isConstant": false, "isLValue": false, "isPure": false, @@ -14164,22 +14164,22 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 6853, + "id": 6844, "name": "enterMarketErrors", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6833, + "referencedDeclaration": 6824, "src": "4345:17:28", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$dyn_memory_ptr", "typeString": "uint256[] memory" } }, - "id": 6855, + "id": 6846, "indexExpression": { "argumentTypes": null, "hexValue": "31", - "id": 6854, + "id": 6845, "isConstant": false, "isLValue": false, "isPure": true, @@ -14210,7 +14210,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6856, + "id": 6847, "isConstant": false, "isLValue": false, "isPure": true, @@ -14234,7 +14234,7 @@ { "argumentTypes": null, "hexValue": "6d6b722d656e7465722d6461692d6661696c6564", - "id": 6858, + "id": 6849, "isConstant": false, "isLValue": false, "isPure": true, @@ -14261,21 +14261,21 @@ "typeString": "literal_string \"mkr-enter-dai-failed\"" } ], - "id": 6852, + "id": 6843, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "4337:7:28", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6859, + "id": 6850, "isConstant": false, "isLValue": false, "isPure": false, @@ -14289,7 +14289,7 @@ "typeString": "tuple()" } }, - "id": 6860, + "id": 6851, "nodeType": "ExpressionStatement", "src": "4337:58:28" }, @@ -14300,7 +14300,7 @@ "typeIdentifier": "t_bytes32", "typeString": "bytes32" }, - "id": 6871, + "id": 6862, "isConstant": false, "isLValue": false, "isPure": false, @@ -14312,25 +14312,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6865, + "id": 6856, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "4439:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6866, + "id": 6857, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "cdpId", "nodeType": "MemberAccess", - "referencedDeclaration": 6516, + "referencedDeclaration": 6507, "src": "4439:17:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -14350,11 +14350,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6862, + "id": 6853, "name": "cdpManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6788, + "referencedDeclaration": 6779, "src": "4422:10:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -14369,18 +14369,18 @@ "typeString": "address" } ], - "id": 6861, + "id": 6852, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "4410:11:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 6863, + "id": 6854, "isConstant": false, "isLValue": false, "isPure": false, @@ -14390,25 +14390,25 @@ "nodeType": "FunctionCall", "src": "4410:23:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 6864, + "id": 6855, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "4410:28:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 6867, + "id": 6858, "isConstant": false, "isLValue": false, "isPure": false, @@ -14430,7 +14430,7 @@ { "argumentTypes": null, "hexValue": "4554482d41", - "id": 6869, + "id": 6860, "isConstant": false, "isLValue": false, "isPure": true, @@ -14453,7 +14453,7 @@ "typeString": "literal_string \"ETH-A\"" } ], - "id": 6868, + "id": 6859, "isConstant": false, "isLValue": false, "isPure": true, @@ -14466,7 +14466,7 @@ }, "typeName": "bytes32" }, - "id": 6870, + "id": 6861, "isConstant": false, "isLValue": false, "isPure": true, @@ -14487,7 +14487,7 @@ } }, "falseBody": { - "id": 6973, + "id": 6964, "nodeType": "Block", "src": "5017:1194:28", "statements": [ @@ -14497,11 +14497,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6912, + "id": 6903, "name": "cdpManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6788, + "referencedDeclaration": 6779, "src": "5090:10:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -14512,25 +14512,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6913, + "id": 6904, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "5118:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6914, + "id": 6905, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralJoinAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 6520, + "referencedDeclaration": 6511, "src": "5118:33:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -14544,32 +14544,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6915, + "id": 6906, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "5169:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6916, + "id": 6907, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DaiJoinAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7540, + "referencedDeclaration": 7531, "src": "5169:30:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6917, + "id": 6908, "isConstant": false, "isLValue": false, "isPure": false, @@ -14587,25 +14587,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6918, + "id": 6909, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "5219:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6919, + "id": 6910, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "cdpId", "nodeType": "MemberAccess", - "referencedDeclaration": 6516, + "referencedDeclaration": 6507, "src": "5219:17:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -14619,25 +14619,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6921, + "id": 6912, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "5296:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6922, + "id": 6913, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralJoinAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 6520, + "referencedDeclaration": 6511, "src": "5296:33:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -14646,11 +14646,11 @@ }, { "argumentTypes": null, - "id": 6923, + "id": 6914, "name": "collateral18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6799, + "referencedDeclaration": 6790, "src": "5351:12:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -14669,18 +14669,18 @@ "typeString": "uint256" } ], - "id": 6920, + "id": 6911, "name": "_convert18ToGemUnits", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6651, + "referencedDeclaration": 6642, "src": "5254:20:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 6924, + "id": 6915, "isConstant": false, "isLValue": false, "isPure": false, @@ -14718,18 +14718,18 @@ "typeString": "uint256" } ], - "id": 6911, + "id": 6902, "name": "wipeAllAndFreeGem", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4710, + "referencedDeclaration": 4762, "src": "5055:17:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (address,address,address,uint256,uint256)" } }, - "id": 6925, + "id": 6916, "isConstant": false, "isLValue": false, "isPure": false, @@ -14743,21 +14743,21 @@ "typeString": "tuple()" } }, - "id": 6926, + "id": 6917, "nodeType": "ExpressionStatement", "src": "5055:340:28" }, { "assignments": [ - 6928 + 6919 ], "declarations": [ { "constant": false, - "id": 6928, + "id": 6919, "name": "collateralFixedDec", "nodeType": "VariableDeclaration", - "scope": 6973, + "scope": 6964, "src": "5471:23:28", "stateVariable": false, "storageLocation": "default", @@ -14766,7 +14766,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6927, + "id": 6918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5471:4:28", @@ -14779,17 +14779,17 @@ "visibility": "internal" } ], - "id": 6934, + "id": 6925, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6930, + "id": 6921, "name": "collateral18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6799, + "referencedDeclaration": 6790, "src": "5534:12:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -14800,25 +14800,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6931, + "id": 6922, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "5548:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6932, + "id": 6923, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "collateralDecimals", "nodeType": "MemberAccess", - "referencedDeclaration": 6522, + "referencedDeclaration": 6513, "src": "5548:30:28", "typeDescriptions": { "typeIdentifier": "t_uint8", @@ -14837,18 +14837,18 @@ "typeString": "uint8" } ], - "id": 6929, + "id": 6920, "name": "_convert18ToDecimal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6627, + "referencedDeclaration": 6618, "src": "5497:19:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_uint256_$_t_uint8_$returns$_t_uint256_$", "typeString": "function (uint256,uint8) returns (uint256)" } }, - "id": 6933, + "id": 6924, "isConstant": false, "isLValue": false, "isPure": false, @@ -14871,11 +14871,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6943, + "id": 6934, "name": "collateralCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6794, + "referencedDeclaration": 6785, "src": "5766:23:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -14884,11 +14884,11 @@ }, { "argumentTypes": null, - "id": 6944, + "id": 6935, "name": "collateralFixedDec", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6928, + "referencedDeclaration": 6919, "src": "5791:18:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -14920,11 +14920,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6937, + "id": 6928, "name": "collateralCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6794, + "referencedDeclaration": 6785, "src": "5702:23:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -14939,18 +14939,18 @@ "typeString": "address" } ], - "id": 6936, + "id": 6927, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "5694:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6938, + "id": 6929, "isConstant": false, "isLValue": false, "isPure": false, @@ -14960,25 +14960,25 @@ "nodeType": "FunctionCall", "src": "5694:32:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6939, + "id": 6930, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "underlying", "nodeType": "MemberAccess", - "referencedDeclaration": 809, + "referencedDeclaration": 835, "src": "5694:43:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6940, + "id": 6931, "isConstant": false, "isLValue": false, "isPure": false, @@ -15000,7 +15000,7 @@ "typeString": "address" } ], - "id": 6935, + "id": 6926, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -15011,7 +15011,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 6941, + "id": 6932, "isConstant": false, "isLValue": false, "isPure": false, @@ -15025,7 +15025,7 @@ "typeString": "contract IERC20" } }, - "id": 6942, + "id": 6933, "isConstant": false, "isLValue": false, "isPure": false, @@ -15039,7 +15039,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 6945, + "id": 6936, "isConstant": false, "isLValue": false, "isPure": false, @@ -15053,7 +15053,7 @@ "typeString": "bool" } }, - "id": 6946, + "id": 6937, "nodeType": "ExpressionStatement", "src": "5687:123:28" }, @@ -15067,7 +15067,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6955, + "id": 6946, "isConstant": false, "isLValue": false, "isPure": false, @@ -15077,11 +15077,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6952, + "id": 6943, "name": "collateralFixedDec", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6928, + "referencedDeclaration": 6919, "src": "5961:18:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -15101,11 +15101,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6949, + "id": 6940, "name": "collateralCTokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6794, + "referencedDeclaration": 6785, "src": "5910:23:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -15120,18 +15120,18 @@ "typeString": "address" } ], - "id": 6948, + "id": 6939, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "5902:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6950, + "id": 6941, "isConstant": false, "isLValue": false, "isPure": false, @@ -15141,25 +15141,25 @@ "nodeType": "FunctionCall", "src": "5902:32:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6951, + "id": 6942, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "mint", "nodeType": "MemberAccess", - "referencedDeclaration": 741, + "referencedDeclaration": 754, "src": "5902:37:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 6953, + "id": 6944, "isConstant": false, "isLValue": false, "isPure": false, @@ -15178,7 +15178,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6954, + "id": 6945, "isConstant": false, "isLValue": false, "isPure": true, @@ -15202,7 +15202,7 @@ { "argumentTypes": null, "hexValue": "67656d2d737570706c792d6661696c", - "id": 6956, + "id": 6947, "isConstant": false, "isLValue": false, "isPure": true, @@ -15229,21 +15229,21 @@ "typeString": "literal_string \"gem-supply-fail\"" } ], - "id": 6947, + "id": 6938, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "5877:7:28", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6957, + "id": 6948, "isConstant": false, "isLValue": false, "isPure": false, @@ -15257,7 +15257,7 @@ "typeString": "tuple()" } }, - "id": 6958, + "id": 6949, "nodeType": "ExpressionStatement", "src": "5877:174:28" }, @@ -15271,7 +15271,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6969, + "id": 6960, "isConstant": false, "isLValue": false, "isPure": false, @@ -15281,11 +15281,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6966, + "id": 6957, "name": "totalDebt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6764, + "referencedDeclaration": 6755, "src": "6136:9:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -15310,32 +15310,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6961, + "id": 6952, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "6098:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6962, + "id": 6953, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CDaiAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7516, + "referencedDeclaration": 7507, "src": "6098:27:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6963, + "id": 6954, "isConstant": false, "isLValue": false, "isPure": false, @@ -15357,18 +15357,18 @@ "typeString": "address" } ], - "id": 6960, + "id": 6951, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "6090:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6964, + "id": 6955, "isConstant": false, "isLValue": false, "isPure": false, @@ -15378,25 +15378,25 @@ "nodeType": "FunctionCall", "src": "6090:38:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6965, + "id": 6956, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "borrow", "nodeType": "MemberAccess", - "referencedDeclaration": 762, + "referencedDeclaration": 775, "src": "6090:45:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 6967, + "id": 6958, "isConstant": false, "isLValue": false, "isPure": false, @@ -15415,7 +15415,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6968, + "id": 6959, "isConstant": false, "isLValue": false, "isPure": true, @@ -15439,7 +15439,7 @@ { "argumentTypes": null, "hexValue": "6461692d626f72726f772d6661696c", - "id": 6970, + "id": 6961, "isConstant": false, "isLValue": false, "isPure": true, @@ -15466,21 +15466,21 @@ "typeString": "literal_string \"dai-borrow-fail\"" } ], - "id": 6959, + "id": 6950, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "6065:7:28", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6971, + "id": 6962, "isConstant": false, "isLValue": false, "isPure": false, @@ -15494,17 +15494,17 @@ "typeString": "tuple()" } }, - "id": 6972, + "id": 6963, "nodeType": "ExpressionStatement", "src": "6065:135:28" } ] }, - "id": 6974, + "id": 6965, "nodeType": "IfStatement", "src": "4406:1805:28", "trueBody": { - "id": 6910, + "id": 6901, "nodeType": "Block", "src": "4479:532:28", "statements": [ @@ -15514,11 +15514,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6873, + "id": 6864, "name": "cdpManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6788, + "referencedDeclaration": 6779, "src": "4528:10:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -15532,32 +15532,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6874, + "id": 6865, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "4556:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6875, + "id": 6866, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "EthJoinAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7531, + "referencedDeclaration": 7522, "src": "4556:30:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6876, + "id": 6867, "isConstant": false, "isLValue": false, "isPure": false, @@ -15578,32 +15578,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6877, + "id": 6868, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "4606:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6878, + "id": 6869, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DaiJoinAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7540, + "referencedDeclaration": 7531, "src": "4606:30:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6879, + "id": 6870, "isConstant": false, "isLValue": false, "isPure": false, @@ -15621,25 +15621,25 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 6880, + "id": 6871, "name": "imvCalldata", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6772, + "referencedDeclaration": 6763, "src": "4656:11:28", "typeDescriptions": { - "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6523_memory_ptr", + "typeIdentifier": "t_struct$_ImportMakerVaultCallData_$6514_memory_ptr", "typeString": "struct DedgeMakerManager.ImportMakerVaultCallData memory" } }, - "id": 6881, + "id": 6872, "isConstant": false, "isLValue": true, "isPure": false, "lValueRequested": false, "memberName": "cdpId", "nodeType": "MemberAccess", - "referencedDeclaration": 6516, + "referencedDeclaration": 6507, "src": "4656:17:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -15648,11 +15648,11 @@ }, { "argumentTypes": null, - "id": 6882, + "id": 6873, "name": "collateral18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6799, + "referencedDeclaration": 6790, "src": "4691:12:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -15683,18 +15683,18 @@ "typeString": "uint256" } ], - "id": 6872, + "id": 6863, "name": "wipeAllAndFreeETH", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4610, + "referencedDeclaration": 4662, "src": "4493:17:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_address_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (address,address,address,uint256,uint256)" } }, - "id": 6883, + "id": 6874, "isConstant": false, "isLValue": false, "isPure": false, @@ -15708,7 +15708,7 @@ "typeString": "tuple()" } }, - "id": 6884, + "id": 6875, "nodeType": "ExpressionStatement", "src": "4493:224:28" }, @@ -15721,11 +15721,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6892, + "id": 6883, "name": "collateral18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6799, + "referencedDeclaration": 6790, "src": "4836:12:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -15752,32 +15752,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6886, + "id": 6877, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "4792:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6887, + "id": 6878, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CEtherAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7510, + "referencedDeclaration": 7501, "src": "4792:29:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6888, + "id": 6879, "isConstant": false, "isLValue": false, "isPure": false, @@ -15799,18 +15799,18 @@ "typeString": "address" } ], - "id": 6885, + "id": 6876, "name": "ICEther", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 732, + "referencedDeclaration": 745, "src": "4784:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICEther_$732_$", + "typeIdentifier": "t_type$_t_contract$_ICEther_$745_$", "typeString": "type(contract ICEther)" } }, - "id": 6889, + "id": 6880, "isConstant": false, "isLValue": false, "isPure": false, @@ -15820,11 +15820,11 @@ "nodeType": "FunctionCall", "src": "4784:40:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICEther_$732", + "typeIdentifier": "t_contract$_ICEther_$745", "typeString": "contract ICEther" } }, - "id": 6890, + "id": 6881, "isConstant": false, "isLValue": false, "isPure": false, @@ -15838,7 +15838,7 @@ "typeString": "function () payable external" } }, - "id": 6891, + "id": 6882, "isConstant": false, "isLValue": false, "isPure": false, @@ -15852,7 +15852,7 @@ "typeString": "function (uint256) pure returns (function () payable external)" } }, - "id": 6893, + "id": 6884, "isConstant": false, "isLValue": false, "isPure": false, @@ -15866,7 +15866,7 @@ "typeString": "function () payable external" } }, - "id": 6894, + "id": 6885, "isConstant": false, "isLValue": false, "isPure": false, @@ -15880,7 +15880,7 @@ "typeString": "tuple()" } }, - "id": 6895, + "id": 6886, "nodeType": "ExpressionStatement", "src": "4784:67:28" }, @@ -15894,7 +15894,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 6906, + "id": 6897, "isConstant": false, "isLValue": false, "isPure": false, @@ -15904,11 +15904,11 @@ "arguments": [ { "argumentTypes": null, - "id": 6903, + "id": 6894, "name": "totalDebt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6764, + "referencedDeclaration": 6755, "src": "4936:9:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -15933,32 +15933,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6898, + "id": 6889, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6781, + "referencedDeclaration": 6772, "src": "4898:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6899, + "id": 6890, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "CDaiAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7516, + "referencedDeclaration": 7507, "src": "4898:27:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6900, + "id": 6891, "isConstant": false, "isLValue": false, "isPure": false, @@ -15980,18 +15980,18 @@ "typeString": "address" } ], - "id": 6897, + "id": 6888, "name": "ICToken", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 858, + "referencedDeclaration": 884, "src": "4890:7:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ICToken_$858_$", + "typeIdentifier": "t_type$_t_contract$_ICToken_$884_$", "typeString": "type(contract ICToken)" } }, - "id": 6901, + "id": 6892, "isConstant": false, "isLValue": false, "isPure": false, @@ -16001,25 +16001,25 @@ "nodeType": "FunctionCall", "src": "4890:38:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_ICToken_$858", + "typeIdentifier": "t_contract$_ICToken_$884", "typeString": "contract ICToken" } }, - "id": 6902, + "id": 6893, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "borrow", "nodeType": "MemberAccess", - "referencedDeclaration": 762, + "referencedDeclaration": 775, "src": "4890:45:28", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) external returns (uint256)" } }, - "id": 6904, + "id": 6895, "isConstant": false, "isLValue": false, "isPure": false, @@ -16038,7 +16038,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 6905, + "id": 6896, "isConstant": false, "isLValue": false, "isPure": true, @@ -16062,7 +16062,7 @@ { "argumentTypes": null, "hexValue": "6461692d626f72726f772d6661696c", - "id": 6907, + "id": 6898, "isConstant": false, "isLValue": false, "isPure": true, @@ -16089,21 +16089,21 @@ "typeString": "literal_string \"dai-borrow-fail\"" } ], - "id": 6896, + "id": 6887, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "4865:7:28", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 6908, + "id": 6899, "isConstant": false, "isLValue": false, "isPure": false, @@ -16117,7 +16117,7 @@ "typeString": "tuple()" } }, - "id": 6909, + "id": 6900, "nodeType": "ExpressionStatement", "src": "4865:135:28" } @@ -16127,22 +16127,22 @@ ] }, "documentation": null, - "id": 6976, + "id": 6967, "implemented": true, "kind": "function", "modifiers": [], "name": "importMakerVaultPostLoan", "nodeType": "FunctionDefinition", "parameters": { - "id": 6761, + "id": 6752, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6754, + "id": 6745, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 6976, + "scope": 6967, "src": "3109:12:28", "stateVariable": false, "storageLocation": "default", @@ -16151,7 +16151,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6753, + "id": 6744, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3109:4:28", @@ -16165,10 +16165,10 @@ }, { "constant": false, - "id": 6756, + "id": 6747, "name": "_aaveFee", "nodeType": "VariableDeclaration", - "scope": 6976, + "scope": 6967, "src": "3131:13:28", "stateVariable": false, "storageLocation": "default", @@ -16177,7 +16177,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6755, + "id": 6746, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3131:4:28", @@ -16191,10 +16191,10 @@ }, { "constant": false, - "id": 6758, + "id": 6749, "name": "_protocolFee", "nodeType": "VariableDeclaration", - "scope": 6976, + "scope": 6967, "src": "3154:17:28", "stateVariable": false, "storageLocation": "default", @@ -16203,7 +16203,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6757, + "id": 6748, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3154:4:28", @@ -16217,10 +16217,10 @@ }, { "constant": false, - "id": 6760, + "id": 6751, "name": "_data", "nodeType": "VariableDeclaration", - "scope": 6976, + "scope": 6967, "src": "3181:20:28", "stateVariable": false, "storageLocation": "calldata", @@ -16229,7 +16229,7 @@ "typeString": "bytes" }, "typeName": { - "id": 6759, + "id": 6750, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "3181:5:28", @@ -16245,12 +16245,12 @@ "src": "3099:108:28" }, "returnParameters": { - "id": 6762, + "id": 6753, "nodeType": "ParameterList", "parameters": [], "src": "3217:0:28" }, - "scope": 7077, + "scope": 7068, "src": "3066:3151:28", "stateMutability": "nonpayable", "superFunction": null, @@ -16258,37 +16258,37 @@ }, { "body": { - "id": 7075, + "id": 7066, "nodeType": "Block", "src": "7389:1524:28", "statements": [ { "assignments": [ - 6990 + 6981 ], "declarations": [ { "constant": false, - "id": 6990, + "id": 6981, "name": "addressRegistry", "nodeType": "VariableDeclaration", - "scope": 7075, + "scope": 7066, "src": "7431:31:28", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" }, "typeName": { "contractScope": null, - "id": 6989, + "id": 6980, "name": "AddressRegistry", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "7431:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -16296,17 +16296,17 @@ "visibility": "internal" } ], - "id": 6994, + "id": 6985, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 6992, + "id": 6983, "name": "addressRegistryAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6982, + "referencedDeclaration": 6973, "src": "7481:22:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16321,18 +16321,18 @@ "typeString": "address" } ], - "id": 6991, + "id": 6982, "name": "AddressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7550, + "referencedDeclaration": 7541, "src": "7465:15:28", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7550_$", + "typeIdentifier": "t_type$_t_contract$_AddressRegistry_$7541_$", "typeString": "type(contract AddressRegistry)" } }, - "id": 6993, + "id": 6984, "isConstant": false, "isLValue": false, "isPure": false, @@ -16342,7 +16342,7 @@ "nodeType": "FunctionCall", "src": "7465:39:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, @@ -16351,15 +16351,15 @@ }, { "assignments": [ - 6996 + 6987 ], "declarations": [ { "constant": false, - "id": 6996, + "id": 6987, "name": "cdpManager", "nodeType": "VariableDeclaration", - "scope": 7075, + "scope": 7066, "src": "7567:18:28", "stateVariable": false, "storageLocation": "default", @@ -16368,7 +16368,7 @@ "typeString": "address" }, "typeName": { - "id": 6995, + "id": 6986, "name": "address", "nodeType": "ElementaryTypeName", "src": "7567:7:28", @@ -16382,7 +16382,7 @@ "visibility": "internal" } ], - "id": 7000, + "id": 6991, "initialValue": { "argumentTypes": null, "arguments": [], @@ -16390,32 +16390,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 6997, + "id": 6988, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6990, + "referencedDeclaration": 6981, "src": "7588:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 6998, + "id": 6989, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DssCdpManagerAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7549, + "referencedDeclaration": 7540, "src": "7588:36:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 6999, + "id": 6990, "isConstant": false, "isLValue": false, "isPure": false, @@ -16434,15 +16434,15 @@ }, { "assignments": [ - 7002 + 6993 ], "declarations": [ { "constant": false, - "id": 7002, + "id": 6993, "name": "daiDebt", "nodeType": "VariableDeclaration", - "scope": 7075, + "scope": 7066, "src": "7657:12:28", "stateVariable": false, "storageLocation": "default", @@ -16451,7 +16451,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7001, + "id": 6992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7657:4:28", @@ -16464,17 +16464,17 @@ "visibility": "internal" } ], - "id": 7007, + "id": 6998, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 7004, + "id": 6995, "name": "cdpManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6996, + "referencedDeclaration": 6987, "src": "7685:10:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16483,11 +16483,11 @@ }, { "argumentTypes": null, - "id": 7005, + "id": 6996, "name": "cdpId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6984, + "referencedDeclaration": 6975, "src": "7697:5:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16506,18 +16506,18 @@ "typeString": "uint256" } ], - "id": 7003, + "id": 6994, "name": "getVaultDebt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6705, + "referencedDeclaration": 6696, "src": "7672:12:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 7006, + "id": 6997, "isConstant": false, "isLValue": false, "isPure": false, @@ -16536,15 +16536,15 @@ }, { "assignments": [ - 7009 + 7000 ], "declarations": [ { "constant": false, - "id": 7009, + "id": 7000, "name": "addressAndExecuteOperationCalldataParams", "nodeType": "VariableDeclaration", - "scope": 7075, + "scope": 7066, "src": "7854:53:28", "stateVariable": false, "storageLocation": "memory", @@ -16553,7 +16553,7 @@ "typeString": "bytes" }, "typeName": { - "id": 7008, + "id": 6999, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "7854:5:28", @@ -16566,7 +16566,7 @@ "visibility": "internal" } ], - "id": 7018, + "id": 7009, "initialValue": { "argumentTypes": null, "arguments": [ @@ -16575,11 +16575,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7014, + "id": 7005, "name": "dedgeMakerManagerAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6978, + "referencedDeclaration": 6969, "src": "7951:24:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16596,18 +16596,18 @@ ], "expression": { "argumentTypes": null, - "id": 7012, + "id": 7003, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "7940:3:28", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 7013, + "id": 7004, "isConstant": false, "isLValue": false, "isPure": true, @@ -16621,7 +16621,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 7015, + "id": 7006, "isConstant": false, "isLValue": false, "isPure": false, @@ -16637,11 +16637,11 @@ }, { "argumentTypes": null, - "id": 7016, + "id": 7007, "name": "executeOperationCalldataParams", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6986, + "referencedDeclaration": 6977, "src": "7990:30:28", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", @@ -16662,18 +16662,18 @@ ], "expression": { "argumentTypes": null, - "id": 7010, + "id": 7001, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "7910:3:28", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 7011, + "id": 7002, "isConstant": false, "isLValue": false, "isPure": true, @@ -16687,7 +16687,7 @@ "typeString": "function () pure returns (bytes memory)" } }, - "id": 7017, + "id": 7008, "isConstant": false, "isLValue": false, "isPure": false, @@ -16706,15 +16706,15 @@ }, { "assignments": [ - 7020 + 7011 ], "declarations": [ { "constant": false, - "id": 7020, + "id": 7011, "name": "lendingPool", "nodeType": "VariableDeclaration", - "scope": 7075, + "scope": 7066, "src": "8085:24:28", "stateVariable": false, "storageLocation": "default", @@ -16724,7 +16724,7 @@ }, "typeName": { "contractScope": null, - "id": 7019, + "id": 7010, "name": "ILendingPool", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 546, @@ -16738,7 +16738,7 @@ "visibility": "internal" } ], - "id": 7030, + "id": 7021, "initialValue": { "argumentTypes": null, "arguments": [ @@ -16757,32 +16757,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 7023, + "id": 7014, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6990, + "referencedDeclaration": 6981, "src": "8185:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 7024, + "id": 7015, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "AaveLendingPoolAddressProviderAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7495, + "referencedDeclaration": 7486, "src": "8185:53:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 7025, + "id": 7016, "isConstant": false, "isLValue": false, "isPure": false, @@ -16804,7 +16804,7 @@ "typeString": "address" } ], - "id": 7022, + "id": 7013, "name": "ILendingPoolAddressesProvider", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -16815,7 +16815,7 @@ "typeString": "type(contract ILendingPoolAddressesProvider)" } }, - "id": 7026, + "id": 7017, "isConstant": false, "isLValue": false, "isPure": false, @@ -16829,7 +16829,7 @@ "typeString": "contract ILendingPoolAddressesProvider" } }, - "id": 7027, + "id": 7018, "isConstant": false, "isLValue": false, "isPure": false, @@ -16843,7 +16843,7 @@ "typeString": "function () view external returns (address)" } }, - "id": 7028, + "id": 7019, "isConstant": false, "isLValue": false, "isPure": false, @@ -16865,7 +16865,7 @@ "typeString": "address" } ], - "id": 7021, + "id": 7012, "name": "ILendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -16876,7 +16876,7 @@ "typeString": "type(contract ILendingPool)" } }, - "id": 7029, + "id": 7020, "isConstant": false, "isLValue": false, "isPure": false, @@ -16904,32 +16904,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 7032, + "id": 7023, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6990, + "referencedDeclaration": 6981, "src": "8301:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 7033, + "id": 7024, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DssCdpManagerAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7549, + "referencedDeclaration": 7540, "src": "8301:36:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 7034, + "id": 7025, "isConstant": false, "isLValue": false, "isPure": false, @@ -16945,11 +16945,11 @@ }, { "argumentTypes": null, - "id": 7035, + "id": 7026, "name": "cdpId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6984, + "referencedDeclaration": 6975, "src": "8341:5:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16958,11 +16958,11 @@ }, { "argumentTypes": null, - "id": 7036, + "id": 7027, "name": "dedgeMakerManagerAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6978, + "referencedDeclaration": 6969, "src": "8348:24:28", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16972,7 +16972,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 7037, + "id": 7028, "isConstant": false, "isLValue": false, "isPure": true, @@ -17007,18 +17007,18 @@ "typeString": "int_const 1" } ], - "id": 7031, + "id": 7022, "name": "cdpAllow", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4466, + "referencedDeclaration": 4518, "src": "8292:8:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 7038, + "id": 7029, "isConstant": false, "isLValue": false, "isPure": false, @@ -17032,7 +17032,7 @@ "typeString": "tuple()" } }, - "id": 7039, + "id": 7030, "nodeType": "ExpressionStatement", "src": "8292:84:28" }, @@ -17042,11 +17042,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7041, + "id": 7032, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6980, + "referencedDeclaration": 6971, "src": "8404:15:28", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -17058,11 +17058,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7043, + "id": 7034, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7020, + "referencedDeclaration": 7011, "src": "8429:11:28", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", @@ -17077,7 +17077,7 @@ "typeString": "contract ILendingPool" } ], - "id": 7042, + "id": 7033, "isConstant": false, "isLValue": false, "isPure": true, @@ -17090,7 +17090,7 @@ }, "typeName": "address" }, - "id": 7044, + "id": 7035, "isConstant": false, "isLValue": false, "isPure": false, @@ -17116,18 +17116,18 @@ "typeString": "address" } ], - "id": 7040, + "id": 7031, "name": "_proxyGuardPermit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6564, + "referencedDeclaration": 6555, "src": "8386:17:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", "typeString": "function (address payable,address)" } }, - "id": 7045, + "id": 7036, "isConstant": false, "isLValue": false, "isPure": false, @@ -17141,7 +17141,7 @@ "typeString": "tuple()" } }, - "id": 7046, + "id": 7037, "nodeType": "ExpressionStatement", "src": "8386:56:28" }, @@ -17151,11 +17151,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7050, + "id": 7041, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6980, + "referencedDeclaration": 6971, "src": "8488:15:28", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -17169,32 +17169,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 7051, + "id": 7042, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6990, + "referencedDeclaration": 6981, "src": "8517:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 7052, + "id": 7043, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DaiAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7522, + "referencedDeclaration": 7513, "src": "8517:26:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 7053, + "id": 7044, "isConstant": false, "isLValue": false, "isPure": false, @@ -17210,11 +17210,11 @@ }, { "argumentTypes": null, - "id": 7054, + "id": 7045, "name": "daiDebt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7002, + "referencedDeclaration": 6993, "src": "8559:7:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17223,11 +17223,11 @@ }, { "argumentTypes": null, - "id": 7055, + "id": 7046, "name": "addressAndExecuteOperationCalldataParams", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7009, + "referencedDeclaration": 7000, "src": "8580:40:28", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", @@ -17256,18 +17256,18 @@ ], "expression": { "argumentTypes": null, - "id": 7047, + "id": 7038, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7020, + "referencedDeclaration": 7011, "src": "8453:11:28", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", "typeString": "contract ILendingPool" } }, - "id": 7049, + "id": 7040, "isConstant": false, "isLValue": false, "isPure": false, @@ -17281,7 +17281,7 @@ "typeString": "function (address,address,uint256,bytes memory) external" } }, - "id": 7056, + "id": 7047, "isConstant": false, "isLValue": false, "isPure": false, @@ -17295,7 +17295,7 @@ "typeString": "tuple()" } }, - "id": 7057, + "id": 7048, "nodeType": "ExpressionStatement", "src": "8453:177:28" }, @@ -17310,32 +17310,32 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 7059, + "id": 7050, "name": "addressRegistry", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6990, + "referencedDeclaration": 6981, "src": "8721:15:28", "typeDescriptions": { - "typeIdentifier": "t_contract$_AddressRegistry_$7550", + "typeIdentifier": "t_contract$_AddressRegistry_$7541", "typeString": "contract AddressRegistry" } }, - "id": 7060, + "id": 7051, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "DssCdpManagerAddress", "nodeType": "MemberAccess", - "referencedDeclaration": 7549, + "referencedDeclaration": 7540, "src": "8721:36:28", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 7061, + "id": 7052, "isConstant": false, "isLValue": false, "isPure": false, @@ -17351,11 +17351,11 @@ }, { "argumentTypes": null, - "id": 7062, + "id": 7053, "name": "cdpId", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6984, + "referencedDeclaration": 6975, "src": "8761:5:28", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17368,7 +17368,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 7064, + "id": 7055, "isConstant": false, "isLValue": false, "isPure": true, @@ -17391,7 +17391,7 @@ "typeString": "int_const 1" } ], - "id": 7063, + "id": 7054, "isConstant": false, "isLValue": false, "isPure": true, @@ -17404,7 +17404,7 @@ }, "typeName": "address" }, - "id": 7065, + "id": 7056, "isConstant": false, "isLValue": false, "isPure": true, @@ -17434,18 +17434,18 @@ "typeString": "address payable" } ], - "id": 7058, + "id": 7049, "name": "give", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4445, + "referencedDeclaration": 4497, "src": "8716:4:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$returns$__$", "typeString": "function (address,uint256,address)" } }, - "id": 7066, + "id": 7057, "isConstant": false, "isLValue": false, "isPure": false, @@ -17459,7 +17459,7 @@ "typeString": "tuple()" } }, - "id": 7067, + "id": 7058, "nodeType": "ExpressionStatement", "src": "8716:63:28" }, @@ -17469,11 +17469,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7069, + "id": 7060, "name": "dacProxyAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6980, + "referencedDeclaration": 6971, "src": "8868:15:28", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -17485,11 +17485,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7071, + "id": 7062, "name": "lendingPool", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7020, + "referencedDeclaration": 7011, "src": "8893:11:28", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPool_$546", @@ -17504,7 +17504,7 @@ "typeString": "contract ILendingPool" } ], - "id": 7070, + "id": 7061, "isConstant": false, "isLValue": false, "isPure": true, @@ -17517,7 +17517,7 @@ }, "typeName": "address" }, - "id": 7072, + "id": 7063, "isConstant": false, "isLValue": false, "isPure": false, @@ -17543,18 +17543,18 @@ "typeString": "address" } ], - "id": 7068, + "id": 7059, "name": "_proxyGuardForbid", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 6605, + "referencedDeclaration": 6596, "src": "8850:17:28", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$returns$__$", "typeString": "function (address payable,address)" } }, - "id": 7073, + "id": 7064, "isConstant": false, "isLValue": false, "isPure": false, @@ -17568,29 +17568,29 @@ "typeString": "tuple()" } }, - "id": 7074, + "id": 7065, "nodeType": "ExpressionStatement", "src": "8850:56:28" } ] }, "documentation": null, - "id": 7076, + "id": 7067, "implemented": true, "kind": "function", "modifiers": [], "name": "importMakerVault", "nodeType": "FunctionDefinition", "parameters": { - "id": 6987, + "id": 6978, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 6978, + "id": 6969, "name": "dedgeMakerManagerAddress", "nodeType": "VariableDeclaration", - "scope": 7076, + "scope": 7067, "src": "7185:32:28", "stateVariable": false, "storageLocation": "default", @@ -17599,7 +17599,7 @@ "typeString": "address" }, "typeName": { - "id": 6977, + "id": 6968, "name": "address", "nodeType": "ElementaryTypeName", "src": "7185:7:28", @@ -17614,10 +17614,10 @@ }, { "constant": false, - "id": 6980, + "id": 6971, "name": "dacProxyAddress", "nodeType": "VariableDeclaration", - "scope": 7076, + "scope": 7067, "src": "7227:31:28", "stateVariable": false, "storageLocation": "default", @@ -17626,7 +17626,7 @@ "typeString": "address payable" }, "typeName": { - "id": 6979, + "id": 6970, "name": "address", "nodeType": "ElementaryTypeName", "src": "7227:15:28", @@ -17641,10 +17641,10 @@ }, { "constant": false, - "id": 6982, + "id": 6973, "name": "addressRegistryAddress", "nodeType": "VariableDeclaration", - "scope": 7076, + "scope": 7067, "src": "7268:30:28", "stateVariable": false, "storageLocation": "default", @@ -17653,7 +17653,7 @@ "typeString": "address" }, "typeName": { - "id": 6981, + "id": 6972, "name": "address", "nodeType": "ElementaryTypeName", "src": "7268:7:28", @@ -17668,10 +17668,10 @@ }, { "constant": false, - "id": 6984, + "id": 6975, "name": "cdpId", "nodeType": "VariableDeclaration", - "scope": 7076, + "scope": 7067, "src": "7308:10:28", "stateVariable": false, "storageLocation": "default", @@ -17680,7 +17680,7 @@ "typeString": "uint256" }, "typeName": { - "id": 6983, + "id": 6974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7308:4:28", @@ -17694,10 +17694,10 @@ }, { "constant": false, - "id": 6986, + "id": 6977, "name": "executeOperationCalldataParams", "nodeType": "VariableDeclaration", - "scope": 7076, + "scope": 7067, "src": "7328:45:28", "stateVariable": false, "storageLocation": "calldata", @@ -17706,7 +17706,7 @@ "typeString": "bytes" }, "typeName": { - "id": 6985, + "id": 6976, "name": "bytes", "nodeType": "ElementaryTypeName", "src": "7328:5:28", @@ -17722,19 +17722,19 @@ "src": "7175:204:28" }, "returnParameters": { - "id": 6988, + "id": 6979, "nodeType": "ParameterList", "parameters": [], "src": "7389:0:28" }, - "scope": 7077, + "scope": 7068, "src": "7150:1763:28", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 7078, + "scope": 7069, "src": "845:8070:28" } ], @@ -17753,7 +17753,7 @@ } }, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:28:59.340Z", + "updatedAt": "2020-04-08T12:22:38.643Z", "networkType": "ethereum", "devdoc": { "methods": {} diff --git a/packages/smart-contracts/artifacts/DeployedAddresses.json b/packages/smart-contracts/artifacts/DeployedAddresses.json index 4c81ceb..f121506 100644 --- a/packages/smart-contracts/artifacts/DeployedAddresses.json +++ b/packages/smart-contracts/artifacts/DeployedAddresses.json @@ -1,8 +1 @@ -{ - "dacProxyFactoryAddress": "0x572bfabaeb0f7F5d65EEa04D85595010756Ba986", - "dedgeCompoundManagerAddress": "0xd219e1cad8cde8c46f2d923ace35a8e5b729a683", - "dedgeMakerManagerAddress": "0x1C9c3ED6De13F423a4457aCCfa4e09bc436D5e89", - "dedgeExitManagerAddress": "0x81BFDCF729B5cAC3c4f1F906b63F26E5865b615B", - "dedgeGeneralManagerAddress": "0x40b4C8B5EE1FDd5259E40907E257f11819681b3d", - "addressRegistryAddress": "0x584d265d2b2c221676137d930A96458B8C30199F" -} +{"dacProxyFactoryAddress":"0x572bfabaeb0f7F5d65EEa04D85595010756Ba986","dedgeCompoundManagerAddress":"0xF011fB91DA4db968E8723f3459162ab9723Bb760","dedgeMakerManagerAddress":"0x1C9c3ED6De13F423a4457aCCfa4e09bc436D5e89","dedgeExitManagerAddress":"0x81BFDCF729B5cAC3c4f1F906b63F26E5865b615B","dedgeGeneralManagerAddress":"0x40b4C8B5EE1FDd5259E40907E257f11819681b3d","addressRegistryAddress":"0x584d265d2b2c221676137d930A96458B8C30199F"} \ No newline at end of file diff --git a/packages/smart-contracts/artifacts/DssProxyActionsBase.json b/packages/smart-contracts/artifacts/DssProxyActionsBase.json index 1dcc3d1..9340867 100644 --- a/packages/smart-contracts/artifacts/DssProxyActionsBase.json +++ b/packages/smart-contracts/artifacts/DssProxyActionsBase.json @@ -254,35 +254,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -294,9 +294,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -308,9 +308,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -318,22 +318,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -342,7 +342,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -357,10 +357,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -369,7 +369,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -385,12 +385,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -399,22 +399,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -423,7 +423,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -438,10 +438,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -450,7 +450,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -466,12 +466,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -480,22 +480,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -504,7 +504,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -519,10 +519,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -531,7 +531,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -546,10 +546,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -558,7 +558,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -574,12 +574,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -588,25 +588,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -615,22 +615,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -639,7 +639,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -655,19 +655,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -676,9 +676,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -686,22 +686,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -710,7 +710,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -725,10 +725,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -737,7 +737,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -751,10 +751,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -763,7 +763,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -780,15 +780,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -797,7 +797,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -812,7 +812,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -821,22 +821,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -845,7 +845,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -861,15 +861,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -878,7 +878,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -893,7 +893,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -902,22 +902,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -926,7 +926,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -942,15 +942,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -959,7 +959,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -975,7 +975,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -984,22 +984,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -1008,7 +1008,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -1024,15 +1024,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -1041,7 +1041,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -1057,7 +1057,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -1066,28 +1066,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -1096,7 +1096,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -1112,7 +1112,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -1121,22 +1121,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -1145,7 +1145,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -1159,10 +1159,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -1171,7 +1171,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -1188,15 +1188,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -1205,7 +1205,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -1220,7 +1220,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1229,22 +1229,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -1253,7 +1253,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -1267,10 +1267,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -1279,7 +1279,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -1296,12 +1296,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1310,22 +1310,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -1334,7 +1334,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -1348,10 +1348,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -1360,7 +1360,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -1375,10 +1375,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -1387,7 +1387,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -1403,12 +1403,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1417,22 +1417,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -1441,7 +1441,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -1456,10 +1456,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -1468,7 +1468,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -1484,12 +1484,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1498,22 +1498,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -1522,7 +1522,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -1536,10 +1536,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -1548,7 +1548,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -1562,10 +1562,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -1574,7 +1574,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -1590,12 +1590,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1604,22 +1604,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -1628,7 +1628,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -1642,10 +1642,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -1654,7 +1654,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -1669,10 +1669,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -1681,7 +1681,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -1697,12 +1697,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1711,22 +1711,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -1735,7 +1735,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -1749,10 +1749,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -1761,7 +1761,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -1776,10 +1776,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -1788,7 +1788,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -1804,12 +1804,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1818,22 +1818,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -1842,7 +1842,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -1857,10 +1857,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -1869,7 +1869,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -1883,10 +1883,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -1895,7 +1895,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -1910,10 +1910,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -1922,7 +1922,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -1938,12 +1938,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1952,22 +1952,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -1976,7 +1976,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -1990,10 +1990,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -2002,7 +2002,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -2019,12 +2019,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2033,22 +2033,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -2057,7 +2057,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -2072,10 +2072,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -2084,7 +2084,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -2100,12 +2100,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2114,22 +2114,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -2138,7 +2138,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -2152,10 +2152,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -2164,7 +2164,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -2180,19 +2180,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -2201,9 +2201,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -2211,22 +2211,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -2235,7 +2235,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -2250,10 +2250,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -2262,7 +2262,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -2279,15 +2279,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -2296,7 +2296,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -2311,7 +2311,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -2320,22 +2320,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -2344,7 +2344,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -2360,15 +2360,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -2377,7 +2377,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -2391,10 +2391,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -2403,7 +2403,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -2417,10 +2417,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -2429,7 +2429,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -2443,10 +2443,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -2455,7 +2455,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -2469,10 +2469,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -2481,7 +2481,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -2496,7 +2496,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -2505,22 +2505,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -2529,7 +2529,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -2546,15 +2546,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -2563,7 +2563,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -2578,7 +2578,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -2587,22 +2587,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -2611,7 +2611,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -2625,10 +2625,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -2637,7 +2637,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -2654,15 +2654,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -2671,7 +2671,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -2685,10 +2685,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -2697,7 +2697,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -2712,7 +2712,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -2721,22 +2721,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -2745,7 +2745,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -2759,10 +2759,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -2771,7 +2771,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -2786,10 +2786,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -2798,7 +2798,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -2813,10 +2813,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -2825,7 +2825,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -2840,10 +2840,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -2852,7 +2852,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -2866,10 +2866,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -2878,7 +2878,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -2894,12 +2894,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2908,22 +2908,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -2932,7 +2932,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -2949,12 +2949,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2963,22 +2963,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -2987,7 +2987,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -3002,10 +3002,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -3014,7 +3014,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -3029,10 +3029,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -3041,7 +3041,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -3057,19 +3057,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -3078,9 +3078,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -3088,28 +3088,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -3118,7 +3118,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -3133,7 +3133,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3142,44 +3142,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3189,7 +3189,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3198,22 +3198,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -3222,7 +3222,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -3237,10 +3237,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -3249,7 +3249,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -3265,12 +3265,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -3279,22 +3279,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -3303,7 +3303,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -3318,10 +3318,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -3330,7 +3330,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -3346,19 +3346,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -3367,9 +3367,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -3377,44 +3377,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -3424,7 +3424,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3433,44 +3433,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3480,7 +3480,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3489,22 +3489,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -3513,7 +3513,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -3528,10 +3528,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -3540,7 +3540,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -3556,12 +3556,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -3570,22 +3570,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -3594,7 +3594,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -3609,10 +3609,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -3621,7 +3621,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -3637,19 +3637,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -3658,9 +3658,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -3668,22 +3668,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -3692,7 +3692,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -3708,15 +3708,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -3725,7 +3725,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -3740,14 +3740,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -3756,19 +3756,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -3777,7 +3777,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -3792,7 +3792,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -3800,7 +3800,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -3820,7 +3820,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -3845,7 +3845,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -3859,7 +3859,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -3870,18 +3870,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3893,7 +3893,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -3922,7 +3922,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -3933,7 +3933,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -3943,18 +3943,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3969,18 +3969,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3991,11 +3991,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4015,7 +4015,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4032,11 +4032,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4053,11 +4053,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4079,7 +4079,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -4106,21 +4106,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -4134,29 +4134,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -4165,7 +4165,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -4179,10 +4179,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -4191,7 +4191,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -4207,15 +4207,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -4224,7 +4224,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -4239,7 +4239,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -4247,7 +4247,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -4257,11 +4257,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4270,11 +4270,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4303,11 +4303,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4322,18 +4322,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -4343,25 +4343,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -4371,25 +4371,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -4403,7 +4403,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -4413,11 +4413,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4426,11 +4426,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4454,11 +4454,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4473,18 +4473,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -4494,25 +4494,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -4526,29 +4526,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -4557,7 +4557,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -4572,10 +4572,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -4584,7 +4584,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -4599,10 +4599,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -4611,7 +4611,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -4627,19 +4627,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -4648,38 +4648,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -4693,7 +4693,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -4703,18 +4703,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4729,18 +4729,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4751,11 +4751,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4775,7 +4775,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4792,11 +4792,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4812,7 +4812,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -4839,21 +4839,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -4867,29 +4867,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -4898,7 +4898,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -4912,10 +4912,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -4924,7 +4924,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -4940,15 +4940,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -4957,7 +4957,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -4972,7 +4972,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -4980,25 +4980,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -5012,11 +5012,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5031,7 +5031,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -5044,7 +5044,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -5064,7 +5064,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -5078,18 +5078,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -5101,7 +5101,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -5125,7 +5125,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -5152,21 +5152,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -5180,29 +5180,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -5211,7 +5211,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -5227,15 +5227,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -5244,7 +5244,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -5259,7 +5259,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -5267,25 +5267,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5299,11 +5299,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5316,7 +5316,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -5324,7 +5324,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -5344,7 +5344,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -5377,18 +5377,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -5408,29 +5408,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -5439,7 +5439,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -5455,15 +5455,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -5472,7 +5472,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -5487,7 +5487,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -5495,25 +5495,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5527,11 +5527,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5544,7 +5544,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -5552,7 +5552,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -5578,7 +5578,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -5586,7 +5586,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -5613,11 +5613,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5632,18 +5632,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -5653,25 +5653,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -5692,7 +5692,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5723,18 +5723,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -5754,29 +5754,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -5785,7 +5785,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -5800,10 +5800,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -5812,7 +5812,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -5828,15 +5828,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -5845,7 +5845,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -5860,7 +5860,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -5868,25 +5868,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5901,18 +5901,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5930,7 +5930,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -5938,7 +5938,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -5964,7 +5964,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -5972,7 +5972,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -5999,11 +5999,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6018,18 +6018,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -6039,25 +6039,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -6078,7 +6078,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -6098,7 +6098,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -6123,29 +6123,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -6154,7 +6154,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -6169,10 +6169,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -6181,7 +6181,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -6197,15 +6197,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -6214,7 +6214,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -6229,7 +6229,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -6237,21 +6237,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -6260,7 +6260,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -6273,17 +6273,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6303,11 +6303,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6322,18 +6322,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -6343,25 +6343,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -6380,15 +6380,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -6397,7 +6397,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -6410,17 +6410,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6440,11 +6440,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6459,18 +6459,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -6480,25 +6480,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -6522,18 +6522,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6547,11 +6547,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6560,11 +6560,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6583,18 +6583,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -6615,29 +6615,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6655,7 +6655,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -6668,11 +6668,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6681,11 +6681,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6704,18 +6704,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -6731,11 +6731,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6754,18 +6754,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -6783,11 +6783,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6808,18 +6808,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -6839,25 +6839,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6874,7 +6874,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -6887,11 +6887,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6906,7 +6906,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -6919,7 +6919,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -6935,11 +6935,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6958,18 +6958,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -6990,11 +6990,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7003,11 +7003,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7026,18 +7026,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -7059,18 +7059,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -7083,18 +7083,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -7106,7 +7106,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -7138,7 +7138,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -7148,22 +7148,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -7172,7 +7172,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -7187,10 +7187,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -7199,7 +7199,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -7214,10 +7214,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -7226,7 +7226,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -7241,10 +7241,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -7253,7 +7253,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -7267,10 +7267,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -7279,7 +7279,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -7295,15 +7295,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -7312,7 +7312,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -7327,7 +7327,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -7335,14 +7335,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -7351,10 +7351,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -7363,7 +7363,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -7379,17 +7379,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7409,11 +7409,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7428,18 +7428,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -7449,25 +7449,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -7487,16 +7487,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -7505,7 +7505,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -7518,17 +7518,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7537,11 +7537,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7565,11 +7565,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7584,18 +7584,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -7605,25 +7605,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -7642,15 +7642,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -7659,7 +7659,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -7672,17 +7672,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7702,11 +7702,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7721,18 +7721,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -7742,25 +7742,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -7779,15 +7779,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -7796,7 +7796,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -7809,7 +7809,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7818,11 +7818,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7831,11 +7831,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7854,18 +7854,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -7881,11 +7881,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7904,18 +7904,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -7935,18 +7935,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7961,18 +7961,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7983,11 +7983,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8006,25 +8006,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8041,7 +8041,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -8051,11 +8051,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8064,11 +8064,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8087,18 +8087,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -8116,11 +8116,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8135,18 +8135,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -8159,18 +8159,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8182,7 +8182,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -8214,29 +8214,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -8245,7 +8245,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -8260,10 +8260,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -8272,7 +8272,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -8287,10 +8287,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -8299,7 +8299,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -8314,10 +8314,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -8326,7 +8326,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -8342,15 +8342,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -8359,7 +8359,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -8374,7 +8374,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -8382,25 +8382,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8414,11 +8414,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -8427,11 +8427,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8455,11 +8455,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8474,18 +8474,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -8495,25 +8495,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -8533,29 +8533,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -8564,7 +8564,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -8579,10 +8579,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -8591,7 +8591,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -8605,10 +8605,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -8617,7 +8617,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -8634,15 +8634,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -8651,7 +8651,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -8666,7 +8666,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8674,7 +8674,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -8684,11 +8684,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8697,11 +8697,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8725,11 +8725,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8744,18 +8744,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -8765,25 +8765,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -8797,29 +8797,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -8828,7 +8828,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -8843,10 +8843,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -8855,7 +8855,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -8869,10 +8869,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -8881,7 +8881,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -8898,12 +8898,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8911,7 +8911,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -8921,11 +8921,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8934,11 +8934,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8947,11 +8947,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8979,11 +8979,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8998,18 +8998,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -9019,25 +9019,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -9051,29 +9051,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -9082,7 +9082,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -9097,10 +9097,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -9109,7 +9109,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -9123,10 +9123,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -9135,7 +9135,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -9150,10 +9150,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -9162,7 +9162,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -9178,12 +9178,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9191,7 +9191,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -9201,11 +9201,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9214,11 +9214,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9227,11 +9227,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9259,11 +9259,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9278,18 +9278,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -9299,25 +9299,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -9331,29 +9331,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -9362,7 +9362,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -9377,10 +9377,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -9389,7 +9389,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -9403,10 +9403,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -9415,7 +9415,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -9430,10 +9430,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -9442,7 +9442,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -9458,12 +9458,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9471,7 +9471,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -9481,11 +9481,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9494,11 +9494,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9507,11 +9507,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9539,11 +9539,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9558,18 +9558,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -9579,25 +9579,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -9611,29 +9611,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -9642,7 +9642,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -9657,10 +9657,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -9669,7 +9669,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -9683,10 +9683,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -9695,7 +9695,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -9709,10 +9709,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -9721,7 +9721,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -9737,12 +9737,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9750,21 +9750,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -9773,7 +9773,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -9787,7 +9787,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -9798,11 +9798,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9817,18 +9817,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -9838,25 +9838,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -9875,15 +9875,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -9892,7 +9892,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -9906,17 +9906,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9936,11 +9936,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9955,18 +9955,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -9976,25 +9976,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -10013,15 +10013,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -10030,7 +10030,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -10043,17 +10043,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10073,11 +10073,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10092,18 +10092,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -10113,25 +10113,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -10151,16 +10151,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -10169,7 +10169,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -10182,17 +10182,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10201,11 +10201,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10229,11 +10229,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10248,18 +10248,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -10269,25 +10269,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -10310,11 +10310,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10323,11 +10323,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10339,11 +10339,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10352,11 +10352,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10365,11 +10365,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10378,11 +10378,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10409,18 +10409,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -10450,18 +10450,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -10475,7 +10475,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -10485,11 +10485,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10498,11 +10498,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10511,7 +10511,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -10525,11 +10525,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10544,18 +10544,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -10576,7 +10576,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -10590,11 +10590,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10609,7 +10609,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -10622,7 +10622,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -10661,18 +10661,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -10686,7 +10686,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -10696,11 +10696,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10709,11 +10709,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10725,14 +10725,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10740,11 +10740,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -10757,7 +10757,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -10773,11 +10773,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10804,18 +10804,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -10829,7 +10829,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -10842,14 +10842,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10857,11 +10857,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -10874,7 +10874,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -10890,11 +10890,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10918,11 +10918,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10937,18 +10937,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -10958,25 +10958,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -10990,7 +10990,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -11000,11 +11000,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11029,11 +11029,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11048,18 +11048,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -11069,25 +11069,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -11097,25 +11097,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -11129,29 +11129,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -11160,7 +11160,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -11175,10 +11175,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -11187,7 +11187,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -11202,10 +11202,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -11214,7 +11214,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -11229,10 +11229,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -11241,7 +11241,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -11255,10 +11255,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -11267,7 +11267,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -11283,12 +11283,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -11296,21 +11296,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -11319,7 +11319,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -11333,7 +11333,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -11344,11 +11344,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11363,18 +11363,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -11384,25 +11384,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -11421,15 +11421,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -11438,7 +11438,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -11452,17 +11452,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11482,11 +11482,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11501,18 +11501,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -11522,25 +11522,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -11559,15 +11559,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -11576,7 +11576,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -11589,17 +11589,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11619,11 +11619,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11638,18 +11638,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -11659,25 +11659,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -11697,16 +11697,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -11715,7 +11715,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -11728,17 +11728,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11747,11 +11747,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11775,11 +11775,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11794,18 +11794,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -11815,25 +11815,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -11856,11 +11856,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11869,11 +11869,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11885,11 +11885,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11898,11 +11898,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11911,11 +11911,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11924,11 +11924,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11955,18 +11955,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -11996,18 +11996,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -12021,21 +12021,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -12044,7 +12044,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -12057,17 +12057,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12076,11 +12076,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12099,18 +12099,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -12133,11 +12133,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12146,11 +12146,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12159,7 +12159,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -12173,11 +12173,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12192,18 +12192,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -12224,7 +12224,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -12238,11 +12238,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12257,7 +12257,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -12270,7 +12270,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -12309,18 +12309,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -12334,7 +12334,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -12344,11 +12344,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12357,11 +12357,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12373,14 +12373,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12388,11 +12388,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -12405,7 +12405,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -12421,11 +12421,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12452,18 +12452,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -12477,7 +12477,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -12490,14 +12490,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12505,11 +12505,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -12522,7 +12522,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -12538,11 +12538,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12566,11 +12566,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12585,18 +12585,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -12606,25 +12606,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -12638,29 +12638,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -12669,7 +12669,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -12684,10 +12684,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -12696,7 +12696,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -12711,10 +12711,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -12723,7 +12723,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -12738,10 +12738,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -12750,7 +12750,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -12764,10 +12764,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -12776,7 +12776,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -12792,19 +12792,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -12814,35 +12814,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -12854,9 +12854,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -12868,9 +12868,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -12878,22 +12878,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -12902,7 +12902,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -12917,10 +12917,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -12929,7 +12929,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -12945,12 +12945,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12959,22 +12959,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -12983,7 +12983,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -12998,10 +12998,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -13010,7 +13010,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -13026,12 +13026,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13040,22 +13040,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -13064,7 +13064,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -13079,10 +13079,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -13091,7 +13091,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -13106,10 +13106,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -13118,7 +13118,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -13134,12 +13134,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13148,25 +13148,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -13175,22 +13175,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -13199,7 +13199,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -13215,19 +13215,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -13236,9 +13236,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -13246,22 +13246,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -13270,7 +13270,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -13285,10 +13285,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -13297,7 +13297,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -13311,10 +13311,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -13323,7 +13323,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -13340,15 +13340,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -13357,7 +13357,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -13372,7 +13372,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -13381,22 +13381,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -13405,7 +13405,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -13421,15 +13421,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -13438,7 +13438,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -13453,7 +13453,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -13462,22 +13462,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -13486,7 +13486,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -13502,15 +13502,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -13519,7 +13519,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -13535,7 +13535,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -13544,22 +13544,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -13568,7 +13568,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -13584,15 +13584,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -13601,7 +13601,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -13617,7 +13617,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -13626,28 +13626,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -13656,7 +13656,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -13672,7 +13672,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -13681,22 +13681,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -13705,7 +13705,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -13719,10 +13719,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -13731,7 +13731,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -13748,15 +13748,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -13765,7 +13765,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -13780,7 +13780,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13789,22 +13789,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -13813,7 +13813,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -13827,10 +13827,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -13839,7 +13839,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -13856,12 +13856,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13870,22 +13870,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -13894,7 +13894,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -13908,10 +13908,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -13920,7 +13920,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -13935,10 +13935,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -13947,7 +13947,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -13963,12 +13963,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13977,22 +13977,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -14001,7 +14001,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -14016,10 +14016,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -14028,7 +14028,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -14044,12 +14044,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14058,22 +14058,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -14082,7 +14082,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -14096,10 +14096,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -14108,7 +14108,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -14122,10 +14122,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -14134,7 +14134,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -14150,12 +14150,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14164,22 +14164,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -14188,7 +14188,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -14202,10 +14202,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -14214,7 +14214,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -14229,10 +14229,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -14241,7 +14241,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -14257,12 +14257,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14271,22 +14271,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -14295,7 +14295,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -14309,10 +14309,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -14321,7 +14321,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -14336,10 +14336,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -14348,7 +14348,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -14364,12 +14364,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14378,22 +14378,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -14402,7 +14402,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -14417,10 +14417,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -14429,7 +14429,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -14443,10 +14443,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -14455,7 +14455,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -14470,10 +14470,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -14482,7 +14482,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -14498,12 +14498,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14512,22 +14512,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -14536,7 +14536,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -14550,10 +14550,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -14562,7 +14562,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -14579,12 +14579,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14593,22 +14593,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -14617,7 +14617,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -14632,10 +14632,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -14644,7 +14644,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -14660,12 +14660,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14674,22 +14674,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -14698,7 +14698,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -14712,10 +14712,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -14724,7 +14724,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -14740,19 +14740,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -14761,9 +14761,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -14771,22 +14771,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -14795,7 +14795,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -14810,10 +14810,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -14822,7 +14822,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -14839,15 +14839,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -14856,7 +14856,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -14871,7 +14871,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -14880,22 +14880,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -14904,7 +14904,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -14920,15 +14920,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -14937,7 +14937,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -14951,10 +14951,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -14963,7 +14963,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -14977,10 +14977,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -14989,7 +14989,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -15003,10 +15003,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -15015,7 +15015,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -15029,10 +15029,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -15041,7 +15041,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -15056,7 +15056,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -15065,22 +15065,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -15089,7 +15089,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -15106,15 +15106,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -15123,7 +15123,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -15138,7 +15138,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -15147,22 +15147,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -15171,7 +15171,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -15185,10 +15185,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -15197,7 +15197,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -15214,15 +15214,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -15231,7 +15231,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -15245,10 +15245,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -15257,7 +15257,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -15272,7 +15272,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -15281,22 +15281,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -15305,7 +15305,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -15319,10 +15319,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -15331,7 +15331,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -15346,10 +15346,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -15358,7 +15358,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -15373,10 +15373,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -15385,7 +15385,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -15400,10 +15400,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -15412,7 +15412,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -15426,10 +15426,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -15438,7 +15438,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -15454,12 +15454,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15468,22 +15468,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -15492,7 +15492,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -15509,12 +15509,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15523,22 +15523,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -15547,7 +15547,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -15562,10 +15562,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -15574,7 +15574,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -15589,10 +15589,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -15601,7 +15601,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -15617,19 +15617,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -15638,9 +15638,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -15648,28 +15648,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -15678,7 +15678,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -15693,7 +15693,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15702,44 +15702,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15749,7 +15749,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15758,22 +15758,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -15782,7 +15782,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -15797,10 +15797,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -15809,7 +15809,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -15825,12 +15825,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -15839,22 +15839,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -15863,7 +15863,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -15878,10 +15878,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -15890,7 +15890,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -15906,19 +15906,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -15927,9 +15927,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -15937,44 +15937,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -15984,7 +15984,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15993,44 +15993,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -16040,7 +16040,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -16049,22 +16049,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -16073,7 +16073,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -16088,10 +16088,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -16100,7 +16100,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -16116,12 +16116,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -16130,22 +16130,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -16154,7 +16154,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -16169,10 +16169,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -16181,7 +16181,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -16197,19 +16197,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -16218,9 +16218,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -16228,22 +16228,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -16252,7 +16252,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -16268,15 +16268,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -16285,7 +16285,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -16300,14 +16300,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -16316,19 +16316,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -16337,7 +16337,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -16352,7 +16352,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -16360,7 +16360,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -16380,7 +16380,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -16405,7 +16405,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -16419,7 +16419,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -16430,18 +16430,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16453,7 +16453,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -16482,7 +16482,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -16493,7 +16493,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -16503,18 +16503,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16529,18 +16529,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16551,11 +16551,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16575,7 +16575,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -16592,11 +16592,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16613,11 +16613,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16639,7 +16639,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -16666,21 +16666,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -16694,29 +16694,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -16725,7 +16725,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -16739,10 +16739,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -16751,7 +16751,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -16767,15 +16767,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -16784,7 +16784,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -16799,7 +16799,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -16807,7 +16807,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -16817,11 +16817,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16830,11 +16830,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16863,11 +16863,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16882,18 +16882,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -16903,25 +16903,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -16931,25 +16931,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -16963,7 +16963,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -16973,11 +16973,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16986,11 +16986,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17014,11 +17014,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -17033,18 +17033,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -17054,25 +17054,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -17086,29 +17086,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -17117,7 +17117,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -17132,10 +17132,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -17144,7 +17144,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -17159,10 +17159,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -17171,7 +17171,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -17187,19 +17187,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -17208,38 +17208,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -17253,7 +17253,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -17263,18 +17263,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17289,18 +17289,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17311,11 +17311,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17335,7 +17335,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -17352,11 +17352,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17372,7 +17372,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -17399,21 +17399,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -17427,29 +17427,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -17458,7 +17458,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -17472,10 +17472,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -17484,7 +17484,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -17500,15 +17500,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -17517,7 +17517,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -17532,7 +17532,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -17540,25 +17540,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17572,11 +17572,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17591,7 +17591,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -17604,7 +17604,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -17624,7 +17624,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -17638,18 +17638,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17661,7 +17661,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -17685,7 +17685,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -17712,21 +17712,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -17740,29 +17740,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -17771,7 +17771,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -17787,15 +17787,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -17804,7 +17804,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -17819,7 +17819,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -17827,25 +17827,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17859,11 +17859,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17876,7 +17876,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -17884,7 +17884,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -17904,7 +17904,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -17937,18 +17937,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -17968,29 +17968,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -17999,7 +17999,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -18015,15 +18015,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -18032,7 +18032,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -18047,7 +18047,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -18055,25 +18055,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18087,11 +18087,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18104,7 +18104,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -18112,7 +18112,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -18138,7 +18138,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -18146,7 +18146,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -18173,11 +18173,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18192,18 +18192,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -18213,25 +18213,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -18252,7 +18252,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18283,18 +18283,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -18314,29 +18314,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -18345,7 +18345,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -18360,10 +18360,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -18372,7 +18372,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -18388,15 +18388,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -18405,7 +18405,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -18420,7 +18420,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18428,25 +18428,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18461,18 +18461,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18490,7 +18490,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -18498,7 +18498,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -18524,7 +18524,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -18532,7 +18532,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -18559,11 +18559,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18578,18 +18578,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -18599,25 +18599,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -18638,7 +18638,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18658,7 +18658,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18683,29 +18683,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -18714,7 +18714,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -18729,10 +18729,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -18741,7 +18741,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -18757,15 +18757,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -18774,7 +18774,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -18789,7 +18789,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18797,21 +18797,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -18820,7 +18820,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -18833,17 +18833,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -18863,11 +18863,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18882,18 +18882,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -18903,25 +18903,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -18940,15 +18940,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -18957,7 +18957,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -18970,17 +18970,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19000,11 +19000,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19019,18 +19019,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -19040,25 +19040,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -19082,18 +19082,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19107,11 +19107,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19120,11 +19120,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19143,18 +19143,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -19175,29 +19175,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19215,7 +19215,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -19228,11 +19228,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19241,11 +19241,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19264,18 +19264,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -19291,11 +19291,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19314,18 +19314,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -19343,11 +19343,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19368,18 +19368,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -19399,25 +19399,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19434,7 +19434,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -19447,11 +19447,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19466,7 +19466,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -19479,7 +19479,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -19495,11 +19495,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19518,18 +19518,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -19550,11 +19550,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19563,11 +19563,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19586,18 +19586,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -19619,18 +19619,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -19643,18 +19643,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19666,7 +19666,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -19698,7 +19698,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -19708,22 +19708,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -19732,7 +19732,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -19747,10 +19747,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -19759,7 +19759,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -19774,10 +19774,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -19786,7 +19786,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -19801,10 +19801,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -19813,7 +19813,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -19827,10 +19827,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -19839,7 +19839,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -19855,15 +19855,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -19872,7 +19872,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -19887,7 +19887,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -19895,14 +19895,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -19911,10 +19911,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -19923,7 +19923,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -19939,17 +19939,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -19969,11 +19969,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19988,18 +19988,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -20009,25 +20009,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -20047,16 +20047,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -20065,7 +20065,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -20078,17 +20078,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -20097,11 +20097,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20125,11 +20125,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20144,18 +20144,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -20165,25 +20165,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -20202,15 +20202,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -20219,7 +20219,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -20232,17 +20232,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20262,11 +20262,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20281,18 +20281,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -20302,25 +20302,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -20339,15 +20339,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -20356,7 +20356,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -20369,7 +20369,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -20378,11 +20378,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20391,11 +20391,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20414,18 +20414,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -20441,11 +20441,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20464,18 +20464,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -20495,18 +20495,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20521,18 +20521,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20543,11 +20543,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20566,25 +20566,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20601,7 +20601,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -20611,11 +20611,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20624,11 +20624,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20647,18 +20647,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -20676,11 +20676,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20695,18 +20695,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -20719,18 +20719,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20742,7 +20742,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -20774,29 +20774,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -20805,7 +20805,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -20820,10 +20820,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -20832,7 +20832,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -20847,10 +20847,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -20859,7 +20859,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -20874,10 +20874,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -20886,7 +20886,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -20902,15 +20902,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -20919,7 +20919,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -20934,7 +20934,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -20942,25 +20942,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20974,11 +20974,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -20987,11 +20987,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21015,11 +21015,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21034,18 +21034,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -21055,25 +21055,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -21093,29 +21093,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -21124,7 +21124,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -21139,10 +21139,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -21151,7 +21151,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -21165,10 +21165,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -21177,7 +21177,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -21194,15 +21194,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -21211,7 +21211,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -21226,7 +21226,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21234,7 +21234,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -21244,11 +21244,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21257,11 +21257,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21285,11 +21285,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21304,18 +21304,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -21325,25 +21325,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -21357,29 +21357,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -21388,7 +21388,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -21403,10 +21403,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -21415,7 +21415,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -21429,10 +21429,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -21441,7 +21441,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -21458,12 +21458,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21471,7 +21471,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -21481,11 +21481,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21494,11 +21494,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21507,11 +21507,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21539,11 +21539,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21558,18 +21558,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -21579,25 +21579,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -21611,29 +21611,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -21642,7 +21642,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -21657,10 +21657,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -21669,7 +21669,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -21683,10 +21683,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -21695,7 +21695,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -21710,10 +21710,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -21722,7 +21722,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -21738,12 +21738,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21751,7 +21751,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -21761,11 +21761,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21774,11 +21774,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21787,11 +21787,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21819,11 +21819,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21838,18 +21838,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -21859,25 +21859,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -21891,29 +21891,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -21922,7 +21922,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -21937,10 +21937,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -21949,7 +21949,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -21963,10 +21963,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -21975,7 +21975,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -21990,10 +21990,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -22002,7 +22002,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -22018,12 +22018,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -22031,7 +22031,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -22041,11 +22041,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22054,11 +22054,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -22067,11 +22067,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -22099,11 +22099,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22118,18 +22118,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -22139,25 +22139,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -22171,29 +22171,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -22202,7 +22202,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -22217,10 +22217,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -22229,7 +22229,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -22243,10 +22243,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -22255,7 +22255,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -22269,10 +22269,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -22281,7 +22281,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -22297,12 +22297,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -22310,21 +22310,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -22333,7 +22333,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -22347,7 +22347,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -22358,11 +22358,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22377,18 +22377,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -22398,25 +22398,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -22435,15 +22435,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -22452,7 +22452,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -22466,17 +22466,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22496,11 +22496,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22515,18 +22515,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -22536,25 +22536,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -22573,15 +22573,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -22590,7 +22590,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -22603,17 +22603,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22633,11 +22633,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22652,18 +22652,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -22673,25 +22673,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -22711,16 +22711,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -22729,7 +22729,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -22742,17 +22742,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22761,11 +22761,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22789,11 +22789,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22808,18 +22808,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -22829,25 +22829,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -22870,11 +22870,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22883,11 +22883,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22899,11 +22899,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22912,11 +22912,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22925,11 +22925,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22938,11 +22938,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22969,18 +22969,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -23010,18 +23010,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -23035,7 +23035,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -23045,11 +23045,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23058,11 +23058,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23071,7 +23071,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -23085,11 +23085,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23104,18 +23104,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -23136,7 +23136,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -23150,11 +23150,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23169,7 +23169,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -23182,7 +23182,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -23221,18 +23221,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -23246,7 +23246,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -23256,11 +23256,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23269,11 +23269,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23285,14 +23285,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23300,11 +23300,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -23317,7 +23317,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -23333,11 +23333,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23364,18 +23364,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -23389,7 +23389,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -23402,14 +23402,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23417,11 +23417,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -23434,7 +23434,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -23450,11 +23450,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23478,11 +23478,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23497,18 +23497,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -23518,25 +23518,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -23550,7 +23550,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -23560,11 +23560,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23589,11 +23589,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23608,18 +23608,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -23629,25 +23629,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -23657,25 +23657,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -23689,29 +23689,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -23720,7 +23720,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -23735,10 +23735,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -23747,7 +23747,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -23762,10 +23762,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -23774,7 +23774,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -23789,10 +23789,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -23801,7 +23801,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -23815,10 +23815,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -23827,7 +23827,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -23843,12 +23843,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -23856,21 +23856,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -23879,7 +23879,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -23893,7 +23893,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -23904,11 +23904,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23923,18 +23923,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -23944,25 +23944,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -23981,15 +23981,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -23998,7 +23998,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -24012,17 +24012,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24042,11 +24042,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24061,18 +24061,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -24082,25 +24082,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -24119,15 +24119,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -24136,7 +24136,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -24149,17 +24149,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24179,11 +24179,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24198,18 +24198,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -24219,25 +24219,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -24257,16 +24257,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -24275,7 +24275,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -24288,17 +24288,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24307,11 +24307,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24335,11 +24335,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24354,18 +24354,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -24375,25 +24375,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -24416,11 +24416,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24429,11 +24429,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24445,11 +24445,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24458,11 +24458,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24471,11 +24471,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24484,11 +24484,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24515,18 +24515,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -24556,18 +24556,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -24581,21 +24581,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -24604,7 +24604,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -24617,17 +24617,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24636,11 +24636,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24659,18 +24659,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -24693,11 +24693,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24706,11 +24706,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24719,7 +24719,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -24733,11 +24733,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24752,18 +24752,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -24784,7 +24784,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -24798,11 +24798,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24817,7 +24817,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -24830,7 +24830,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -24869,18 +24869,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -24894,7 +24894,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -24904,11 +24904,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24917,11 +24917,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24933,14 +24933,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -24948,11 +24948,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -24965,7 +24965,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -24981,11 +24981,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -25012,18 +25012,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -25037,7 +25037,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -25050,14 +25050,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -25065,11 +25065,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -25082,7 +25082,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -25098,11 +25098,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -25126,11 +25126,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -25145,18 +25145,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -25166,25 +25166,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -25198,29 +25198,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -25229,7 +25229,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -25244,10 +25244,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -25256,7 +25256,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -25271,10 +25271,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -25283,7 +25283,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -25298,10 +25298,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -25310,7 +25310,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -25324,10 +25324,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -25336,7 +25336,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -25352,19 +25352,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -25376,7 +25376,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.551Z", + "updatedAt": "2020-04-08T12:21:13.800Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/FlashLoanReceiverBase.json b/packages/smart-contracts/artifacts/FlashLoanReceiverBase.json index fb94cf4..dd7ca78 100644 --- a/packages/smart-contracts/artifacts/FlashLoanReceiverBase.json +++ b/packages/smart-contracts/artifacts/FlashLoanReceiverBase.json @@ -63,14 +63,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/aave/FlashLoanReceiverBase.sol", "exportedSymbols": { "FlashLoanReceiverBase": [ - 2138 + 2164 ] }, - "id": 2139, + "id": 2165, "nodeType": "SourceUnit", "nodes": [ { - "id": 2037, + "id": 2063, "literals": [ "solidity", "0.5", @@ -82,9 +82,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/ISafeERC20.sol", "file": "../../interfaces/ISafeERC20.sol", - "id": 2038, + "id": 2064, "nodeType": "ImportDirective", - "scope": 2139, + "scope": 2165, "sourceUnit": 341, "src": "25:41:15", "symbolAliases": [], @@ -93,9 +93,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 2039, + "id": 2065, "nodeType": "ImportDirective", - "scope": 2139, + "scope": 2165, "sourceUnit": 121, "src": "67:37:15", "symbolAliases": [], @@ -104,9 +104,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/IFlashLoanReceiver.sol", "file": "../../interfaces/aave/IFlashLoanReceiver.sol", - "id": 2040, + "id": 2066, "nodeType": "ImportDirective", - "scope": 2139, + "scope": 2165, "sourceUnit": 355, "src": "105:54:15", "symbolAliases": [], @@ -115,9 +115,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol", "file": "../../interfaces/aave/ILendingPoolAddressesProvider.sol", - "id": 2041, + "id": 2067, "nodeType": "ImportDirective", - "scope": 2139, + "scope": 2165, "sourceUnit": 660, "src": "160:65:15", "symbolAliases": [], @@ -129,7 +129,7 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2042, + "id": 2068, "name": "IFlashLoanReceiver", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 354, @@ -139,7 +139,7 @@ "typeString": "contract IFlashLoanReceiver" } }, - "id": 2043, + "id": 2069, "nodeType": "InheritanceSpecifier", "src": "261:18:15" } @@ -150,32 +150,32 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 2138, + "id": 2164, "linearizedBaseContracts": [ - 2138, + 2164, 354 ], "name": "FlashLoanReceiverBase", "nodeType": "ContractDefinition", "nodes": [ { - "id": 2046, + "id": 2072, "libraryName": { "contractScope": null, - "id": 2044, + "id": 2070, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7737, + "referencedDeclaration": 7728, "src": "292:8:15", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$7737", + "typeIdentifier": "t_contract$_SafeMath_$7728", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", "src": "286:27:15", "typeName": { - "id": 2045, + "id": 2071, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "305:7:15", @@ -187,10 +187,10 @@ }, { "constant": true, - "id": 2049, + "id": 2075, "name": "ETHADDRESS", "nodeType": "VariableDeclaration", - "scope": 2138, + "scope": 2164, "src": "319:72:15", "stateVariable": true, "storageLocation": "default", @@ -199,7 +199,7 @@ "typeString": "address" }, "typeName": { - "id": 2047, + "id": 2073, "name": "address", "nodeType": "ElementaryTypeName", "src": "319:7:15", @@ -212,7 +212,7 @@ "value": { "argumentTypes": null, "hexValue": "307845656565654565656545654565654565456545656545454565656565456565656565656545456545", - "id": 2048, + "id": 2074, "isConstant": false, "isLValue": false, "isPure": true, @@ -231,10 +231,10 @@ }, { "constant": false, - "id": 2054, + "id": 2080, "name": "addressesProvider", "nodeType": "VariableDeclaration", - "scope": 2138, + "scope": 2164, "src": "398:130:15", "stateVariable": true, "storageLocation": "default", @@ -244,7 +244,7 @@ }, "typeName": { "contractScope": null, - "id": 2050, + "id": 2076, "name": "ILendingPoolAddressesProvider", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 659, @@ -260,7 +260,7 @@ { "argumentTypes": null, "hexValue": "307832346134326644323843393736413631446635443030443035393943333463346639303734386338", - "id": 2052, + "id": 2078, "isConstant": false, "isLValue": false, "isPure": true, @@ -283,7 +283,7 @@ "typeString": "address payable" } ], - "id": 2051, + "id": 2077, "name": "ILendingPoolAddressesProvider", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -294,7 +294,7 @@ "typeString": "type(contract ILendingPoolAddressesProvider)" } }, - "id": 2053, + "id": 2079, "isConstant": false, "isLValue": false, "isPure": true, @@ -312,53 +312,53 @@ }, { "body": { - "id": 2057, + "id": 2083, "nodeType": "Block", "src": "564:6:15", "statements": [] }, "documentation": null, - "id": 2058, + "id": 2084, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 2055, + "id": 2081, "nodeType": "ParameterList", "parameters": [], "src": "544:2:15" }, "returnParameters": { - "id": 2056, + "id": 2082, "nodeType": "ParameterList", "parameters": [], "src": "564:0:15" }, - "scope": 2138, + "scope": 2164, "src": "535:35:15", "stateMutability": "payable", - "superFunction": 3566, + "superFunction": 3618, "visibility": "external" }, { "body": { - "id": 2077, + "id": 2103, "nodeType": "Block", "src": "661:128:15", "statements": [ { "assignments": [ - 2066 + 2092 ], "declarations": [ { "constant": false, - "id": 2066, + "id": 2092, "name": "core", "nodeType": "VariableDeclaration", - "scope": 2077, + "scope": 2103, "src": "671:20:15", "stateVariable": false, "storageLocation": "default", @@ -367,7 +367,7 @@ "typeString": "address payable" }, "typeName": { - "id": 2065, + "id": 2091, "name": "address", "nodeType": "ElementaryTypeName", "src": "671:15:15", @@ -381,7 +381,7 @@ "visibility": "internal" } ], - "id": 2070, + "id": 2096, "initialValue": { "argumentTypes": null, "arguments": [], @@ -389,18 +389,18 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 2067, + "id": 2093, "name": "addressesProvider", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2054, + "referencedDeclaration": 2080, "src": "694:17:15", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPoolAddressesProvider_$659", "typeString": "contract ILendingPoolAddressesProvider" } }, - "id": 2068, + "id": 2094, "isConstant": false, "isLValue": false, "isPure": false, @@ -414,7 +414,7 @@ "typeString": "function () view external returns (address payable)" } }, - "id": 2069, + "id": 2095, "isConstant": false, "isLValue": false, "isPure": false, @@ -437,11 +437,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2072, + "id": 2098, "name": "core", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2066, + "referencedDeclaration": 2092, "src": "759:4:15", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -450,11 +450,11 @@ }, { "argumentTypes": null, - "id": 2073, + "id": 2099, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2060, + "referencedDeclaration": 2086, "src": "764:8:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -463,11 +463,11 @@ }, { "argumentTypes": null, - "id": 2074, + "id": 2100, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2062, + "referencedDeclaration": 2088, "src": "774:7:15", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -490,18 +490,18 @@ "typeString": "uint256" } ], - "id": 2071, + "id": 2097, "name": "transferInternal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2112, + "referencedDeclaration": 2138, "src": "742:16:15", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address payable,address,uint256)" } }, - "id": 2075, + "id": 2101, "isConstant": false, "isLValue": false, "isPure": false, @@ -515,29 +515,29 @@ "typeString": "tuple()" } }, - "id": 2076, + "id": 2102, "nodeType": "ExpressionStatement", "src": "742:40:15" } ] }, "documentation": null, - "id": 2078, + "id": 2104, "implemented": true, "kind": "function", "modifiers": [], "name": "transferFundsBackToPoolInternal", "nodeType": "FunctionDefinition", "parameters": { - "id": 2063, + "id": 2089, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2060, + "id": 2086, "name": "_reserve", "nodeType": "VariableDeclaration", - "scope": 2078, + "scope": 2104, "src": "617:16:15", "stateVariable": false, "storageLocation": "default", @@ -546,7 +546,7 @@ "typeString": "address" }, "typeName": { - "id": 2059, + "id": 2085, "name": "address", "nodeType": "ElementaryTypeName", "src": "617:7:15", @@ -561,10 +561,10 @@ }, { "constant": false, - "id": 2062, + "id": 2088, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 2078, + "scope": 2104, "src": "635:15:15", "stateVariable": false, "storageLocation": "default", @@ -573,7 +573,7 @@ "typeString": "uint256" }, "typeName": { - "id": 2061, + "id": 2087, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "635:7:15", @@ -589,12 +589,12 @@ "src": "616:35:15" }, "returnParameters": { - "id": 2064, + "id": 2090, "nodeType": "ParameterList", "parameters": [], "src": "661:0:15" }, - "scope": 2138, + "scope": 2164, "src": "576:213:15", "stateMutability": "nonpayable", "superFunction": null, @@ -602,7 +602,7 @@ }, { "body": { - "id": 2111, + "id": 2137, "nodeType": "Block", "src": "896:222:15", "statements": [ @@ -613,18 +613,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2089, + "id": 2115, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2087, + "id": 2113, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2082, + "referencedDeclaration": 2108, "src": "909:8:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -635,11 +635,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2088, + "id": 2114, "name": "ETHADDRESS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2049, + "referencedDeclaration": 2075, "src": "921:10:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -653,11 +653,11 @@ } }, "falseBody": null, - "id": 2102, + "id": 2128, "nodeType": "IfStatement", "src": "906:147:15", "trueBody": { - "id": 2101, + "id": 2127, "nodeType": "Block", "src": "933:120:15", "statements": [ @@ -668,7 +668,7 @@ { "argumentTypes": null, "hexValue": "", - "id": 2097, + "id": 2123, "isConstant": false, "isLValue": false, "isPure": true, @@ -694,11 +694,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2095, + "id": 2121, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2084, + "referencedDeclaration": 2110, "src": "1010:7:15", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -717,18 +717,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2090, + "id": 2116, "name": "_destination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2080, + "referencedDeclaration": 2106, "src": "986:12:15", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "id": 2093, + "id": 2119, "isConstant": false, "isLValue": false, "isPure": false, @@ -742,7 +742,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 2094, + "id": 2120, "isConstant": false, "isLValue": false, "isPure": false, @@ -756,7 +756,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 2096, + "id": 2122, "isConstant": false, "isLValue": false, "isPure": false, @@ -770,7 +770,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 2098, + "id": 2124, "isConstant": false, "isLValue": false, "isPure": false, @@ -784,14 +784,14 @@ "typeString": "tuple(bool,bytes memory)" } }, - "id": 2099, + "id": 2125, "nodeType": "ExpressionStatement", "src": "986:36:15" }, { "expression": null, - "functionReturnParameters": 2086, - "id": 2100, + "functionReturnParameters": 2112, + "id": 2126, "nodeType": "Return", "src": "1036:7:15" } @@ -804,11 +804,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2107, + "id": 2133, "name": "_destination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2080, + "referencedDeclaration": 2106, "src": "1089:12:15", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -817,11 +817,11 @@ }, { "argumentTypes": null, - "id": 2108, + "id": 2134, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2084, + "referencedDeclaration": 2110, "src": "1103:7:15", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -845,11 +845,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2104, + "id": 2130, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2082, + "referencedDeclaration": 2108, "src": "1070:8:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -864,7 +864,7 @@ "typeString": "address" } ], - "id": 2103, + "id": 2129, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -875,7 +875,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 2105, + "id": 2131, "isConstant": false, "isLValue": false, "isPure": false, @@ -889,7 +889,7 @@ "typeString": "contract IERC20" } }, - "id": 2106, + "id": 2132, "isConstant": false, "isLValue": false, "isPure": false, @@ -903,7 +903,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2109, + "id": 2135, "isConstant": false, "isLValue": false, "isPure": false, @@ -917,29 +917,29 @@ "typeString": "bool" } }, - "id": 2110, + "id": 2136, "nodeType": "ExpressionStatement", "src": "1063:48:15" } ] }, "documentation": null, - "id": 2112, + "id": 2138, "implemented": true, "kind": "function", "modifiers": [], "name": "transferInternal", "nodeType": "FunctionDefinition", "parameters": { - "id": 2085, + "id": 2111, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2080, + "id": 2106, "name": "_destination", "nodeType": "VariableDeclaration", - "scope": 2112, + "scope": 2138, "src": "821:28:15", "stateVariable": false, "storageLocation": "default", @@ -948,7 +948,7 @@ "typeString": "address payable" }, "typeName": { - "id": 2079, + "id": 2105, "name": "address", "nodeType": "ElementaryTypeName", "src": "821:15:15", @@ -963,10 +963,10 @@ }, { "constant": false, - "id": 2082, + "id": 2108, "name": "_reserve", "nodeType": "VariableDeclaration", - "scope": 2112, + "scope": 2138, "src": "851:16:15", "stateVariable": false, "storageLocation": "default", @@ -975,7 +975,7 @@ "typeString": "address" }, "typeName": { - "id": 2081, + "id": 2107, "name": "address", "nodeType": "ElementaryTypeName", "src": "851:7:15", @@ -990,10 +990,10 @@ }, { "constant": false, - "id": 2084, + "id": 2110, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 2112, + "scope": 2138, "src": "869:16:15", "stateVariable": false, "storageLocation": "default", @@ -1002,7 +1002,7 @@ "typeString": "uint256" }, "typeName": { - "id": 2083, + "id": 2109, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "869:7:15", @@ -1018,12 +1018,12 @@ "src": "820:66:15" }, "returnParameters": { - "id": 2086, + "id": 2112, "nodeType": "ParameterList", "parameters": [], "src": "896:0:15" }, - "scope": 2138, + "scope": 2164, "src": "795:323:15", "stateMutability": "nonpayable", "superFunction": null, @@ -1031,7 +1031,7 @@ }, { "body": { - "id": 2136, + "id": 2162, "nodeType": "Block", "src": "1218:144:15", "statements": [ @@ -1042,18 +1042,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2123, + "id": 2149, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2121, + "id": 2147, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2116, + "referencedDeclaration": 2142, "src": "1231:8:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1064,11 +1064,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2122, + "id": 2148, "name": "ETHADDRESS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2049, + "referencedDeclaration": 2075, "src": "1243:10:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1082,11 +1082,11 @@ } }, "falseBody": null, - "id": 2128, + "id": 2154, "nodeType": "IfStatement", "src": "1228:75:15", "trueBody": { - "id": 2127, + "id": 2153, "nodeType": "Block", "src": "1255:48:15", "statements": [ @@ -1095,18 +1095,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2124, + "id": 2150, "name": "_target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2114, + "referencedDeclaration": 2140, "src": "1277:7:15", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 2125, + "id": 2151, "isConstant": false, "isLValue": false, "isPure": false, @@ -1120,8 +1120,8 @@ "typeString": "uint256" } }, - "functionReturnParameters": 2120, - "id": 2126, + "functionReturnParameters": 2146, + "id": 2152, "nodeType": "Return", "src": "1270:22:15" } @@ -1134,11 +1134,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2133, + "id": 2159, "name": "_target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2114, + "referencedDeclaration": 2140, "src": "1347:7:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1158,11 +1158,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2130, + "id": 2156, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2116, + "referencedDeclaration": 2142, "src": "1327:8:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1177,7 +1177,7 @@ "typeString": "address" } ], - "id": 2129, + "id": 2155, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1188,7 +1188,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 2131, + "id": 2157, "isConstant": false, "isLValue": false, "isPure": false, @@ -1202,7 +1202,7 @@ "typeString": "contract IERC20" } }, - "id": 2132, + "id": 2158, "isConstant": false, "isLValue": false, "isPure": false, @@ -1216,7 +1216,7 @@ "typeString": "function (address) view external returns (uint256)" } }, - "id": 2134, + "id": 2160, "isConstant": false, "isLValue": false, "isPure": false, @@ -1230,30 +1230,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 2120, - "id": 2135, + "functionReturnParameters": 2146, + "id": 2161, "nodeType": "Return", "src": "1313:42:15" } ] }, "documentation": null, - "id": 2137, + "id": 2163, "implemented": true, "kind": "function", "modifiers": [], "name": "getBalanceInternal", "nodeType": "FunctionDefinition", "parameters": { - "id": 2117, + "id": 2143, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2114, + "id": 2140, "name": "_target", "nodeType": "VariableDeclaration", - "scope": 2137, + "scope": 2163, "src": "1152:15:15", "stateVariable": false, "storageLocation": "default", @@ -1262,7 +1262,7 @@ "typeString": "address" }, "typeName": { - "id": 2113, + "id": 2139, "name": "address", "nodeType": "ElementaryTypeName", "src": "1152:7:15", @@ -1277,10 +1277,10 @@ }, { "constant": false, - "id": 2116, + "id": 2142, "name": "_reserve", "nodeType": "VariableDeclaration", - "scope": 2137, + "scope": 2163, "src": "1169:16:15", "stateVariable": false, "storageLocation": "default", @@ -1289,7 +1289,7 @@ "typeString": "address" }, "typeName": { - "id": 2115, + "id": 2141, "name": "address", "nodeType": "ElementaryTypeName", "src": "1169:7:15", @@ -1306,15 +1306,15 @@ "src": "1151:35:15" }, "returnParameters": { - "id": 2120, + "id": 2146, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2119, + "id": 2145, "name": "", "nodeType": "VariableDeclaration", - "scope": 2137, + "scope": 2163, "src": "1209:7:15", "stateVariable": false, "storageLocation": "default", @@ -1323,7 +1323,7 @@ "typeString": "uint256" }, "typeName": { - "id": 2118, + "id": 2144, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1209:7:15", @@ -1338,14 +1338,14 @@ ], "src": "1208:9:15" }, - "scope": 2138, + "scope": 2164, "src": "1124:238:15", "stateMutability": "view", "superFunction": null, "visibility": "internal" } ], - "scope": 2139, + "scope": 2165, "src": "227:1137:15" } ], @@ -1355,14 +1355,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/aave/FlashLoanReceiverBase.sol", "exportedSymbols": { "FlashLoanReceiverBase": [ - 2138 + 2164 ] }, - "id": 2139, + "id": 2165, "nodeType": "SourceUnit", "nodes": [ { - "id": 2037, + "id": 2063, "literals": [ "solidity", "0.5", @@ -1374,9 +1374,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/ISafeERC20.sol", "file": "../../interfaces/ISafeERC20.sol", - "id": 2038, + "id": 2064, "nodeType": "ImportDirective", - "scope": 2139, + "scope": 2165, "sourceUnit": 341, "src": "25:41:15", "symbolAliases": [], @@ -1385,9 +1385,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 2039, + "id": 2065, "nodeType": "ImportDirective", - "scope": 2139, + "scope": 2165, "sourceUnit": 121, "src": "67:37:15", "symbolAliases": [], @@ -1396,9 +1396,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/IFlashLoanReceiver.sol", "file": "../../interfaces/aave/IFlashLoanReceiver.sol", - "id": 2040, + "id": 2066, "nodeType": "ImportDirective", - "scope": 2139, + "scope": 2165, "sourceUnit": 355, "src": "105:54:15", "symbolAliases": [], @@ -1407,9 +1407,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/aave/ILendingPoolAddressesProvider.sol", "file": "../../interfaces/aave/ILendingPoolAddressesProvider.sol", - "id": 2041, + "id": 2067, "nodeType": "ImportDirective", - "scope": 2139, + "scope": 2165, "sourceUnit": 660, "src": "160:65:15", "symbolAliases": [], @@ -1421,7 +1421,7 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 2042, + "id": 2068, "name": "IFlashLoanReceiver", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 354, @@ -1431,7 +1431,7 @@ "typeString": "contract IFlashLoanReceiver" } }, - "id": 2043, + "id": 2069, "nodeType": "InheritanceSpecifier", "src": "261:18:15" } @@ -1442,32 +1442,32 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 2138, + "id": 2164, "linearizedBaseContracts": [ - 2138, + 2164, 354 ], "name": "FlashLoanReceiverBase", "nodeType": "ContractDefinition", "nodes": [ { - "id": 2046, + "id": 2072, "libraryName": { "contractScope": null, - "id": 2044, + "id": 2070, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7737, + "referencedDeclaration": 7728, "src": "292:8:15", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$7737", + "typeIdentifier": "t_contract$_SafeMath_$7728", "typeString": "library SafeMath" } }, "nodeType": "UsingForDirective", "src": "286:27:15", "typeName": { - "id": 2045, + "id": 2071, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "305:7:15", @@ -1479,10 +1479,10 @@ }, { "constant": true, - "id": 2049, + "id": 2075, "name": "ETHADDRESS", "nodeType": "VariableDeclaration", - "scope": 2138, + "scope": 2164, "src": "319:72:15", "stateVariable": true, "storageLocation": "default", @@ -1491,7 +1491,7 @@ "typeString": "address" }, "typeName": { - "id": 2047, + "id": 2073, "name": "address", "nodeType": "ElementaryTypeName", "src": "319:7:15", @@ -1504,7 +1504,7 @@ "value": { "argumentTypes": null, "hexValue": "307845656565654565656545654565654565456545656545454565656565456565656565656545456545", - "id": 2048, + "id": 2074, "isConstant": false, "isLValue": false, "isPure": true, @@ -1523,10 +1523,10 @@ }, { "constant": false, - "id": 2054, + "id": 2080, "name": "addressesProvider", "nodeType": "VariableDeclaration", - "scope": 2138, + "scope": 2164, "src": "398:130:15", "stateVariable": true, "storageLocation": "default", @@ -1536,7 +1536,7 @@ }, "typeName": { "contractScope": null, - "id": 2050, + "id": 2076, "name": "ILendingPoolAddressesProvider", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 659, @@ -1552,7 +1552,7 @@ { "argumentTypes": null, "hexValue": "307832346134326644323843393736413631446635443030443035393943333463346639303734386338", - "id": 2052, + "id": 2078, "isConstant": false, "isLValue": false, "isPure": true, @@ -1575,7 +1575,7 @@ "typeString": "address payable" } ], - "id": 2051, + "id": 2077, "name": "ILendingPoolAddressesProvider", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1586,7 +1586,7 @@ "typeString": "type(contract ILendingPoolAddressesProvider)" } }, - "id": 2053, + "id": 2079, "isConstant": false, "isLValue": false, "isPure": true, @@ -1604,53 +1604,53 @@ }, { "body": { - "id": 2057, + "id": 2083, "nodeType": "Block", "src": "564:6:15", "statements": [] }, "documentation": null, - "id": 2058, + "id": 2084, "implemented": true, "kind": "fallback", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 2055, + "id": 2081, "nodeType": "ParameterList", "parameters": [], "src": "544:2:15" }, "returnParameters": { - "id": 2056, + "id": 2082, "nodeType": "ParameterList", "parameters": [], "src": "564:0:15" }, - "scope": 2138, + "scope": 2164, "src": "535:35:15", "stateMutability": "payable", - "superFunction": 3566, + "superFunction": 3618, "visibility": "external" }, { "body": { - "id": 2077, + "id": 2103, "nodeType": "Block", "src": "661:128:15", "statements": [ { "assignments": [ - 2066 + 2092 ], "declarations": [ { "constant": false, - "id": 2066, + "id": 2092, "name": "core", "nodeType": "VariableDeclaration", - "scope": 2077, + "scope": 2103, "src": "671:20:15", "stateVariable": false, "storageLocation": "default", @@ -1659,7 +1659,7 @@ "typeString": "address payable" }, "typeName": { - "id": 2065, + "id": 2091, "name": "address", "nodeType": "ElementaryTypeName", "src": "671:15:15", @@ -1673,7 +1673,7 @@ "visibility": "internal" } ], - "id": 2070, + "id": 2096, "initialValue": { "argumentTypes": null, "arguments": [], @@ -1681,18 +1681,18 @@ "argumentTypes": [], "expression": { "argumentTypes": null, - "id": 2067, + "id": 2093, "name": "addressesProvider", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2054, + "referencedDeclaration": 2080, "src": "694:17:15", "typeDescriptions": { "typeIdentifier": "t_contract$_ILendingPoolAddressesProvider_$659", "typeString": "contract ILendingPoolAddressesProvider" } }, - "id": 2068, + "id": 2094, "isConstant": false, "isLValue": false, "isPure": false, @@ -1706,7 +1706,7 @@ "typeString": "function () view external returns (address payable)" } }, - "id": 2069, + "id": 2095, "isConstant": false, "isLValue": false, "isPure": false, @@ -1729,11 +1729,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2072, + "id": 2098, "name": "core", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2066, + "referencedDeclaration": 2092, "src": "759:4:15", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -1742,11 +1742,11 @@ }, { "argumentTypes": null, - "id": 2073, + "id": 2099, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2060, + "referencedDeclaration": 2086, "src": "764:8:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1755,11 +1755,11 @@ }, { "argumentTypes": null, - "id": 2074, + "id": 2100, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2062, + "referencedDeclaration": 2088, "src": "774:7:15", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1782,18 +1782,18 @@ "typeString": "uint256" } ], - "id": 2071, + "id": 2097, "name": "transferInternal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2112, + "referencedDeclaration": 2138, "src": "742:16:15", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address payable,address,uint256)" } }, - "id": 2075, + "id": 2101, "isConstant": false, "isLValue": false, "isPure": false, @@ -1807,29 +1807,29 @@ "typeString": "tuple()" } }, - "id": 2076, + "id": 2102, "nodeType": "ExpressionStatement", "src": "742:40:15" } ] }, "documentation": null, - "id": 2078, + "id": 2104, "implemented": true, "kind": "function", "modifiers": [], "name": "transferFundsBackToPoolInternal", "nodeType": "FunctionDefinition", "parameters": { - "id": 2063, + "id": 2089, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2060, + "id": 2086, "name": "_reserve", "nodeType": "VariableDeclaration", - "scope": 2078, + "scope": 2104, "src": "617:16:15", "stateVariable": false, "storageLocation": "default", @@ -1838,7 +1838,7 @@ "typeString": "address" }, "typeName": { - "id": 2059, + "id": 2085, "name": "address", "nodeType": "ElementaryTypeName", "src": "617:7:15", @@ -1853,10 +1853,10 @@ }, { "constant": false, - "id": 2062, + "id": 2088, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 2078, + "scope": 2104, "src": "635:15:15", "stateVariable": false, "storageLocation": "default", @@ -1865,7 +1865,7 @@ "typeString": "uint256" }, "typeName": { - "id": 2061, + "id": 2087, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "635:7:15", @@ -1881,12 +1881,12 @@ "src": "616:35:15" }, "returnParameters": { - "id": 2064, + "id": 2090, "nodeType": "ParameterList", "parameters": [], "src": "661:0:15" }, - "scope": 2138, + "scope": 2164, "src": "576:213:15", "stateMutability": "nonpayable", "superFunction": null, @@ -1894,7 +1894,7 @@ }, { "body": { - "id": 2111, + "id": 2137, "nodeType": "Block", "src": "896:222:15", "statements": [ @@ -1905,18 +1905,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2089, + "id": 2115, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2087, + "id": 2113, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2082, + "referencedDeclaration": 2108, "src": "909:8:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1927,11 +1927,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2088, + "id": 2114, "name": "ETHADDRESS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2049, + "referencedDeclaration": 2075, "src": "921:10:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1945,11 +1945,11 @@ } }, "falseBody": null, - "id": 2102, + "id": 2128, "nodeType": "IfStatement", "src": "906:147:15", "trueBody": { - "id": 2101, + "id": 2127, "nodeType": "Block", "src": "933:120:15", "statements": [ @@ -1960,7 +1960,7 @@ { "argumentTypes": null, "hexValue": "", - "id": 2097, + "id": 2123, "isConstant": false, "isLValue": false, "isPure": true, @@ -1986,11 +1986,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2095, + "id": 2121, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2084, + "referencedDeclaration": 2110, "src": "1010:7:15", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2009,18 +2009,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2090, + "id": 2116, "name": "_destination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2080, + "referencedDeclaration": 2106, "src": "986:12:15", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "id": 2093, + "id": 2119, "isConstant": false, "isLValue": false, "isPure": false, @@ -2034,7 +2034,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 2094, + "id": 2120, "isConstant": false, "isLValue": false, "isPure": false, @@ -2048,7 +2048,7 @@ "typeString": "function (uint256) pure returns (function (bytes memory) payable returns (bool,bytes memory))" } }, - "id": 2096, + "id": 2122, "isConstant": false, "isLValue": false, "isPure": false, @@ -2062,7 +2062,7 @@ "typeString": "function (bytes memory) payable returns (bool,bytes memory)" } }, - "id": 2098, + "id": 2124, "isConstant": false, "isLValue": false, "isPure": false, @@ -2076,14 +2076,14 @@ "typeString": "tuple(bool,bytes memory)" } }, - "id": 2099, + "id": 2125, "nodeType": "ExpressionStatement", "src": "986:36:15" }, { "expression": null, - "functionReturnParameters": 2086, - "id": 2100, + "functionReturnParameters": 2112, + "id": 2126, "nodeType": "Return", "src": "1036:7:15" } @@ -2096,11 +2096,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2107, + "id": 2133, "name": "_destination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2080, + "referencedDeclaration": 2106, "src": "1089:12:15", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -2109,11 +2109,11 @@ }, { "argumentTypes": null, - "id": 2108, + "id": 2134, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2084, + "referencedDeclaration": 2110, "src": "1103:7:15", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2137,11 +2137,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2104, + "id": 2130, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2082, + "referencedDeclaration": 2108, "src": "1070:8:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2156,7 +2156,7 @@ "typeString": "address" } ], - "id": 2103, + "id": 2129, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2167,7 +2167,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 2105, + "id": 2131, "isConstant": false, "isLValue": false, "isPure": false, @@ -2181,7 +2181,7 @@ "typeString": "contract IERC20" } }, - "id": 2106, + "id": 2132, "isConstant": false, "isLValue": false, "isPure": false, @@ -2195,7 +2195,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 2109, + "id": 2135, "isConstant": false, "isLValue": false, "isPure": false, @@ -2209,29 +2209,29 @@ "typeString": "bool" } }, - "id": 2110, + "id": 2136, "nodeType": "ExpressionStatement", "src": "1063:48:15" } ] }, "documentation": null, - "id": 2112, + "id": 2138, "implemented": true, "kind": "function", "modifiers": [], "name": "transferInternal", "nodeType": "FunctionDefinition", "parameters": { - "id": 2085, + "id": 2111, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2080, + "id": 2106, "name": "_destination", "nodeType": "VariableDeclaration", - "scope": 2112, + "scope": 2138, "src": "821:28:15", "stateVariable": false, "storageLocation": "default", @@ -2240,7 +2240,7 @@ "typeString": "address payable" }, "typeName": { - "id": 2079, + "id": 2105, "name": "address", "nodeType": "ElementaryTypeName", "src": "821:15:15", @@ -2255,10 +2255,10 @@ }, { "constant": false, - "id": 2082, + "id": 2108, "name": "_reserve", "nodeType": "VariableDeclaration", - "scope": 2112, + "scope": 2138, "src": "851:16:15", "stateVariable": false, "storageLocation": "default", @@ -2267,7 +2267,7 @@ "typeString": "address" }, "typeName": { - "id": 2081, + "id": 2107, "name": "address", "nodeType": "ElementaryTypeName", "src": "851:7:15", @@ -2282,10 +2282,10 @@ }, { "constant": false, - "id": 2084, + "id": 2110, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 2112, + "scope": 2138, "src": "869:16:15", "stateVariable": false, "storageLocation": "default", @@ -2294,7 +2294,7 @@ "typeString": "uint256" }, "typeName": { - "id": 2083, + "id": 2109, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "869:7:15", @@ -2310,12 +2310,12 @@ "src": "820:66:15" }, "returnParameters": { - "id": 2086, + "id": 2112, "nodeType": "ParameterList", "parameters": [], "src": "896:0:15" }, - "scope": 2138, + "scope": 2164, "src": "795:323:15", "stateMutability": "nonpayable", "superFunction": null, @@ -2323,7 +2323,7 @@ }, { "body": { - "id": 2136, + "id": 2162, "nodeType": "Block", "src": "1218:144:15", "statements": [ @@ -2334,18 +2334,18 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 2123, + "id": 2149, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 2121, + "id": 2147, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2116, + "referencedDeclaration": 2142, "src": "1231:8:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2356,11 +2356,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 2122, + "id": 2148, "name": "ETHADDRESS", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2049, + "referencedDeclaration": 2075, "src": "1243:10:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2374,11 +2374,11 @@ } }, "falseBody": null, - "id": 2128, + "id": 2154, "nodeType": "IfStatement", "src": "1228:75:15", "trueBody": { - "id": 2127, + "id": 2153, "nodeType": "Block", "src": "1255:48:15", "statements": [ @@ -2387,18 +2387,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 2124, + "id": 2150, "name": "_target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2114, + "referencedDeclaration": 2140, "src": "1277:7:15", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 2125, + "id": 2151, "isConstant": false, "isLValue": false, "isPure": false, @@ -2412,8 +2412,8 @@ "typeString": "uint256" } }, - "functionReturnParameters": 2120, - "id": 2126, + "functionReturnParameters": 2146, + "id": 2152, "nodeType": "Return", "src": "1270:22:15" } @@ -2426,11 +2426,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2133, + "id": 2159, "name": "_target", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2114, + "referencedDeclaration": 2140, "src": "1347:7:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2450,11 +2450,11 @@ "arguments": [ { "argumentTypes": null, - "id": 2130, + "id": 2156, "name": "_reserve", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 2116, + "referencedDeclaration": 2142, "src": "1327:8:15", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2469,7 +2469,7 @@ "typeString": "address" } ], - "id": 2129, + "id": 2155, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -2480,7 +2480,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 2131, + "id": 2157, "isConstant": false, "isLValue": false, "isPure": false, @@ -2494,7 +2494,7 @@ "typeString": "contract IERC20" } }, - "id": 2132, + "id": 2158, "isConstant": false, "isLValue": false, "isPure": false, @@ -2508,7 +2508,7 @@ "typeString": "function (address) view external returns (uint256)" } }, - "id": 2134, + "id": 2160, "isConstant": false, "isLValue": false, "isPure": false, @@ -2522,30 +2522,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 2120, - "id": 2135, + "functionReturnParameters": 2146, + "id": 2161, "nodeType": "Return", "src": "1313:42:15" } ] }, "documentation": null, - "id": 2137, + "id": 2163, "implemented": true, "kind": "function", "modifiers": [], "name": "getBalanceInternal", "nodeType": "FunctionDefinition", "parameters": { - "id": 2117, + "id": 2143, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2114, + "id": 2140, "name": "_target", "nodeType": "VariableDeclaration", - "scope": 2137, + "scope": 2163, "src": "1152:15:15", "stateVariable": false, "storageLocation": "default", @@ -2554,7 +2554,7 @@ "typeString": "address" }, "typeName": { - "id": 2113, + "id": 2139, "name": "address", "nodeType": "ElementaryTypeName", "src": "1152:7:15", @@ -2569,10 +2569,10 @@ }, { "constant": false, - "id": 2116, + "id": 2142, "name": "_reserve", "nodeType": "VariableDeclaration", - "scope": 2137, + "scope": 2163, "src": "1169:16:15", "stateVariable": false, "storageLocation": "default", @@ -2581,7 +2581,7 @@ "typeString": "address" }, "typeName": { - "id": 2115, + "id": 2141, "name": "address", "nodeType": "ElementaryTypeName", "src": "1169:7:15", @@ -2598,15 +2598,15 @@ "src": "1151:35:15" }, "returnParameters": { - "id": 2120, + "id": 2146, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 2119, + "id": 2145, "name": "", "nodeType": "VariableDeclaration", - "scope": 2137, + "scope": 2163, "src": "1209:7:15", "stateVariable": false, "storageLocation": "default", @@ -2615,7 +2615,7 @@ "typeString": "uint256" }, "typeName": { - "id": 2118, + "id": 2144, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1209:7:15", @@ -2630,14 +2630,14 @@ ], "src": "1208:9:15" }, - "scope": 2138, + "scope": 2164, "src": "1124:238:15", "stateMutability": "view", "superFunction": null, "visibility": "internal" } ], - "scope": 2139, + "scope": 2165, "src": "227:1137:15" } ], @@ -2649,7 +2649,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.481Z", + "updatedAt": "2020-04-08T12:21:13.701Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/GemJoinLike.json b/packages/smart-contracts/artifacts/GemJoinLike.json index 024c52f..e9705ea 100644 --- a/packages/smart-contracts/artifacts/GemJoinLike.json +++ b/packages/smart-contracts/artifacts/GemJoinLike.json @@ -83,35 +83,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -123,9 +123,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -137,9 +137,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -147,22 +147,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -171,7 +171,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -186,10 +186,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -198,7 +198,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -214,12 +214,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -228,22 +228,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -252,7 +252,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -267,10 +267,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -279,7 +279,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -295,12 +295,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -309,22 +309,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -333,7 +333,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -348,10 +348,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -360,7 +360,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -375,10 +375,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -387,7 +387,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -403,12 +403,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -417,25 +417,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -444,22 +444,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -468,7 +468,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -484,19 +484,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -505,9 +505,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -515,22 +515,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -539,7 +539,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -554,10 +554,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -566,7 +566,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -580,10 +580,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -592,7 +592,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -609,15 +609,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -626,7 +626,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -641,7 +641,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -650,22 +650,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -674,7 +674,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -690,15 +690,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -707,7 +707,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -722,7 +722,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -731,22 +731,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -755,7 +755,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -771,15 +771,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -788,7 +788,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -804,7 +804,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -813,22 +813,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -837,7 +837,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -853,15 +853,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -870,7 +870,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -886,7 +886,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -895,28 +895,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -925,7 +925,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -941,7 +941,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -950,22 +950,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -974,7 +974,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -988,10 +988,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -1000,7 +1000,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -1017,15 +1017,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -1034,7 +1034,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -1049,7 +1049,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1058,22 +1058,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -1082,7 +1082,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -1096,10 +1096,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -1108,7 +1108,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -1125,12 +1125,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1139,22 +1139,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -1163,7 +1163,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -1177,10 +1177,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -1189,7 +1189,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -1204,10 +1204,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -1216,7 +1216,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -1232,12 +1232,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1246,22 +1246,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -1270,7 +1270,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -1285,10 +1285,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -1297,7 +1297,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -1313,12 +1313,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1327,22 +1327,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -1351,7 +1351,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -1365,10 +1365,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -1377,7 +1377,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -1391,10 +1391,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -1403,7 +1403,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -1419,12 +1419,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1433,22 +1433,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -1457,7 +1457,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -1471,10 +1471,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -1483,7 +1483,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -1498,10 +1498,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -1510,7 +1510,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -1526,12 +1526,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1540,22 +1540,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -1564,7 +1564,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -1578,10 +1578,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -1590,7 +1590,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -1605,10 +1605,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -1617,7 +1617,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -1633,12 +1633,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1647,22 +1647,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -1671,7 +1671,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -1686,10 +1686,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -1698,7 +1698,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -1712,10 +1712,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -1724,7 +1724,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -1739,10 +1739,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -1751,7 +1751,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -1767,12 +1767,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1781,22 +1781,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -1805,7 +1805,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -1819,10 +1819,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -1831,7 +1831,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -1848,12 +1848,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1862,22 +1862,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -1886,7 +1886,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -1901,10 +1901,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -1913,7 +1913,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -1929,12 +1929,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1943,22 +1943,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -1967,7 +1967,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -1981,10 +1981,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -1993,7 +1993,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -2009,19 +2009,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -2030,9 +2030,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -2040,22 +2040,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -2064,7 +2064,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -2079,10 +2079,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -2091,7 +2091,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -2108,15 +2108,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -2125,7 +2125,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -2140,7 +2140,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -2149,22 +2149,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -2173,7 +2173,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -2189,15 +2189,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -2206,7 +2206,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -2220,10 +2220,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -2232,7 +2232,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -2246,10 +2246,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -2258,7 +2258,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -2272,10 +2272,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -2284,7 +2284,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -2298,10 +2298,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -2310,7 +2310,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -2325,7 +2325,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -2334,22 +2334,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -2358,7 +2358,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -2375,15 +2375,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -2392,7 +2392,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -2407,7 +2407,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -2416,22 +2416,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -2440,7 +2440,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -2454,10 +2454,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -2466,7 +2466,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -2483,15 +2483,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -2500,7 +2500,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -2514,10 +2514,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -2526,7 +2526,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -2541,7 +2541,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -2550,22 +2550,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -2574,7 +2574,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -2588,10 +2588,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -2600,7 +2600,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -2615,10 +2615,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -2627,7 +2627,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -2642,10 +2642,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -2654,7 +2654,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -2669,10 +2669,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -2681,7 +2681,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -2695,10 +2695,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -2707,7 +2707,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -2723,12 +2723,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2737,22 +2737,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -2761,7 +2761,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -2778,12 +2778,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2792,22 +2792,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -2816,7 +2816,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -2831,10 +2831,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -2843,7 +2843,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -2858,10 +2858,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -2870,7 +2870,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -2886,19 +2886,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -2907,9 +2907,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -2917,28 +2917,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -2947,7 +2947,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -2962,7 +2962,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2971,44 +2971,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3018,7 +3018,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3027,22 +3027,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -3051,7 +3051,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -3066,10 +3066,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -3078,7 +3078,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -3094,12 +3094,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -3108,22 +3108,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -3132,7 +3132,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -3147,10 +3147,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -3159,7 +3159,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -3175,19 +3175,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -3196,9 +3196,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -3206,44 +3206,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -3253,7 +3253,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3262,44 +3262,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3309,7 +3309,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3318,22 +3318,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -3342,7 +3342,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -3357,10 +3357,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -3369,7 +3369,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -3385,12 +3385,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -3399,22 +3399,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -3423,7 +3423,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -3438,10 +3438,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -3450,7 +3450,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -3466,19 +3466,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -3487,9 +3487,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -3497,22 +3497,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -3521,7 +3521,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -3537,15 +3537,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -3554,7 +3554,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -3569,14 +3569,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -3585,19 +3585,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -3606,7 +3606,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -3621,7 +3621,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -3629,7 +3629,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -3649,7 +3649,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -3674,7 +3674,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -3688,7 +3688,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -3699,18 +3699,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3722,7 +3722,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -3751,7 +3751,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -3762,7 +3762,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -3772,18 +3772,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3798,18 +3798,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3820,11 +3820,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3844,7 +3844,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -3861,11 +3861,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3882,11 +3882,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3908,7 +3908,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -3935,21 +3935,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -3963,29 +3963,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -3994,7 +3994,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -4008,10 +4008,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -4020,7 +4020,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -4036,15 +4036,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -4053,7 +4053,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -4068,7 +4068,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -4076,7 +4076,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -4086,11 +4086,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4099,11 +4099,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4132,11 +4132,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4151,18 +4151,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -4172,25 +4172,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -4200,25 +4200,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -4232,7 +4232,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -4242,11 +4242,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4255,11 +4255,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4283,11 +4283,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4302,18 +4302,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -4323,25 +4323,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -4355,29 +4355,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -4386,7 +4386,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -4401,10 +4401,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -4413,7 +4413,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -4428,10 +4428,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -4440,7 +4440,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -4456,19 +4456,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -4477,38 +4477,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -4522,7 +4522,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -4532,18 +4532,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4558,18 +4558,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4580,11 +4580,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4604,7 +4604,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4621,11 +4621,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4641,7 +4641,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -4668,21 +4668,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -4696,29 +4696,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -4727,7 +4727,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -4741,10 +4741,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -4753,7 +4753,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -4769,15 +4769,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -4786,7 +4786,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -4801,7 +4801,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -4809,25 +4809,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -4841,11 +4841,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4860,7 +4860,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -4873,7 +4873,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -4893,7 +4893,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -4907,18 +4907,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -4930,7 +4930,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -4954,7 +4954,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -4981,21 +4981,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -5009,29 +5009,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -5040,7 +5040,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -5056,15 +5056,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -5073,7 +5073,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -5088,7 +5088,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -5096,25 +5096,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5128,11 +5128,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5145,7 +5145,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -5153,7 +5153,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -5173,7 +5173,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -5206,18 +5206,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -5237,29 +5237,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -5268,7 +5268,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -5284,15 +5284,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -5301,7 +5301,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -5316,7 +5316,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -5324,25 +5324,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5356,11 +5356,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5373,7 +5373,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -5381,7 +5381,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -5407,7 +5407,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -5415,7 +5415,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -5442,11 +5442,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5461,18 +5461,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -5482,25 +5482,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -5521,7 +5521,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5552,18 +5552,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -5583,29 +5583,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -5614,7 +5614,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -5629,10 +5629,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -5641,7 +5641,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -5657,15 +5657,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -5674,7 +5674,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -5689,7 +5689,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -5697,25 +5697,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5730,18 +5730,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5759,7 +5759,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -5767,7 +5767,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -5793,7 +5793,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -5801,7 +5801,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -5828,11 +5828,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5847,18 +5847,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -5868,25 +5868,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -5907,7 +5907,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5927,7 +5927,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5952,29 +5952,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -5983,7 +5983,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -5998,10 +5998,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -6010,7 +6010,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -6026,15 +6026,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -6043,7 +6043,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -6058,7 +6058,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -6066,21 +6066,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -6089,7 +6089,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -6102,17 +6102,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6132,11 +6132,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6151,18 +6151,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -6172,25 +6172,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -6209,15 +6209,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -6226,7 +6226,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -6239,17 +6239,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6269,11 +6269,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6288,18 +6288,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -6309,25 +6309,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -6351,18 +6351,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6376,11 +6376,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6389,11 +6389,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6412,18 +6412,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -6444,29 +6444,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6484,7 +6484,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -6497,11 +6497,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6510,11 +6510,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6533,18 +6533,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -6560,11 +6560,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6583,18 +6583,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -6612,11 +6612,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6637,18 +6637,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -6668,25 +6668,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6703,7 +6703,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -6716,11 +6716,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6735,7 +6735,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -6748,7 +6748,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -6764,11 +6764,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6787,18 +6787,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -6819,11 +6819,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6832,11 +6832,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6855,18 +6855,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -6888,18 +6888,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -6912,18 +6912,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6935,7 +6935,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -6967,7 +6967,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -6977,22 +6977,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -7001,7 +7001,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -7016,10 +7016,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -7028,7 +7028,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -7043,10 +7043,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -7055,7 +7055,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -7070,10 +7070,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -7082,7 +7082,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -7096,10 +7096,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -7108,7 +7108,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -7124,15 +7124,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -7141,7 +7141,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -7156,7 +7156,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -7164,14 +7164,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -7180,10 +7180,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -7192,7 +7192,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -7208,17 +7208,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7238,11 +7238,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7257,18 +7257,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -7278,25 +7278,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -7316,16 +7316,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -7334,7 +7334,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -7347,17 +7347,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7366,11 +7366,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7394,11 +7394,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7413,18 +7413,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -7434,25 +7434,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -7471,15 +7471,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -7488,7 +7488,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -7501,17 +7501,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7531,11 +7531,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7550,18 +7550,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -7571,25 +7571,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -7608,15 +7608,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -7625,7 +7625,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -7638,7 +7638,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7647,11 +7647,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7660,11 +7660,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7683,18 +7683,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -7710,11 +7710,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7733,18 +7733,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -7764,18 +7764,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7790,18 +7790,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7812,11 +7812,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7835,25 +7835,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7870,7 +7870,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -7880,11 +7880,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7893,11 +7893,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7916,18 +7916,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -7945,11 +7945,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7964,18 +7964,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -7988,18 +7988,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8011,7 +8011,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -8043,29 +8043,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -8074,7 +8074,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -8089,10 +8089,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -8101,7 +8101,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -8116,10 +8116,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -8128,7 +8128,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -8143,10 +8143,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -8155,7 +8155,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -8171,15 +8171,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -8188,7 +8188,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -8203,7 +8203,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -8211,25 +8211,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8243,11 +8243,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -8256,11 +8256,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8284,11 +8284,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8303,18 +8303,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -8324,25 +8324,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -8362,29 +8362,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -8393,7 +8393,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -8408,10 +8408,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -8420,7 +8420,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -8434,10 +8434,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -8446,7 +8446,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -8463,15 +8463,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -8480,7 +8480,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -8495,7 +8495,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8503,7 +8503,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -8513,11 +8513,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8526,11 +8526,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8554,11 +8554,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8573,18 +8573,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -8594,25 +8594,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -8626,29 +8626,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -8657,7 +8657,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -8672,10 +8672,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -8684,7 +8684,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -8698,10 +8698,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -8710,7 +8710,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -8727,12 +8727,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8740,7 +8740,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -8750,11 +8750,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8763,11 +8763,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8776,11 +8776,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8808,11 +8808,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8827,18 +8827,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -8848,25 +8848,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -8880,29 +8880,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -8911,7 +8911,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -8926,10 +8926,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -8938,7 +8938,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -8952,10 +8952,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -8964,7 +8964,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -8979,10 +8979,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -8991,7 +8991,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -9007,12 +9007,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9020,7 +9020,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -9030,11 +9030,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9043,11 +9043,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9056,11 +9056,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9088,11 +9088,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9107,18 +9107,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -9128,25 +9128,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -9160,29 +9160,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -9191,7 +9191,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -9206,10 +9206,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -9218,7 +9218,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -9232,10 +9232,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -9244,7 +9244,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -9259,10 +9259,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -9271,7 +9271,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -9287,12 +9287,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9300,7 +9300,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -9310,11 +9310,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9323,11 +9323,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9336,11 +9336,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9368,11 +9368,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9387,18 +9387,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -9408,25 +9408,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -9440,29 +9440,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -9471,7 +9471,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -9486,10 +9486,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -9498,7 +9498,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -9512,10 +9512,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -9524,7 +9524,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -9538,10 +9538,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -9550,7 +9550,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -9566,12 +9566,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9579,21 +9579,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -9602,7 +9602,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -9616,7 +9616,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -9627,11 +9627,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9646,18 +9646,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -9667,25 +9667,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -9704,15 +9704,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -9721,7 +9721,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -9735,17 +9735,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9765,11 +9765,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9784,18 +9784,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -9805,25 +9805,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -9842,15 +9842,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -9859,7 +9859,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -9872,17 +9872,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9902,11 +9902,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9921,18 +9921,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -9942,25 +9942,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -9980,16 +9980,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -9998,7 +9998,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -10011,17 +10011,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10030,11 +10030,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10058,11 +10058,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10077,18 +10077,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -10098,25 +10098,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -10139,11 +10139,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10152,11 +10152,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10168,11 +10168,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10181,11 +10181,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10194,11 +10194,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10207,11 +10207,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10238,18 +10238,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -10279,18 +10279,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -10304,7 +10304,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -10314,11 +10314,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10327,11 +10327,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10340,7 +10340,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -10354,11 +10354,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10373,18 +10373,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -10405,7 +10405,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -10419,11 +10419,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10438,7 +10438,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -10451,7 +10451,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -10490,18 +10490,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -10515,7 +10515,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -10525,11 +10525,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10538,11 +10538,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10554,14 +10554,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10569,11 +10569,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -10586,7 +10586,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -10602,11 +10602,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10633,18 +10633,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -10658,7 +10658,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -10671,14 +10671,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10686,11 +10686,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -10703,7 +10703,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -10719,11 +10719,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10747,11 +10747,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10766,18 +10766,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -10787,25 +10787,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -10819,7 +10819,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -10829,11 +10829,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10858,11 +10858,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10877,18 +10877,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -10898,25 +10898,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -10926,25 +10926,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -10958,29 +10958,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -10989,7 +10989,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -11004,10 +11004,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -11016,7 +11016,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -11031,10 +11031,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -11043,7 +11043,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -11058,10 +11058,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -11070,7 +11070,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -11084,10 +11084,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -11096,7 +11096,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -11112,12 +11112,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -11125,21 +11125,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -11148,7 +11148,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -11162,7 +11162,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -11173,11 +11173,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11192,18 +11192,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -11213,25 +11213,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -11250,15 +11250,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -11267,7 +11267,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -11281,17 +11281,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11311,11 +11311,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11330,18 +11330,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -11351,25 +11351,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -11388,15 +11388,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -11405,7 +11405,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -11418,17 +11418,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11448,11 +11448,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11467,18 +11467,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -11488,25 +11488,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -11526,16 +11526,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -11544,7 +11544,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -11557,17 +11557,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11576,11 +11576,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11604,11 +11604,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11623,18 +11623,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -11644,25 +11644,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -11685,11 +11685,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11698,11 +11698,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11714,11 +11714,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11727,11 +11727,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11740,11 +11740,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11753,11 +11753,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11784,18 +11784,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -11825,18 +11825,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -11850,21 +11850,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -11873,7 +11873,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -11886,17 +11886,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11905,11 +11905,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11928,18 +11928,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -11962,11 +11962,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11975,11 +11975,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11988,7 +11988,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -12002,11 +12002,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12021,18 +12021,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -12053,7 +12053,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -12067,11 +12067,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12086,7 +12086,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -12099,7 +12099,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -12138,18 +12138,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -12163,7 +12163,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -12173,11 +12173,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12186,11 +12186,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12202,14 +12202,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12217,11 +12217,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -12234,7 +12234,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -12250,11 +12250,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12281,18 +12281,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -12306,7 +12306,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -12319,14 +12319,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12334,11 +12334,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -12351,7 +12351,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -12367,11 +12367,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12395,11 +12395,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12414,18 +12414,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -12435,25 +12435,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -12467,29 +12467,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -12498,7 +12498,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -12513,10 +12513,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -12525,7 +12525,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -12540,10 +12540,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -12552,7 +12552,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -12567,10 +12567,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -12579,7 +12579,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -12593,10 +12593,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -12605,7 +12605,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -12621,19 +12621,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -12643,35 +12643,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -12683,9 +12683,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -12697,9 +12697,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -12707,22 +12707,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -12731,7 +12731,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -12746,10 +12746,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -12758,7 +12758,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -12774,12 +12774,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12788,22 +12788,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -12812,7 +12812,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -12827,10 +12827,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -12839,7 +12839,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -12855,12 +12855,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12869,22 +12869,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -12893,7 +12893,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -12908,10 +12908,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -12920,7 +12920,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -12935,10 +12935,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -12947,7 +12947,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -12963,12 +12963,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12977,25 +12977,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -13004,22 +13004,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -13028,7 +13028,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -13044,19 +13044,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -13065,9 +13065,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -13075,22 +13075,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -13099,7 +13099,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -13114,10 +13114,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -13126,7 +13126,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -13140,10 +13140,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -13152,7 +13152,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -13169,15 +13169,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -13186,7 +13186,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -13201,7 +13201,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -13210,22 +13210,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -13234,7 +13234,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -13250,15 +13250,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -13267,7 +13267,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -13282,7 +13282,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -13291,22 +13291,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -13315,7 +13315,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -13331,15 +13331,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -13348,7 +13348,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -13364,7 +13364,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -13373,22 +13373,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -13397,7 +13397,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -13413,15 +13413,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -13430,7 +13430,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -13446,7 +13446,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -13455,28 +13455,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -13485,7 +13485,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -13501,7 +13501,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -13510,22 +13510,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -13534,7 +13534,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -13548,10 +13548,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -13560,7 +13560,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -13577,15 +13577,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -13594,7 +13594,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -13609,7 +13609,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13618,22 +13618,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -13642,7 +13642,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -13656,10 +13656,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -13668,7 +13668,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -13685,12 +13685,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13699,22 +13699,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -13723,7 +13723,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -13737,10 +13737,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -13749,7 +13749,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -13764,10 +13764,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -13776,7 +13776,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -13792,12 +13792,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13806,22 +13806,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -13830,7 +13830,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -13845,10 +13845,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -13857,7 +13857,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -13873,12 +13873,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13887,22 +13887,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -13911,7 +13911,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -13925,10 +13925,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -13937,7 +13937,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -13951,10 +13951,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -13963,7 +13963,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -13979,12 +13979,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13993,22 +13993,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -14017,7 +14017,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -14031,10 +14031,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -14043,7 +14043,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -14058,10 +14058,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -14070,7 +14070,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -14086,12 +14086,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14100,22 +14100,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -14124,7 +14124,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -14138,10 +14138,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -14150,7 +14150,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -14165,10 +14165,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -14177,7 +14177,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -14193,12 +14193,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14207,22 +14207,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -14231,7 +14231,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -14246,10 +14246,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -14258,7 +14258,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -14272,10 +14272,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -14284,7 +14284,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -14299,10 +14299,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -14311,7 +14311,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -14327,12 +14327,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14341,22 +14341,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -14365,7 +14365,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -14379,10 +14379,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -14391,7 +14391,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -14408,12 +14408,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14422,22 +14422,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -14446,7 +14446,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -14461,10 +14461,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -14473,7 +14473,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -14489,12 +14489,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14503,22 +14503,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -14527,7 +14527,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -14541,10 +14541,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -14553,7 +14553,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -14569,19 +14569,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -14590,9 +14590,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -14600,22 +14600,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -14624,7 +14624,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -14639,10 +14639,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -14651,7 +14651,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -14668,15 +14668,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -14685,7 +14685,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -14700,7 +14700,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -14709,22 +14709,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -14733,7 +14733,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -14749,15 +14749,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -14766,7 +14766,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -14780,10 +14780,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -14792,7 +14792,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -14806,10 +14806,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -14818,7 +14818,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -14832,10 +14832,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -14844,7 +14844,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -14858,10 +14858,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -14870,7 +14870,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -14885,7 +14885,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -14894,22 +14894,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -14918,7 +14918,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -14935,15 +14935,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -14952,7 +14952,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -14967,7 +14967,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -14976,22 +14976,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -15000,7 +15000,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -15014,10 +15014,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -15026,7 +15026,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -15043,15 +15043,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -15060,7 +15060,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -15074,10 +15074,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -15086,7 +15086,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -15101,7 +15101,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -15110,22 +15110,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -15134,7 +15134,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -15148,10 +15148,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -15160,7 +15160,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -15175,10 +15175,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -15187,7 +15187,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -15202,10 +15202,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -15214,7 +15214,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -15229,10 +15229,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -15241,7 +15241,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -15255,10 +15255,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -15267,7 +15267,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -15283,12 +15283,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15297,22 +15297,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -15321,7 +15321,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -15338,12 +15338,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15352,22 +15352,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -15376,7 +15376,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -15391,10 +15391,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -15403,7 +15403,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -15418,10 +15418,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -15430,7 +15430,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -15446,19 +15446,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -15467,9 +15467,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -15477,28 +15477,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -15507,7 +15507,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -15522,7 +15522,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15531,44 +15531,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15578,7 +15578,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15587,22 +15587,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -15611,7 +15611,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -15626,10 +15626,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -15638,7 +15638,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -15654,12 +15654,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -15668,22 +15668,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -15692,7 +15692,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -15707,10 +15707,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -15719,7 +15719,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -15735,19 +15735,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -15756,9 +15756,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -15766,44 +15766,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -15813,7 +15813,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15822,44 +15822,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15869,7 +15869,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15878,22 +15878,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -15902,7 +15902,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -15917,10 +15917,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -15929,7 +15929,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -15945,12 +15945,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -15959,22 +15959,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -15983,7 +15983,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -15998,10 +15998,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -16010,7 +16010,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -16026,19 +16026,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -16047,9 +16047,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -16057,22 +16057,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -16081,7 +16081,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -16097,15 +16097,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -16114,7 +16114,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -16129,14 +16129,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -16145,19 +16145,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -16166,7 +16166,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -16181,7 +16181,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -16189,7 +16189,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -16209,7 +16209,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -16234,7 +16234,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -16248,7 +16248,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -16259,18 +16259,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16282,7 +16282,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -16311,7 +16311,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -16322,7 +16322,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -16332,18 +16332,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16358,18 +16358,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16380,11 +16380,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16404,7 +16404,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -16421,11 +16421,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16442,11 +16442,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16468,7 +16468,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -16495,21 +16495,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -16523,29 +16523,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -16554,7 +16554,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -16568,10 +16568,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -16580,7 +16580,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -16596,15 +16596,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -16613,7 +16613,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -16628,7 +16628,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -16636,7 +16636,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -16646,11 +16646,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16659,11 +16659,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16692,11 +16692,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16711,18 +16711,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -16732,25 +16732,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -16760,25 +16760,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -16792,7 +16792,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -16802,11 +16802,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16815,11 +16815,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16843,11 +16843,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16862,18 +16862,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -16883,25 +16883,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -16915,29 +16915,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -16946,7 +16946,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -16961,10 +16961,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -16973,7 +16973,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -16988,10 +16988,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -17000,7 +17000,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -17016,19 +17016,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -17037,38 +17037,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -17082,7 +17082,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -17092,18 +17092,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17118,18 +17118,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17140,11 +17140,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17164,7 +17164,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -17181,11 +17181,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17201,7 +17201,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -17228,21 +17228,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -17256,29 +17256,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -17287,7 +17287,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -17301,10 +17301,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -17313,7 +17313,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -17329,15 +17329,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -17346,7 +17346,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -17361,7 +17361,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -17369,25 +17369,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17401,11 +17401,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17420,7 +17420,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -17433,7 +17433,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -17453,7 +17453,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -17467,18 +17467,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17490,7 +17490,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -17514,7 +17514,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -17541,21 +17541,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -17569,29 +17569,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -17600,7 +17600,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -17616,15 +17616,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -17633,7 +17633,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -17648,7 +17648,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -17656,25 +17656,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17688,11 +17688,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17705,7 +17705,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -17713,7 +17713,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -17733,7 +17733,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -17766,18 +17766,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -17797,29 +17797,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -17828,7 +17828,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -17844,15 +17844,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -17861,7 +17861,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -17876,7 +17876,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -17884,25 +17884,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17916,11 +17916,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17933,7 +17933,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -17941,7 +17941,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -17967,7 +17967,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -17975,7 +17975,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -18002,11 +18002,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18021,18 +18021,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -18042,25 +18042,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -18081,7 +18081,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18112,18 +18112,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -18143,29 +18143,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -18174,7 +18174,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -18189,10 +18189,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -18201,7 +18201,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -18217,15 +18217,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -18234,7 +18234,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -18249,7 +18249,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18257,25 +18257,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18290,18 +18290,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18319,7 +18319,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -18327,7 +18327,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -18353,7 +18353,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -18361,7 +18361,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -18388,11 +18388,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18407,18 +18407,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -18428,25 +18428,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -18467,7 +18467,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18487,7 +18487,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18512,29 +18512,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -18543,7 +18543,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -18558,10 +18558,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -18570,7 +18570,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -18586,15 +18586,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -18603,7 +18603,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -18618,7 +18618,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18626,21 +18626,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -18649,7 +18649,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -18662,17 +18662,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -18692,11 +18692,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18711,18 +18711,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -18732,25 +18732,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -18769,15 +18769,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -18786,7 +18786,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -18799,17 +18799,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18829,11 +18829,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18848,18 +18848,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -18869,25 +18869,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -18911,18 +18911,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18936,11 +18936,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18949,11 +18949,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18972,18 +18972,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -19004,29 +19004,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19044,7 +19044,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -19057,11 +19057,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19070,11 +19070,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19093,18 +19093,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -19120,11 +19120,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19143,18 +19143,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -19172,11 +19172,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19197,18 +19197,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -19228,25 +19228,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19263,7 +19263,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -19276,11 +19276,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19295,7 +19295,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -19308,7 +19308,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -19324,11 +19324,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19347,18 +19347,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -19379,11 +19379,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19392,11 +19392,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19415,18 +19415,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -19448,18 +19448,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -19472,18 +19472,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19495,7 +19495,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -19527,7 +19527,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -19537,22 +19537,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -19561,7 +19561,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -19576,10 +19576,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -19588,7 +19588,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -19603,10 +19603,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -19615,7 +19615,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -19630,10 +19630,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -19642,7 +19642,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -19656,10 +19656,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -19668,7 +19668,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -19684,15 +19684,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -19701,7 +19701,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -19716,7 +19716,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -19724,14 +19724,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -19740,10 +19740,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -19752,7 +19752,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -19768,17 +19768,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -19798,11 +19798,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19817,18 +19817,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -19838,25 +19838,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -19876,16 +19876,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -19894,7 +19894,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -19907,17 +19907,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -19926,11 +19926,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19954,11 +19954,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19973,18 +19973,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -19994,25 +19994,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -20031,15 +20031,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -20048,7 +20048,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -20061,17 +20061,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20091,11 +20091,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20110,18 +20110,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -20131,25 +20131,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -20168,15 +20168,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -20185,7 +20185,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -20198,7 +20198,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -20207,11 +20207,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20220,11 +20220,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20243,18 +20243,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -20270,11 +20270,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20293,18 +20293,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -20324,18 +20324,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20350,18 +20350,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20372,11 +20372,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20395,25 +20395,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20430,7 +20430,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -20440,11 +20440,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20453,11 +20453,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20476,18 +20476,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -20505,11 +20505,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20524,18 +20524,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -20548,18 +20548,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20571,7 +20571,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -20603,29 +20603,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -20634,7 +20634,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -20649,10 +20649,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -20661,7 +20661,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -20676,10 +20676,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -20688,7 +20688,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -20703,10 +20703,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -20715,7 +20715,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -20731,15 +20731,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -20748,7 +20748,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -20763,7 +20763,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -20771,25 +20771,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20803,11 +20803,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -20816,11 +20816,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20844,11 +20844,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20863,18 +20863,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -20884,25 +20884,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -20922,29 +20922,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -20953,7 +20953,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -20968,10 +20968,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -20980,7 +20980,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -20994,10 +20994,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -21006,7 +21006,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -21023,15 +21023,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -21040,7 +21040,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -21055,7 +21055,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21063,7 +21063,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -21073,11 +21073,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21086,11 +21086,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21114,11 +21114,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21133,18 +21133,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -21154,25 +21154,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -21186,29 +21186,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -21217,7 +21217,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -21232,10 +21232,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -21244,7 +21244,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -21258,10 +21258,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -21270,7 +21270,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -21287,12 +21287,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21300,7 +21300,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -21310,11 +21310,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21323,11 +21323,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21336,11 +21336,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21368,11 +21368,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21387,18 +21387,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -21408,25 +21408,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -21440,29 +21440,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -21471,7 +21471,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -21486,10 +21486,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -21498,7 +21498,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -21512,10 +21512,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -21524,7 +21524,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -21539,10 +21539,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -21551,7 +21551,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -21567,12 +21567,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21580,7 +21580,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -21590,11 +21590,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21603,11 +21603,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21616,11 +21616,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21648,11 +21648,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21667,18 +21667,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -21688,25 +21688,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -21720,29 +21720,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -21751,7 +21751,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -21766,10 +21766,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -21778,7 +21778,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -21792,10 +21792,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -21804,7 +21804,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -21819,10 +21819,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -21831,7 +21831,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -21847,12 +21847,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21860,7 +21860,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -21870,11 +21870,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21883,11 +21883,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -21896,11 +21896,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -21928,11 +21928,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21947,18 +21947,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -21968,25 +21968,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -22000,29 +22000,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -22031,7 +22031,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -22046,10 +22046,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -22058,7 +22058,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -22072,10 +22072,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -22084,7 +22084,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -22098,10 +22098,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -22110,7 +22110,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -22126,12 +22126,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -22139,21 +22139,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -22162,7 +22162,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -22176,7 +22176,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -22187,11 +22187,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22206,18 +22206,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -22227,25 +22227,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -22264,15 +22264,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -22281,7 +22281,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -22295,17 +22295,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22325,11 +22325,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22344,18 +22344,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -22365,25 +22365,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -22402,15 +22402,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -22419,7 +22419,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -22432,17 +22432,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22462,11 +22462,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22481,18 +22481,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -22502,25 +22502,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -22540,16 +22540,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -22558,7 +22558,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -22571,17 +22571,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22590,11 +22590,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22618,11 +22618,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22637,18 +22637,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -22658,25 +22658,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -22699,11 +22699,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22712,11 +22712,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22728,11 +22728,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22741,11 +22741,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22754,11 +22754,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22767,11 +22767,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22798,18 +22798,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -22839,18 +22839,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -22864,7 +22864,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -22874,11 +22874,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22887,11 +22887,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22900,7 +22900,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -22914,11 +22914,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22933,18 +22933,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -22965,7 +22965,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -22979,11 +22979,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22998,7 +22998,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -23011,7 +23011,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -23050,18 +23050,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -23075,7 +23075,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -23085,11 +23085,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23098,11 +23098,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23114,14 +23114,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23129,11 +23129,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -23146,7 +23146,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -23162,11 +23162,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23193,18 +23193,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -23218,7 +23218,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -23231,14 +23231,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23246,11 +23246,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -23263,7 +23263,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -23279,11 +23279,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23307,11 +23307,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23326,18 +23326,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -23347,25 +23347,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -23379,7 +23379,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -23389,11 +23389,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23418,11 +23418,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23437,18 +23437,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -23458,25 +23458,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -23486,25 +23486,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -23518,29 +23518,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -23549,7 +23549,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -23564,10 +23564,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -23576,7 +23576,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -23591,10 +23591,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -23603,7 +23603,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -23618,10 +23618,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -23630,7 +23630,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -23644,10 +23644,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -23656,7 +23656,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -23672,12 +23672,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -23685,21 +23685,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -23708,7 +23708,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -23722,7 +23722,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -23733,11 +23733,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23752,18 +23752,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -23773,25 +23773,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -23810,15 +23810,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -23827,7 +23827,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -23841,17 +23841,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23871,11 +23871,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23890,18 +23890,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -23911,25 +23911,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -23948,15 +23948,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -23965,7 +23965,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -23978,17 +23978,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24008,11 +24008,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24027,18 +24027,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -24048,25 +24048,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -24086,16 +24086,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -24104,7 +24104,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -24117,17 +24117,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24136,11 +24136,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24164,11 +24164,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24183,18 +24183,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -24204,25 +24204,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -24245,11 +24245,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24258,11 +24258,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24274,11 +24274,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24287,11 +24287,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24300,11 +24300,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24313,11 +24313,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24344,18 +24344,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -24385,18 +24385,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -24410,21 +24410,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -24433,7 +24433,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -24446,17 +24446,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24465,11 +24465,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24488,18 +24488,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -24522,11 +24522,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24535,11 +24535,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24548,7 +24548,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -24562,11 +24562,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24581,18 +24581,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -24613,7 +24613,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -24627,11 +24627,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24646,7 +24646,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -24659,7 +24659,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -24698,18 +24698,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -24723,7 +24723,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -24733,11 +24733,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24746,11 +24746,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24762,14 +24762,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -24777,11 +24777,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -24794,7 +24794,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -24810,11 +24810,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24841,18 +24841,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -24866,7 +24866,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -24879,14 +24879,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -24894,11 +24894,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -24911,7 +24911,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -24927,11 +24927,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24955,11 +24955,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24974,18 +24974,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -24995,25 +24995,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -25027,29 +25027,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -25058,7 +25058,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -25073,10 +25073,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -25085,7 +25085,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -25100,10 +25100,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -25112,7 +25112,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -25127,10 +25127,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -25139,7 +25139,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -25153,10 +25153,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -25165,7 +25165,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -25181,19 +25181,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -25205,7 +25205,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.566Z", + "updatedAt": "2020-04-08T12:21:13.814Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/GemLike.json b/packages/smart-contracts/artifacts/GemLike.json index a15fe21..3290013 100644 --- a/packages/smart-contracts/artifacts/GemLike.json +++ b/packages/smart-contracts/artifacts/GemLike.json @@ -102,35 +102,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -142,9 +142,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -156,9 +156,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -166,22 +166,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -190,7 +190,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -205,10 +205,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -217,7 +217,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -233,12 +233,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -247,22 +247,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -271,7 +271,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -286,10 +286,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -298,7 +298,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -314,12 +314,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -328,22 +328,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -352,7 +352,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -367,10 +367,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -379,7 +379,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -394,10 +394,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -406,7 +406,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -422,12 +422,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -436,25 +436,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -463,22 +463,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -487,7 +487,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -503,19 +503,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -524,9 +524,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -534,22 +534,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -558,7 +558,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -573,10 +573,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -585,7 +585,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -599,10 +599,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -611,7 +611,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -628,15 +628,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -645,7 +645,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -660,7 +660,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -669,22 +669,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -693,7 +693,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -709,15 +709,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -726,7 +726,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -741,7 +741,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -750,22 +750,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -774,7 +774,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -790,15 +790,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -807,7 +807,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -823,7 +823,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -832,22 +832,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -856,7 +856,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -872,15 +872,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -889,7 +889,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -905,7 +905,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -914,28 +914,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -944,7 +944,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -960,7 +960,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -969,22 +969,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -993,7 +993,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -1007,10 +1007,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -1019,7 +1019,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -1036,15 +1036,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -1053,7 +1053,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -1068,7 +1068,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1077,22 +1077,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -1101,7 +1101,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -1115,10 +1115,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -1127,7 +1127,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -1144,12 +1144,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1158,22 +1158,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -1182,7 +1182,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -1196,10 +1196,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -1208,7 +1208,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -1223,10 +1223,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -1235,7 +1235,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -1251,12 +1251,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1265,22 +1265,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -1289,7 +1289,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -1304,10 +1304,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -1316,7 +1316,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -1332,12 +1332,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1346,22 +1346,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -1370,7 +1370,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -1384,10 +1384,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -1396,7 +1396,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -1410,10 +1410,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -1422,7 +1422,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -1438,12 +1438,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1452,22 +1452,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -1476,7 +1476,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -1490,10 +1490,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -1502,7 +1502,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -1517,10 +1517,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -1529,7 +1529,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -1545,12 +1545,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1559,22 +1559,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -1583,7 +1583,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -1597,10 +1597,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -1609,7 +1609,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -1624,10 +1624,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -1636,7 +1636,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -1652,12 +1652,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1666,22 +1666,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -1690,7 +1690,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -1705,10 +1705,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -1717,7 +1717,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -1731,10 +1731,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -1743,7 +1743,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -1758,10 +1758,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -1770,7 +1770,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -1786,12 +1786,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1800,22 +1800,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -1824,7 +1824,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -1838,10 +1838,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -1850,7 +1850,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -1867,12 +1867,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1881,22 +1881,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -1905,7 +1905,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -1920,10 +1920,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -1932,7 +1932,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -1948,12 +1948,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1962,22 +1962,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -1986,7 +1986,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -2000,10 +2000,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -2012,7 +2012,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -2028,19 +2028,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -2049,9 +2049,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -2059,22 +2059,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -2083,7 +2083,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -2098,10 +2098,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -2110,7 +2110,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -2127,15 +2127,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -2144,7 +2144,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -2159,7 +2159,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -2168,22 +2168,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -2192,7 +2192,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -2208,15 +2208,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -2225,7 +2225,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -2239,10 +2239,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -2251,7 +2251,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -2265,10 +2265,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -2277,7 +2277,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -2291,10 +2291,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -2303,7 +2303,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -2317,10 +2317,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -2329,7 +2329,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -2344,7 +2344,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -2353,22 +2353,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -2377,7 +2377,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -2394,15 +2394,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -2411,7 +2411,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -2426,7 +2426,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -2435,22 +2435,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -2459,7 +2459,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -2473,10 +2473,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -2485,7 +2485,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -2502,15 +2502,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -2519,7 +2519,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -2533,10 +2533,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -2545,7 +2545,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -2560,7 +2560,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -2569,22 +2569,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -2593,7 +2593,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -2607,10 +2607,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -2619,7 +2619,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -2634,10 +2634,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -2646,7 +2646,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -2661,10 +2661,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -2673,7 +2673,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -2688,10 +2688,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -2700,7 +2700,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -2714,10 +2714,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -2726,7 +2726,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -2742,12 +2742,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2756,22 +2756,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -2780,7 +2780,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -2797,12 +2797,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2811,22 +2811,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -2835,7 +2835,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -2850,10 +2850,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -2862,7 +2862,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -2877,10 +2877,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -2889,7 +2889,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -2905,19 +2905,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -2926,9 +2926,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -2936,28 +2936,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -2966,7 +2966,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -2981,7 +2981,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2990,44 +2990,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3037,7 +3037,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3046,22 +3046,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -3070,7 +3070,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -3085,10 +3085,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -3097,7 +3097,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -3113,12 +3113,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -3127,22 +3127,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -3151,7 +3151,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -3166,10 +3166,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -3178,7 +3178,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -3194,19 +3194,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -3215,9 +3215,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -3225,44 +3225,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -3272,7 +3272,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3281,44 +3281,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3328,7 +3328,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3337,22 +3337,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -3361,7 +3361,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -3376,10 +3376,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -3388,7 +3388,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -3404,12 +3404,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -3418,22 +3418,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -3442,7 +3442,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -3457,10 +3457,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -3469,7 +3469,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -3485,19 +3485,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -3506,9 +3506,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -3516,22 +3516,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -3540,7 +3540,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -3556,15 +3556,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -3573,7 +3573,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -3588,14 +3588,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -3604,19 +3604,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -3625,7 +3625,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -3640,7 +3640,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -3648,7 +3648,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -3668,7 +3668,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -3693,7 +3693,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -3707,7 +3707,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -3718,18 +3718,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3741,7 +3741,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -3770,7 +3770,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -3781,7 +3781,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -3791,18 +3791,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3817,18 +3817,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3839,11 +3839,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3863,7 +3863,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -3880,11 +3880,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3901,11 +3901,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3927,7 +3927,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -3954,21 +3954,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -3982,29 +3982,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -4013,7 +4013,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -4027,10 +4027,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -4039,7 +4039,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -4055,15 +4055,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -4072,7 +4072,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -4087,7 +4087,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -4095,7 +4095,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -4105,11 +4105,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4118,11 +4118,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4151,11 +4151,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4170,18 +4170,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -4191,25 +4191,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -4219,25 +4219,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -4251,7 +4251,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -4261,11 +4261,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4274,11 +4274,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4302,11 +4302,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4321,18 +4321,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -4342,25 +4342,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -4374,29 +4374,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -4405,7 +4405,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -4420,10 +4420,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -4432,7 +4432,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -4447,10 +4447,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -4459,7 +4459,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -4475,19 +4475,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -4496,38 +4496,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -4541,7 +4541,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -4551,18 +4551,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4577,18 +4577,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4599,11 +4599,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4623,7 +4623,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4640,11 +4640,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4660,7 +4660,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -4687,21 +4687,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -4715,29 +4715,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -4746,7 +4746,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -4760,10 +4760,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -4772,7 +4772,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -4788,15 +4788,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -4805,7 +4805,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -4820,7 +4820,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -4828,25 +4828,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -4860,11 +4860,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4879,7 +4879,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -4892,7 +4892,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -4912,7 +4912,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -4926,18 +4926,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -4949,7 +4949,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -4973,7 +4973,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -5000,21 +5000,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -5028,29 +5028,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -5059,7 +5059,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -5075,15 +5075,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -5092,7 +5092,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -5107,7 +5107,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -5115,25 +5115,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5147,11 +5147,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5164,7 +5164,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -5172,7 +5172,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -5192,7 +5192,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -5225,18 +5225,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -5256,29 +5256,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -5287,7 +5287,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -5303,15 +5303,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -5320,7 +5320,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -5335,7 +5335,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -5343,25 +5343,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5375,11 +5375,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5392,7 +5392,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -5400,7 +5400,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -5426,7 +5426,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -5434,7 +5434,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -5461,11 +5461,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5480,18 +5480,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -5501,25 +5501,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -5540,7 +5540,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5571,18 +5571,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -5602,29 +5602,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -5633,7 +5633,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -5648,10 +5648,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -5660,7 +5660,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -5676,15 +5676,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -5693,7 +5693,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -5708,7 +5708,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -5716,25 +5716,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5749,18 +5749,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5778,7 +5778,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -5786,7 +5786,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -5812,7 +5812,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -5820,7 +5820,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -5847,11 +5847,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5866,18 +5866,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -5887,25 +5887,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -5926,7 +5926,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5946,7 +5946,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5971,29 +5971,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -6002,7 +6002,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -6017,10 +6017,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -6029,7 +6029,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -6045,15 +6045,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -6062,7 +6062,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -6077,7 +6077,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -6085,21 +6085,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -6108,7 +6108,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -6121,17 +6121,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6151,11 +6151,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6170,18 +6170,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -6191,25 +6191,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -6228,15 +6228,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -6245,7 +6245,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -6258,17 +6258,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6288,11 +6288,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6307,18 +6307,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -6328,25 +6328,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -6370,18 +6370,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6395,11 +6395,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6408,11 +6408,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6431,18 +6431,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -6463,29 +6463,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6503,7 +6503,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -6516,11 +6516,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6529,11 +6529,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6552,18 +6552,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -6579,11 +6579,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6602,18 +6602,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -6631,11 +6631,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6656,18 +6656,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -6687,25 +6687,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6722,7 +6722,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -6735,11 +6735,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6754,7 +6754,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -6767,7 +6767,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -6783,11 +6783,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6806,18 +6806,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -6838,11 +6838,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6851,11 +6851,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6874,18 +6874,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -6907,18 +6907,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -6931,18 +6931,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6954,7 +6954,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -6986,7 +6986,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -6996,22 +6996,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -7020,7 +7020,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -7035,10 +7035,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -7047,7 +7047,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -7062,10 +7062,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -7074,7 +7074,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -7089,10 +7089,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -7101,7 +7101,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -7115,10 +7115,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -7127,7 +7127,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -7143,15 +7143,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -7160,7 +7160,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -7175,7 +7175,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -7183,14 +7183,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -7199,10 +7199,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -7211,7 +7211,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -7227,17 +7227,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7257,11 +7257,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7276,18 +7276,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -7297,25 +7297,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -7335,16 +7335,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -7353,7 +7353,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -7366,17 +7366,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7385,11 +7385,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7413,11 +7413,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7432,18 +7432,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -7453,25 +7453,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -7490,15 +7490,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -7507,7 +7507,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -7520,17 +7520,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7550,11 +7550,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7569,18 +7569,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -7590,25 +7590,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -7627,15 +7627,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -7644,7 +7644,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -7657,7 +7657,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7666,11 +7666,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7679,11 +7679,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7702,18 +7702,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -7729,11 +7729,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7752,18 +7752,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -7783,18 +7783,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7809,18 +7809,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7831,11 +7831,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7854,25 +7854,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7889,7 +7889,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -7899,11 +7899,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7912,11 +7912,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7935,18 +7935,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -7964,11 +7964,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7983,18 +7983,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -8007,18 +8007,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8030,7 +8030,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -8062,29 +8062,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -8093,7 +8093,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -8108,10 +8108,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -8120,7 +8120,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -8135,10 +8135,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -8147,7 +8147,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -8162,10 +8162,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -8174,7 +8174,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -8190,15 +8190,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -8207,7 +8207,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -8222,7 +8222,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -8230,25 +8230,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8262,11 +8262,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -8275,11 +8275,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8303,11 +8303,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8322,18 +8322,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -8343,25 +8343,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -8381,29 +8381,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -8412,7 +8412,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -8427,10 +8427,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -8439,7 +8439,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -8453,10 +8453,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -8465,7 +8465,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -8482,15 +8482,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -8499,7 +8499,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -8514,7 +8514,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8522,7 +8522,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -8532,11 +8532,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8545,11 +8545,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8573,11 +8573,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8592,18 +8592,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -8613,25 +8613,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -8645,29 +8645,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -8676,7 +8676,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -8691,10 +8691,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -8703,7 +8703,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -8717,10 +8717,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -8729,7 +8729,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -8746,12 +8746,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8759,7 +8759,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -8769,11 +8769,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8782,11 +8782,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8795,11 +8795,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8827,11 +8827,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8846,18 +8846,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -8867,25 +8867,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -8899,29 +8899,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -8930,7 +8930,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -8945,10 +8945,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -8957,7 +8957,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -8971,10 +8971,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -8983,7 +8983,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -8998,10 +8998,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -9010,7 +9010,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -9026,12 +9026,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9039,7 +9039,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -9049,11 +9049,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9062,11 +9062,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9075,11 +9075,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9107,11 +9107,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9126,18 +9126,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -9147,25 +9147,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -9179,29 +9179,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -9210,7 +9210,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -9225,10 +9225,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -9237,7 +9237,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -9251,10 +9251,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -9263,7 +9263,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -9278,10 +9278,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -9290,7 +9290,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -9306,12 +9306,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9319,7 +9319,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -9329,11 +9329,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9342,11 +9342,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9355,11 +9355,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9387,11 +9387,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9406,18 +9406,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -9427,25 +9427,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -9459,29 +9459,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -9490,7 +9490,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -9505,10 +9505,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -9517,7 +9517,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -9531,10 +9531,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -9543,7 +9543,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -9557,10 +9557,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -9569,7 +9569,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -9585,12 +9585,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9598,21 +9598,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -9621,7 +9621,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -9635,7 +9635,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -9646,11 +9646,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9665,18 +9665,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -9686,25 +9686,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -9723,15 +9723,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -9740,7 +9740,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -9754,17 +9754,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9784,11 +9784,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9803,18 +9803,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -9824,25 +9824,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -9861,15 +9861,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -9878,7 +9878,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -9891,17 +9891,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9921,11 +9921,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9940,18 +9940,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -9961,25 +9961,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -9999,16 +9999,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -10017,7 +10017,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -10030,17 +10030,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10049,11 +10049,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10077,11 +10077,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10096,18 +10096,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -10117,25 +10117,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -10158,11 +10158,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10171,11 +10171,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10187,11 +10187,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10200,11 +10200,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10213,11 +10213,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10226,11 +10226,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10257,18 +10257,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -10298,18 +10298,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -10323,7 +10323,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -10333,11 +10333,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10346,11 +10346,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10359,7 +10359,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -10373,11 +10373,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10392,18 +10392,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -10424,7 +10424,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -10438,11 +10438,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10457,7 +10457,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -10470,7 +10470,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -10509,18 +10509,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -10534,7 +10534,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -10544,11 +10544,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10557,11 +10557,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10573,14 +10573,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10588,11 +10588,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -10605,7 +10605,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -10621,11 +10621,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10652,18 +10652,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -10677,7 +10677,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -10690,14 +10690,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10705,11 +10705,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -10722,7 +10722,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -10738,11 +10738,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10766,11 +10766,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10785,18 +10785,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -10806,25 +10806,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -10838,7 +10838,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -10848,11 +10848,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10877,11 +10877,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10896,18 +10896,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -10917,25 +10917,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -10945,25 +10945,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -10977,29 +10977,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -11008,7 +11008,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -11023,10 +11023,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -11035,7 +11035,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -11050,10 +11050,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -11062,7 +11062,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -11077,10 +11077,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -11089,7 +11089,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -11103,10 +11103,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -11115,7 +11115,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -11131,12 +11131,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -11144,21 +11144,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -11167,7 +11167,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -11181,7 +11181,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -11192,11 +11192,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11211,18 +11211,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -11232,25 +11232,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -11269,15 +11269,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -11286,7 +11286,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -11300,17 +11300,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11330,11 +11330,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11349,18 +11349,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -11370,25 +11370,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -11407,15 +11407,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -11424,7 +11424,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -11437,17 +11437,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11467,11 +11467,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11486,18 +11486,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -11507,25 +11507,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -11545,16 +11545,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -11563,7 +11563,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -11576,17 +11576,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11595,11 +11595,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11623,11 +11623,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11642,18 +11642,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -11663,25 +11663,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -11704,11 +11704,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11717,11 +11717,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11733,11 +11733,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11746,11 +11746,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11759,11 +11759,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11772,11 +11772,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11803,18 +11803,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -11844,18 +11844,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -11869,21 +11869,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -11892,7 +11892,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -11905,17 +11905,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11924,11 +11924,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11947,18 +11947,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -11981,11 +11981,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11994,11 +11994,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12007,7 +12007,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -12021,11 +12021,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12040,18 +12040,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -12072,7 +12072,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -12086,11 +12086,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12105,7 +12105,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -12118,7 +12118,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -12157,18 +12157,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -12182,7 +12182,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -12192,11 +12192,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12205,11 +12205,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12221,14 +12221,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12236,11 +12236,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -12253,7 +12253,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -12269,11 +12269,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12300,18 +12300,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -12325,7 +12325,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -12338,14 +12338,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12353,11 +12353,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -12370,7 +12370,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -12386,11 +12386,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12414,11 +12414,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12433,18 +12433,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -12454,25 +12454,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -12486,29 +12486,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -12517,7 +12517,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -12532,10 +12532,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -12544,7 +12544,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -12559,10 +12559,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -12571,7 +12571,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -12586,10 +12586,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -12598,7 +12598,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -12612,10 +12612,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -12624,7 +12624,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -12640,19 +12640,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -12662,35 +12662,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -12702,9 +12702,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -12716,9 +12716,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -12726,22 +12726,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -12750,7 +12750,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -12765,10 +12765,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -12777,7 +12777,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -12793,12 +12793,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12807,22 +12807,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -12831,7 +12831,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -12846,10 +12846,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -12858,7 +12858,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -12874,12 +12874,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12888,22 +12888,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -12912,7 +12912,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -12927,10 +12927,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -12939,7 +12939,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -12954,10 +12954,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -12966,7 +12966,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -12982,12 +12982,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12996,25 +12996,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -13023,22 +13023,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -13047,7 +13047,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -13063,19 +13063,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -13084,9 +13084,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -13094,22 +13094,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -13118,7 +13118,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -13133,10 +13133,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -13145,7 +13145,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -13159,10 +13159,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -13171,7 +13171,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -13188,15 +13188,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -13205,7 +13205,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -13220,7 +13220,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -13229,22 +13229,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -13253,7 +13253,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -13269,15 +13269,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -13286,7 +13286,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -13301,7 +13301,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -13310,22 +13310,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -13334,7 +13334,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -13350,15 +13350,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -13367,7 +13367,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -13383,7 +13383,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -13392,22 +13392,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -13416,7 +13416,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -13432,15 +13432,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -13449,7 +13449,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -13465,7 +13465,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -13474,28 +13474,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -13504,7 +13504,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -13520,7 +13520,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -13529,22 +13529,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -13553,7 +13553,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -13567,10 +13567,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -13579,7 +13579,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -13596,15 +13596,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -13613,7 +13613,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -13628,7 +13628,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13637,22 +13637,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -13661,7 +13661,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -13675,10 +13675,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -13687,7 +13687,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -13704,12 +13704,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13718,22 +13718,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -13742,7 +13742,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -13756,10 +13756,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -13768,7 +13768,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -13783,10 +13783,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -13795,7 +13795,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -13811,12 +13811,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13825,22 +13825,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -13849,7 +13849,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -13864,10 +13864,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -13876,7 +13876,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -13892,12 +13892,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13906,22 +13906,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -13930,7 +13930,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -13944,10 +13944,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -13956,7 +13956,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -13970,10 +13970,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -13982,7 +13982,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -13998,12 +13998,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14012,22 +14012,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -14036,7 +14036,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -14050,10 +14050,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -14062,7 +14062,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -14077,10 +14077,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -14089,7 +14089,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -14105,12 +14105,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14119,22 +14119,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -14143,7 +14143,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -14157,10 +14157,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -14169,7 +14169,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -14184,10 +14184,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -14196,7 +14196,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -14212,12 +14212,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14226,22 +14226,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -14250,7 +14250,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -14265,10 +14265,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -14277,7 +14277,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -14291,10 +14291,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -14303,7 +14303,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -14318,10 +14318,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -14330,7 +14330,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -14346,12 +14346,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14360,22 +14360,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -14384,7 +14384,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -14398,10 +14398,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -14410,7 +14410,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -14427,12 +14427,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14441,22 +14441,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -14465,7 +14465,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -14480,10 +14480,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -14492,7 +14492,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -14508,12 +14508,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14522,22 +14522,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -14546,7 +14546,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -14560,10 +14560,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -14572,7 +14572,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -14588,19 +14588,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -14609,9 +14609,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -14619,22 +14619,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -14643,7 +14643,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -14658,10 +14658,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -14670,7 +14670,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -14687,15 +14687,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -14704,7 +14704,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -14719,7 +14719,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -14728,22 +14728,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -14752,7 +14752,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -14768,15 +14768,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -14785,7 +14785,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -14799,10 +14799,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -14811,7 +14811,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -14825,10 +14825,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -14837,7 +14837,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -14851,10 +14851,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -14863,7 +14863,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -14877,10 +14877,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -14889,7 +14889,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -14904,7 +14904,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -14913,22 +14913,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -14937,7 +14937,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -14954,15 +14954,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -14971,7 +14971,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -14986,7 +14986,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -14995,22 +14995,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -15019,7 +15019,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -15033,10 +15033,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -15045,7 +15045,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -15062,15 +15062,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -15079,7 +15079,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -15093,10 +15093,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -15105,7 +15105,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -15120,7 +15120,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -15129,22 +15129,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -15153,7 +15153,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -15167,10 +15167,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -15179,7 +15179,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -15194,10 +15194,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -15206,7 +15206,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -15221,10 +15221,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -15233,7 +15233,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -15248,10 +15248,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -15260,7 +15260,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -15274,10 +15274,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -15286,7 +15286,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -15302,12 +15302,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15316,22 +15316,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -15340,7 +15340,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -15357,12 +15357,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15371,22 +15371,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -15395,7 +15395,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -15410,10 +15410,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -15422,7 +15422,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -15437,10 +15437,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -15449,7 +15449,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -15465,19 +15465,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -15486,9 +15486,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -15496,28 +15496,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -15526,7 +15526,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -15541,7 +15541,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15550,44 +15550,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15597,7 +15597,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15606,22 +15606,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -15630,7 +15630,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -15645,10 +15645,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -15657,7 +15657,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -15673,12 +15673,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -15687,22 +15687,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -15711,7 +15711,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -15726,10 +15726,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -15738,7 +15738,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -15754,19 +15754,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -15775,9 +15775,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -15785,44 +15785,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -15832,7 +15832,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15841,44 +15841,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15888,7 +15888,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15897,22 +15897,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -15921,7 +15921,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -15936,10 +15936,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -15948,7 +15948,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -15964,12 +15964,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -15978,22 +15978,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -16002,7 +16002,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -16017,10 +16017,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -16029,7 +16029,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -16045,19 +16045,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -16066,9 +16066,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -16076,22 +16076,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -16100,7 +16100,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -16116,15 +16116,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -16133,7 +16133,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -16148,14 +16148,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -16164,19 +16164,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -16185,7 +16185,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -16200,7 +16200,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -16208,7 +16208,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -16228,7 +16228,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -16253,7 +16253,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -16267,7 +16267,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -16278,18 +16278,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16301,7 +16301,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -16330,7 +16330,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -16341,7 +16341,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -16351,18 +16351,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16377,18 +16377,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16399,11 +16399,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16423,7 +16423,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -16440,11 +16440,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16461,11 +16461,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16487,7 +16487,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -16514,21 +16514,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -16542,29 +16542,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -16573,7 +16573,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -16587,10 +16587,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -16599,7 +16599,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -16615,15 +16615,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -16632,7 +16632,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -16647,7 +16647,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -16655,7 +16655,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -16665,11 +16665,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16678,11 +16678,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16711,11 +16711,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16730,18 +16730,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -16751,25 +16751,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -16779,25 +16779,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -16811,7 +16811,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -16821,11 +16821,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16834,11 +16834,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16862,11 +16862,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16881,18 +16881,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -16902,25 +16902,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -16934,29 +16934,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -16965,7 +16965,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -16980,10 +16980,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -16992,7 +16992,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -17007,10 +17007,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -17019,7 +17019,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -17035,19 +17035,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -17056,38 +17056,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -17101,7 +17101,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -17111,18 +17111,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17137,18 +17137,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17159,11 +17159,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17183,7 +17183,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -17200,11 +17200,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17220,7 +17220,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -17247,21 +17247,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -17275,29 +17275,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -17306,7 +17306,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -17320,10 +17320,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -17332,7 +17332,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -17348,15 +17348,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -17365,7 +17365,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -17380,7 +17380,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -17388,25 +17388,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17420,11 +17420,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17439,7 +17439,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -17452,7 +17452,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -17472,7 +17472,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -17486,18 +17486,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17509,7 +17509,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -17533,7 +17533,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -17560,21 +17560,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -17588,29 +17588,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -17619,7 +17619,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -17635,15 +17635,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -17652,7 +17652,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -17667,7 +17667,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -17675,25 +17675,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17707,11 +17707,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17724,7 +17724,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -17732,7 +17732,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -17752,7 +17752,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -17785,18 +17785,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -17816,29 +17816,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -17847,7 +17847,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -17863,15 +17863,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -17880,7 +17880,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -17895,7 +17895,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -17903,25 +17903,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17935,11 +17935,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17952,7 +17952,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -17960,7 +17960,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -17986,7 +17986,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -17994,7 +17994,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -18021,11 +18021,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18040,18 +18040,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -18061,25 +18061,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -18100,7 +18100,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18131,18 +18131,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -18162,29 +18162,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -18193,7 +18193,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -18208,10 +18208,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -18220,7 +18220,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -18236,15 +18236,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -18253,7 +18253,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -18268,7 +18268,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18276,25 +18276,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18309,18 +18309,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18338,7 +18338,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -18346,7 +18346,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -18372,7 +18372,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -18380,7 +18380,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -18407,11 +18407,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18426,18 +18426,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -18447,25 +18447,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -18486,7 +18486,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18506,7 +18506,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18531,29 +18531,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -18562,7 +18562,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -18577,10 +18577,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -18589,7 +18589,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -18605,15 +18605,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -18622,7 +18622,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -18637,7 +18637,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18645,21 +18645,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -18668,7 +18668,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -18681,17 +18681,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -18711,11 +18711,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18730,18 +18730,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -18751,25 +18751,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -18788,15 +18788,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -18805,7 +18805,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -18818,17 +18818,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18848,11 +18848,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18867,18 +18867,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -18888,25 +18888,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -18930,18 +18930,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18955,11 +18955,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18968,11 +18968,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18991,18 +18991,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -19023,29 +19023,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19063,7 +19063,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -19076,11 +19076,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19089,11 +19089,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19112,18 +19112,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -19139,11 +19139,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19162,18 +19162,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -19191,11 +19191,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19216,18 +19216,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -19247,25 +19247,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19282,7 +19282,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -19295,11 +19295,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19314,7 +19314,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -19327,7 +19327,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -19343,11 +19343,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19366,18 +19366,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -19398,11 +19398,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19411,11 +19411,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19434,18 +19434,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -19467,18 +19467,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -19491,18 +19491,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19514,7 +19514,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -19546,7 +19546,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -19556,22 +19556,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -19580,7 +19580,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -19595,10 +19595,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -19607,7 +19607,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -19622,10 +19622,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -19634,7 +19634,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -19649,10 +19649,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -19661,7 +19661,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -19675,10 +19675,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -19687,7 +19687,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -19703,15 +19703,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -19720,7 +19720,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -19735,7 +19735,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -19743,14 +19743,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -19759,10 +19759,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -19771,7 +19771,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -19787,17 +19787,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -19817,11 +19817,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19836,18 +19836,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -19857,25 +19857,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -19895,16 +19895,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -19913,7 +19913,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -19926,17 +19926,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -19945,11 +19945,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19973,11 +19973,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19992,18 +19992,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -20013,25 +20013,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -20050,15 +20050,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -20067,7 +20067,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -20080,17 +20080,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20110,11 +20110,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20129,18 +20129,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -20150,25 +20150,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -20187,15 +20187,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -20204,7 +20204,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -20217,7 +20217,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -20226,11 +20226,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20239,11 +20239,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20262,18 +20262,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -20289,11 +20289,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20312,18 +20312,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -20343,18 +20343,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20369,18 +20369,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20391,11 +20391,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20414,25 +20414,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20449,7 +20449,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -20459,11 +20459,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20472,11 +20472,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20495,18 +20495,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -20524,11 +20524,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20543,18 +20543,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -20567,18 +20567,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20590,7 +20590,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -20622,29 +20622,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -20653,7 +20653,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -20668,10 +20668,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -20680,7 +20680,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -20695,10 +20695,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -20707,7 +20707,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -20722,10 +20722,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -20734,7 +20734,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -20750,15 +20750,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -20767,7 +20767,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -20782,7 +20782,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -20790,25 +20790,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20822,11 +20822,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -20835,11 +20835,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20863,11 +20863,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20882,18 +20882,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -20903,25 +20903,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -20941,29 +20941,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -20972,7 +20972,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -20987,10 +20987,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -20999,7 +20999,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -21013,10 +21013,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -21025,7 +21025,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -21042,15 +21042,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -21059,7 +21059,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -21074,7 +21074,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21082,7 +21082,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -21092,11 +21092,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21105,11 +21105,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21133,11 +21133,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21152,18 +21152,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -21173,25 +21173,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -21205,29 +21205,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -21236,7 +21236,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -21251,10 +21251,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -21263,7 +21263,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -21277,10 +21277,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -21289,7 +21289,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -21306,12 +21306,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21319,7 +21319,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -21329,11 +21329,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21342,11 +21342,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21355,11 +21355,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21387,11 +21387,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21406,18 +21406,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -21427,25 +21427,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -21459,29 +21459,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -21490,7 +21490,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -21505,10 +21505,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -21517,7 +21517,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -21531,10 +21531,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -21543,7 +21543,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -21558,10 +21558,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -21570,7 +21570,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -21586,12 +21586,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21599,7 +21599,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -21609,11 +21609,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21622,11 +21622,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21635,11 +21635,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21667,11 +21667,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21686,18 +21686,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -21707,25 +21707,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -21739,29 +21739,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -21770,7 +21770,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -21785,10 +21785,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -21797,7 +21797,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -21811,10 +21811,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -21823,7 +21823,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -21838,10 +21838,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -21850,7 +21850,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -21866,12 +21866,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21879,7 +21879,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -21889,11 +21889,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21902,11 +21902,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -21915,11 +21915,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -21947,11 +21947,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21966,18 +21966,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -21987,25 +21987,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -22019,29 +22019,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -22050,7 +22050,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -22065,10 +22065,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -22077,7 +22077,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -22091,10 +22091,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -22103,7 +22103,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -22117,10 +22117,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -22129,7 +22129,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -22145,12 +22145,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -22158,21 +22158,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -22181,7 +22181,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -22195,7 +22195,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -22206,11 +22206,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22225,18 +22225,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -22246,25 +22246,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -22283,15 +22283,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -22300,7 +22300,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -22314,17 +22314,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22344,11 +22344,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22363,18 +22363,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -22384,25 +22384,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -22421,15 +22421,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -22438,7 +22438,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -22451,17 +22451,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22481,11 +22481,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22500,18 +22500,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -22521,25 +22521,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -22559,16 +22559,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -22577,7 +22577,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -22590,17 +22590,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22609,11 +22609,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22637,11 +22637,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22656,18 +22656,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -22677,25 +22677,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -22718,11 +22718,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22731,11 +22731,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22747,11 +22747,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22760,11 +22760,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22773,11 +22773,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22786,11 +22786,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22817,18 +22817,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -22858,18 +22858,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -22883,7 +22883,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -22893,11 +22893,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22906,11 +22906,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22919,7 +22919,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -22933,11 +22933,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22952,18 +22952,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -22984,7 +22984,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -22998,11 +22998,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23017,7 +23017,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -23030,7 +23030,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -23069,18 +23069,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -23094,7 +23094,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -23104,11 +23104,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23117,11 +23117,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23133,14 +23133,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23148,11 +23148,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -23165,7 +23165,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -23181,11 +23181,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23212,18 +23212,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -23237,7 +23237,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -23250,14 +23250,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23265,11 +23265,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -23282,7 +23282,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -23298,11 +23298,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23326,11 +23326,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23345,18 +23345,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -23366,25 +23366,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -23398,7 +23398,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -23408,11 +23408,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23437,11 +23437,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23456,18 +23456,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -23477,25 +23477,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -23505,25 +23505,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -23537,29 +23537,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -23568,7 +23568,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -23583,10 +23583,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -23595,7 +23595,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -23610,10 +23610,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -23622,7 +23622,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -23637,10 +23637,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -23649,7 +23649,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -23663,10 +23663,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -23675,7 +23675,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -23691,12 +23691,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -23704,21 +23704,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -23727,7 +23727,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -23741,7 +23741,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -23752,11 +23752,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23771,18 +23771,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -23792,25 +23792,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -23829,15 +23829,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -23846,7 +23846,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -23860,17 +23860,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23890,11 +23890,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23909,18 +23909,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -23930,25 +23930,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -23967,15 +23967,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -23984,7 +23984,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -23997,17 +23997,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24027,11 +24027,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24046,18 +24046,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -24067,25 +24067,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -24105,16 +24105,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -24123,7 +24123,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -24136,17 +24136,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24155,11 +24155,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24183,11 +24183,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24202,18 +24202,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -24223,25 +24223,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -24264,11 +24264,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24277,11 +24277,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24293,11 +24293,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24306,11 +24306,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24319,11 +24319,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24332,11 +24332,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24363,18 +24363,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -24404,18 +24404,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -24429,21 +24429,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -24452,7 +24452,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -24465,17 +24465,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24484,11 +24484,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24507,18 +24507,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -24541,11 +24541,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24554,11 +24554,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24567,7 +24567,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -24581,11 +24581,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24600,18 +24600,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -24632,7 +24632,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -24646,11 +24646,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24665,7 +24665,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -24678,7 +24678,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -24717,18 +24717,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -24742,7 +24742,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -24752,11 +24752,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24765,11 +24765,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24781,14 +24781,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -24796,11 +24796,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -24813,7 +24813,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -24829,11 +24829,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24860,18 +24860,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -24885,7 +24885,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -24898,14 +24898,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -24913,11 +24913,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -24930,7 +24930,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -24946,11 +24946,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24974,11 +24974,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24993,18 +24993,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -25014,25 +25014,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -25046,29 +25046,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -25077,7 +25077,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -25092,10 +25092,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -25104,7 +25104,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -25119,10 +25119,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -25131,7 +25131,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -25146,10 +25146,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -25158,7 +25158,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -25172,10 +25172,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -25184,7 +25184,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -25200,19 +25200,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -25224,7 +25224,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.576Z", + "updatedAt": "2020-04-08T12:21:13.828Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/ICEther.json b/packages/smart-contracts/artifacts/ICEther.json index a544130..03e9f37 100644 --- a/packages/smart-contracts/artifacts/ICEther.json +++ b/packages/smart-contracts/artifacts/ICEther.json @@ -180,23 +180,59 @@ "payable": false, "stateMutability": "view", "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "getAccountSnapshot", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" } ], - "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"}],\"name\":\"balanceOf\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"balanceOfUnderlying\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"borrow\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"borrowBalanceCurrent\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"borrowBalanceStored\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"mint\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"redeemTokens\",\"type\":\"uint256\"}],\"name\":\"redeem\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"redeemAmount\",\"type\":\"uint256\"}],\"name\":\"redeemUnderlying\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"repayBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"borrower\",\"type\":\"address\"}],\"name\":\"repayBorrowBehalf\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol\":\"ICEther\"},\"evmVersion\":\"constantinople\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol\":{\"keccak256\":\"0xa65d6eb1f4bae0350a65a2148fc83c6cab8952d11b19c39e4ab5c27d1d48773e\",\"urls\":[\"bzz-raw://84d98fe4bf18381ad57769601c6b53135c0e5ff5f191a62cd129cb5a815efc79\",\"dweb:/ipfs/QmaoXTSmkuT5u2HkEkggYzEE4mBA1MZp5yDrDKWU6Y8jgm\"]}},\"version\":1}", + "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"}],\"name\":\"balanceOf\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"balanceOfUnderlying\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"borrow\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"borrowBalanceCurrent\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"borrowBalanceStored\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"getAccountSnapshot\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"mint\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"redeemTokens\",\"type\":\"uint256\"}],\"name\":\"redeem\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"redeemAmount\",\"type\":\"uint256\"}],\"name\":\"redeemUnderlying\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"repayBorrow\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"borrower\",\"type\":\"address\"}],\"name\":\"repayBorrowBehalf\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol\":\"ICEther\"},\"evmVersion\":\"constantinople\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol\":{\"keccak256\":\"0x309afa791633faf166083968588cc12d10b511fea04522d9645cbd6469a6bcbe\",\"urls\":[\"bzz-raw://6ae438b67af64e89c742848ede981932ebc2b7238e2f147c8620d4048fd75885\",\"dweb:/ipfs/QmYZmAKfjvY3hS27hn1qcPBtegrQPELgc5YMXwybm5vBra\"]}},\"version\":1}", "bytecode": "0x", "deployedBytecode": "0x", "sourceMap": "", "deployedSourceMap": "", - "source": "pragma solidity 0.5.16;\n\ncontract ICEther {\n function mint() external payable;\n function borrow(uint borrowAmount) external returns (uint);\n function redeem(uint redeemTokens) external returns (uint);\n function redeemUnderlying(uint redeemAmount) external returns (uint);\n function repayBorrow() external payable;\n function repayBorrowBehalf(address borrower) external payable;\n function borrowBalanceCurrent(address account) external returns (uint);\n function borrowBalanceStored(address account) external view returns (uint256);\n function balanceOfUnderlying(address account) external returns (uint);\n function balanceOf(address owner) external view returns (uint256);\n}", + "source": "pragma solidity 0.5.16;\n\ncontract ICEther {\n function mint() external payable;\n function borrow(uint borrowAmount) external returns (uint);\n function redeem(uint redeemTokens) external returns (uint);\n function redeemUnderlying(uint redeemAmount) external returns (uint);\n function repayBorrow() external payable;\n function repayBorrowBehalf(address borrower) external payable;\n function borrowBalanceCurrent(address account) external returns (uint);\n function borrowBalanceStored(address account) external view returns (uint256);\n function balanceOfUnderlying(address account) external returns (uint);\n function balanceOf(address owner) external view returns (uint256);\n function getAccountSnapshot(address account) external view returns (uint, uint, uint, uint);\n}", "sourcePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol", "ast": { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol", "exportedSymbols": { "ICEther": [ - 732 + 745 ] }, - "id": 733, + "id": 746, "nodeType": "SourceUnit", "nodes": [ { @@ -215,9 +251,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 732, + "id": 745, "linearizedBaseContracts": [ - 732 + 745 ], "name": "ICEther", "nodeType": "ContractDefinition", @@ -243,7 +279,7 @@ "parameters": [], "src": "80:0:7" }, - "scope": 732, + "scope": 745, "src": "48:33:7", "stateMutability": "payable", "superFunction": null, @@ -324,7 +360,7 @@ ], "src": "138:6:7" }, - "scope": 732, + "scope": 745, "src": "86:59:7", "stateMutability": "nonpayable", "superFunction": null, @@ -405,7 +441,7 @@ ], "src": "202:6:7" }, - "scope": 732, + "scope": 745, "src": "150:59:7", "stateMutability": "nonpayable", "superFunction": null, @@ -486,7 +522,7 @@ ], "src": "276:6:7" }, - "scope": 732, + "scope": 745, "src": "214:69:7", "stateMutability": "nonpayable", "superFunction": null, @@ -513,7 +549,7 @@ "parameters": [], "src": "327:0:7" }, - "scope": 732, + "scope": 745, "src": "288:40:7", "stateMutability": "payable", "superFunction": null, @@ -568,7 +604,7 @@ "parameters": [], "src": "394:0:7" }, - "scope": 732, + "scope": 745, "src": "333:62:7", "stateMutability": "payable", "superFunction": null, @@ -650,7 +686,7 @@ ], "src": "464:6:7" }, - "scope": 732, + "scope": 745, "src": "400:71:7", "stateMutability": "nonpayable", "superFunction": null, @@ -732,7 +768,7 @@ ], "src": "544:9:7" }, - "scope": 732, + "scope": 745, "src": "476:78:7", "stateMutability": "view", "superFunction": null, @@ -814,7 +850,7 @@ ], "src": "622:6:7" }, - "scope": 732, + "scope": 745, "src": "559:70:7", "stateMutability": "nonpayable", "superFunction": null, @@ -896,27 +932,187 @@ ], "src": "690:9:7" }, - "scope": 732, + "scope": 745, "src": "634:66:7", "stateMutability": "view", "superFunction": null, "visibility": "external" + }, + { + "body": null, + "documentation": null, + "id": 744, + "implemented": false, + "kind": "function", + "modifiers": [], + "name": "getAccountSnapshot", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 734, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 733, + "name": "account", + "nodeType": "VariableDeclaration", + "scope": 744, + "src": "733:15:7", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 732, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "733:7:7", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "732:17:7" + }, + "returnParameters": { + "id": 743, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 736, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 744, + "src": "773:4:7", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 735, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "773:4:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 738, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 744, + "src": "779:4:7", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 737, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "779:4:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 740, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 744, + "src": "785:4:7", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 739, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "785:4:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 742, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 744, + "src": "791:4:7", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 741, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "791:4:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "772:24:7" + }, + "scope": 745, + "src": "705:92:7", + "stateMutability": "view", + "superFunction": null, + "visibility": "external" } ], - "scope": 733, - "src": "25:677:7" + "scope": 746, + "src": "25:774:7" } ], - "src": "0:702:7" + "src": "0:799:7" }, "legacyAST": { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICEther.sol", "exportedSymbols": { "ICEther": [ - 732 + 745 ] }, - "id": 733, + "id": 746, "nodeType": "SourceUnit", "nodes": [ { @@ -935,9 +1131,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 732, + "id": 745, "linearizedBaseContracts": [ - 732 + 745 ], "name": "ICEther", "nodeType": "ContractDefinition", @@ -963,7 +1159,7 @@ "parameters": [], "src": "80:0:7" }, - "scope": 732, + "scope": 745, "src": "48:33:7", "stateMutability": "payable", "superFunction": null, @@ -1044,7 +1240,7 @@ ], "src": "138:6:7" }, - "scope": 732, + "scope": 745, "src": "86:59:7", "stateMutability": "nonpayable", "superFunction": null, @@ -1125,7 +1321,7 @@ ], "src": "202:6:7" }, - "scope": 732, + "scope": 745, "src": "150:59:7", "stateMutability": "nonpayable", "superFunction": null, @@ -1206,7 +1402,7 @@ ], "src": "276:6:7" }, - "scope": 732, + "scope": 745, "src": "214:69:7", "stateMutability": "nonpayable", "superFunction": null, @@ -1233,7 +1429,7 @@ "parameters": [], "src": "327:0:7" }, - "scope": 732, + "scope": 745, "src": "288:40:7", "stateMutability": "payable", "superFunction": null, @@ -1288,7 +1484,7 @@ "parameters": [], "src": "394:0:7" }, - "scope": 732, + "scope": 745, "src": "333:62:7", "stateMutability": "payable", "superFunction": null, @@ -1370,7 +1566,7 @@ ], "src": "464:6:7" }, - "scope": 732, + "scope": 745, "src": "400:71:7", "stateMutability": "nonpayable", "superFunction": null, @@ -1452,7 +1648,7 @@ ], "src": "544:9:7" }, - "scope": 732, + "scope": 745, "src": "476:78:7", "stateMutability": "view", "superFunction": null, @@ -1534,7 +1730,7 @@ ], "src": "622:6:7" }, - "scope": 732, + "scope": 745, "src": "559:70:7", "stateMutability": "nonpayable", "superFunction": null, @@ -1616,18 +1812,178 @@ ], "src": "690:9:7" }, - "scope": 732, + "scope": 745, "src": "634:66:7", "stateMutability": "view", "superFunction": null, "visibility": "external" + }, + { + "body": null, + "documentation": null, + "id": 744, + "implemented": false, + "kind": "function", + "modifiers": [], + "name": "getAccountSnapshot", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 734, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 733, + "name": "account", + "nodeType": "VariableDeclaration", + "scope": 744, + "src": "733:15:7", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 732, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "733:7:7", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "732:17:7" + }, + "returnParameters": { + "id": 743, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 736, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 744, + "src": "773:4:7", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 735, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "773:4:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 738, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 744, + "src": "779:4:7", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 737, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "779:4:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 740, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 744, + "src": "785:4:7", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 739, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "785:4:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 742, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 744, + "src": "791:4:7", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 741, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "791:4:7", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "772:24:7" + }, + "scope": 745, + "src": "705:92:7", + "stateMutability": "view", + "superFunction": null, + "visibility": "external" } ], - "scope": 733, - "src": "25:677:7" + "scope": 746, + "src": "25:774:7" } ], - "src": "0:702:7" + "src": "0:799:7" }, "compiler": { "name": "solc", @@ -1635,7 +1991,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.465Z", + "updatedAt": "2020-04-08T12:21:13.677Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/ICToken.json b/packages/smart-contracts/artifacts/ICToken.json index 813a337..47f6101 100644 --- a/packages/smart-contracts/artifacts/ICToken.json +++ b/packages/smart-contracts/artifacts/ICToken.json @@ -210,6 +210,42 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "constant": true, + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "getAccountSnapshot", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, { "constant": true, "inputs": [], @@ -365,25 +401,25 @@ "type": "function" } ], - "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"name\":\"allowance\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"approve\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"}],\"name\":\"balanceOf\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"balance\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"balanceOfUnderlying\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"borrow\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"borrowBalanceCurrent\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"borrowBalanceStored\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"exchangeRateCurrent\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"mintAmount\",\"type\":\"uint256\"}],\"name\":\"mint\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"redeemTokens\",\"type\":\"uint256\"}],\"name\":\"redeem\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"redeemAmount\",\"type\":\"uint256\"}],\"name\":\"redeemUnderlying\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"repayAmount\",\"type\":\"uint256\"}],\"name\":\"repayBorrow\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"borrower\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"repayAmount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowBehalf\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"totalSupply\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"transfer\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"transferFrom\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"underlying\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol\":\"ICToken\"},\"evmVersion\":\"constantinople\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol\":{\"keccak256\":\"0xd07da3ef9345ec40b090ea93df6d5a9ff7a03996a3c55f51aabee4d50ccdc201\",\"urls\":[\"bzz-raw://21c88532f770e244133c240d448092d8ea0e5a47dcf951522aa66106e15758e3\",\"dweb:/ipfs/QmXFkrbfpgcCFvoziSR3FnptBPf79og2tSR8deQGmViAkg\"]}},\"version\":1}", + "metadata": "{\"compiler\":{\"version\":\"0.5.16+commit.9c3226ce\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"name\":\"allowance\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"approve\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"}],\"name\":\"balanceOf\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"balance\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"balanceOfUnderlying\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"borrowAmount\",\"type\":\"uint256\"}],\"name\":\"borrow\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"borrowBalanceCurrent\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"borrowBalanceStored\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"exchangeRateCurrent\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"getAccountSnapshot\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"mintAmount\",\"type\":\"uint256\"}],\"name\":\"mint\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"redeemTokens\",\"type\":\"uint256\"}],\"name\":\"redeem\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"redeemAmount\",\"type\":\"uint256\"}],\"name\":\"redeemUnderlying\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"repayAmount\",\"type\":\"uint256\"}],\"name\":\"repayBorrow\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"borrower\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"repayAmount\",\"type\":\"uint256\"}],\"name\":\"repayBorrowBehalf\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"totalSupply\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"transfer\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"transferFrom\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"underlying\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol\":\"ICToken\"},\"evmVersion\":\"constantinople\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol\":{\"keccak256\":\"0xf2fc635f3c28b641fa8dc95be41b6d7ab7f7d2bacfe9c2c37c1c0d22aac0afad\",\"urls\":[\"bzz-raw://767766022c3d3e172a71bd781eff9d92e938efc3e2d5708a90929491f2e0af15\",\"dweb:/ipfs/QmSkT4Jy2X54hYvDJG6PrX2tzdPvbK6WYtpBSJF7PDyVdp\"]}},\"version\":1}", "bytecode": "0x", "deployedBytecode": "0x", "sourceMap": "", "deployedSourceMap": "", - "source": "pragma solidity 0.5.16;\n\ninterface ICToken {\n function mint(uint mintAmount) external returns (uint);\n function redeem(uint redeemTokens) external returns (uint);\n function redeemUnderlying(uint redeemAmount) external returns (uint);\n function borrow(uint borrowAmount) external returns (uint);\n function repayBorrow(uint repayAmount) external returns (uint);\n function repayBorrowBehalf(address borrower, uint repayAmount) external returns (uint);\n function exchangeRateCurrent() external returns (uint);\n function borrowBalanceCurrent(address account) external returns (uint);\n function borrowBalanceStored(address account) external view returns (uint256);\n function balanceOfUnderlying(address account) external returns (uint);\n \n function underlying() external view returns (address);\n function totalSupply() external view returns (uint256);\n function balanceOf(address owner) external view returns (uint256 balance);\n function allowance(address, address) external view returns (uint);\n function approve(address, uint) external;\n function transfer(address, uint) external returns (bool);\n function transferFrom(address, address, uint) external returns (bool);\n}", + "source": "pragma solidity 0.5.16;\n\ninterface ICToken {\n function mint(uint mintAmount) external returns (uint);\n function redeem(uint redeemTokens) external returns (uint);\n function redeemUnderlying(uint redeemAmount) external returns (uint);\n function borrow(uint borrowAmount) external returns (uint);\n function repayBorrow(uint repayAmount) external returns (uint);\n function repayBorrowBehalf(address borrower, uint repayAmount) external returns (uint);\n function exchangeRateCurrent() external returns (uint);\n function borrowBalanceCurrent(address account) external returns (uint);\n function borrowBalanceStored(address account) external view returns (uint256);\n function balanceOfUnderlying(address account) external returns (uint);\n function getAccountSnapshot(address account) external view returns (uint, uint, uint, uint);\n \n function underlying() external view returns (address);\n function totalSupply() external view returns (uint256);\n function balanceOf(address owner) external view returns (uint256 balance);\n function allowance(address, address) external view returns (uint);\n function approve(address, uint) external;\n function transfer(address, uint) external returns (bool);\n function transferFrom(address, address, uint) external returns (bool);\n}", "sourcePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol", "ast": { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol", "exportedSymbols": { "ICToken": [ - 858 + 884 ] }, - "id": 859, + "id": 885, "nodeType": "SourceUnit", "nodes": [ { - "id": 734, + "id": 747, "literals": [ "solidity", "0.5", @@ -398,9 +434,9 @@ "contractKind": "interface", "documentation": null, "fullyImplemented": false, - "id": 858, + "id": 884, "linearizedBaseContracts": [ - 858 + 884 ], "name": "ICToken", "nodeType": "ContractDefinition", @@ -408,22 +444,22 @@ { "body": null, "documentation": null, - "id": 741, + "id": 754, "implemented": false, "kind": "function", "modifiers": [], "name": "mint", "nodeType": "FunctionDefinition", "parameters": { - "id": 737, + "id": 750, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 736, + "id": 749, "name": "mintAmount", "nodeType": "VariableDeclaration", - "scope": 741, + "scope": 754, "src": "63:15:8", "stateVariable": false, "storageLocation": "default", @@ -432,7 +468,7 @@ "typeString": "uint256" }, "typeName": { - "id": 735, + "id": 748, "name": "uint", "nodeType": "ElementaryTypeName", "src": "63:4:8", @@ -448,15 +484,15 @@ "src": "62:17:8" }, "returnParameters": { - "id": 740, + "id": 753, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 739, + "id": 752, "name": "", "nodeType": "VariableDeclaration", - "scope": 741, + "scope": 754, "src": "98:4:8", "stateVariable": false, "storageLocation": "default", @@ -465,7 +501,7 @@ "typeString": "uint256" }, "typeName": { - "id": 738, + "id": 751, "name": "uint", "nodeType": "ElementaryTypeName", "src": "98:4:8", @@ -480,7 +516,7 @@ ], "src": "97:6:8" }, - "scope": 858, + "scope": 884, "src": "49:55:8", "stateMutability": "nonpayable", "superFunction": null, @@ -489,22 +525,22 @@ { "body": null, "documentation": null, - "id": 748, + "id": 761, "implemented": false, "kind": "function", "modifiers": [], "name": "redeem", "nodeType": "FunctionDefinition", "parameters": { - "id": 744, + "id": 757, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 743, + "id": 756, "name": "redeemTokens", "nodeType": "VariableDeclaration", - "scope": 748, + "scope": 761, "src": "125:17:8", "stateVariable": false, "storageLocation": "default", @@ -513,7 +549,7 @@ "typeString": "uint256" }, "typeName": { - "id": 742, + "id": 755, "name": "uint", "nodeType": "ElementaryTypeName", "src": "125:4:8", @@ -529,15 +565,15 @@ "src": "124:19:8" }, "returnParameters": { - "id": 747, + "id": 760, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 746, + "id": 759, "name": "", "nodeType": "VariableDeclaration", - "scope": 748, + "scope": 761, "src": "162:4:8", "stateVariable": false, "storageLocation": "default", @@ -546,7 +582,7 @@ "typeString": "uint256" }, "typeName": { - "id": 745, + "id": 758, "name": "uint", "nodeType": "ElementaryTypeName", "src": "162:4:8", @@ -561,7 +597,7 @@ ], "src": "161:6:8" }, - "scope": 858, + "scope": 884, "src": "109:59:8", "stateMutability": "nonpayable", "superFunction": null, @@ -570,22 +606,22 @@ { "body": null, "documentation": null, - "id": 755, + "id": 768, "implemented": false, "kind": "function", "modifiers": [], "name": "redeemUnderlying", "nodeType": "FunctionDefinition", "parameters": { - "id": 751, + "id": 764, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 750, + "id": 763, "name": "redeemAmount", "nodeType": "VariableDeclaration", - "scope": 755, + "scope": 768, "src": "199:17:8", "stateVariable": false, "storageLocation": "default", @@ -594,7 +630,7 @@ "typeString": "uint256" }, "typeName": { - "id": 749, + "id": 762, "name": "uint", "nodeType": "ElementaryTypeName", "src": "199:4:8", @@ -610,15 +646,15 @@ "src": "198:19:8" }, "returnParameters": { - "id": 754, + "id": 767, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 753, + "id": 766, "name": "", "nodeType": "VariableDeclaration", - "scope": 755, + "scope": 768, "src": "236:4:8", "stateVariable": false, "storageLocation": "default", @@ -627,7 +663,7 @@ "typeString": "uint256" }, "typeName": { - "id": 752, + "id": 765, "name": "uint", "nodeType": "ElementaryTypeName", "src": "236:4:8", @@ -642,7 +678,7 @@ ], "src": "235:6:8" }, - "scope": 858, + "scope": 884, "src": "173:69:8", "stateMutability": "nonpayable", "superFunction": null, @@ -651,22 +687,22 @@ { "body": null, "documentation": null, - "id": 762, + "id": 775, "implemented": false, "kind": "function", "modifiers": [], "name": "borrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 758, + "id": 771, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 757, + "id": 770, "name": "borrowAmount", "nodeType": "VariableDeclaration", - "scope": 762, + "scope": 775, "src": "263:17:8", "stateVariable": false, "storageLocation": "default", @@ -675,7 +711,7 @@ "typeString": "uint256" }, "typeName": { - "id": 756, + "id": 769, "name": "uint", "nodeType": "ElementaryTypeName", "src": "263:4:8", @@ -691,15 +727,15 @@ "src": "262:19:8" }, "returnParameters": { - "id": 761, + "id": 774, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 760, + "id": 773, "name": "", "nodeType": "VariableDeclaration", - "scope": 762, + "scope": 775, "src": "300:4:8", "stateVariable": false, "storageLocation": "default", @@ -708,7 +744,7 @@ "typeString": "uint256" }, "typeName": { - "id": 759, + "id": 772, "name": "uint", "nodeType": "ElementaryTypeName", "src": "300:4:8", @@ -723,7 +759,7 @@ ], "src": "299:6:8" }, - "scope": 858, + "scope": 884, "src": "247:59:8", "stateMutability": "nonpayable", "superFunction": null, @@ -732,22 +768,22 @@ { "body": null, "documentation": null, - "id": 769, + "id": 782, "implemented": false, "kind": "function", "modifiers": [], "name": "repayBorrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 765, + "id": 778, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 764, + "id": 777, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 769, + "scope": 782, "src": "332:16:8", "stateVariable": false, "storageLocation": "default", @@ -756,7 +792,7 @@ "typeString": "uint256" }, "typeName": { - "id": 763, + "id": 776, "name": "uint", "nodeType": "ElementaryTypeName", "src": "332:4:8", @@ -772,15 +808,15 @@ "src": "331:18:8" }, "returnParameters": { - "id": 768, + "id": 781, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 767, + "id": 780, "name": "", "nodeType": "VariableDeclaration", - "scope": 769, + "scope": 782, "src": "368:4:8", "stateVariable": false, "storageLocation": "default", @@ -789,7 +825,7 @@ "typeString": "uint256" }, "typeName": { - "id": 766, + "id": 779, "name": "uint", "nodeType": "ElementaryTypeName", "src": "368:4:8", @@ -804,7 +840,7 @@ ], "src": "367:6:8" }, - "scope": 858, + "scope": 884, "src": "311:63:8", "stateMutability": "nonpayable", "superFunction": null, @@ -813,22 +849,22 @@ { "body": null, "documentation": null, - "id": 778, + "id": 791, "implemented": false, "kind": "function", "modifiers": [], "name": "repayBorrowBehalf", "nodeType": "FunctionDefinition", "parameters": { - "id": 774, + "id": 787, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 771, + "id": 784, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 778, + "scope": 791, "src": "406:16:8", "stateVariable": false, "storageLocation": "default", @@ -837,7 +873,7 @@ "typeString": "address" }, "typeName": { - "id": 770, + "id": 783, "name": "address", "nodeType": "ElementaryTypeName", "src": "406:7:8", @@ -852,10 +888,10 @@ }, { "constant": false, - "id": 773, + "id": 786, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 778, + "scope": 791, "src": "424:16:8", "stateVariable": false, "storageLocation": "default", @@ -864,7 +900,7 @@ "typeString": "uint256" }, "typeName": { - "id": 772, + "id": 785, "name": "uint", "nodeType": "ElementaryTypeName", "src": "424:4:8", @@ -880,15 +916,15 @@ "src": "405:36:8" }, "returnParameters": { - "id": 777, + "id": 790, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 776, + "id": 789, "name": "", "nodeType": "VariableDeclaration", - "scope": 778, + "scope": 791, "src": "460:4:8", "stateVariable": false, "storageLocation": "default", @@ -897,7 +933,7 @@ "typeString": "uint256" }, "typeName": { - "id": 775, + "id": 788, "name": "uint", "nodeType": "ElementaryTypeName", "src": "460:4:8", @@ -912,7 +948,7 @@ ], "src": "459:6:8" }, - "scope": 858, + "scope": 884, "src": "379:87:8", "stateMutability": "nonpayable", "superFunction": null, @@ -921,28 +957,28 @@ { "body": null, "documentation": null, - "id": 783, + "id": 796, "implemented": false, "kind": "function", "modifiers": [], "name": "exchangeRateCurrent", "nodeType": "FunctionDefinition", "parameters": { - "id": 779, + "id": 792, "nodeType": "ParameterList", "parameters": [], "src": "499:2:8" }, "returnParameters": { - "id": 782, + "id": 795, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 781, + "id": 794, "name": "", "nodeType": "VariableDeclaration", - "scope": 783, + "scope": 796, "src": "520:4:8", "stateVariable": false, "storageLocation": "default", @@ -951,7 +987,7 @@ "typeString": "uint256" }, "typeName": { - "id": 780, + "id": 793, "name": "uint", "nodeType": "ElementaryTypeName", "src": "520:4:8", @@ -966,7 +1002,7 @@ ], "src": "519:6:8" }, - "scope": 858, + "scope": 884, "src": "471:55:8", "stateMutability": "nonpayable", "superFunction": null, @@ -975,22 +1011,22 @@ { "body": null, "documentation": null, - "id": 790, + "id": 803, "implemented": false, "kind": "function", "modifiers": [], "name": "borrowBalanceCurrent", "nodeType": "FunctionDefinition", "parameters": { - "id": 786, + "id": 799, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 785, + "id": 798, "name": "account", "nodeType": "VariableDeclaration", - "scope": 790, + "scope": 803, "src": "561:15:8", "stateVariable": false, "storageLocation": "default", @@ -999,7 +1035,7 @@ "typeString": "address" }, "typeName": { - "id": 784, + "id": 797, "name": "address", "nodeType": "ElementaryTypeName", "src": "561:7:8", @@ -1016,15 +1052,15 @@ "src": "560:17:8" }, "returnParameters": { - "id": 789, + "id": 802, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 788, + "id": 801, "name": "", "nodeType": "VariableDeclaration", - "scope": 790, + "scope": 803, "src": "596:4:8", "stateVariable": false, "storageLocation": "default", @@ -1033,7 +1069,7 @@ "typeString": "uint256" }, "typeName": { - "id": 787, + "id": 800, "name": "uint", "nodeType": "ElementaryTypeName", "src": "596:4:8", @@ -1048,7 +1084,7 @@ ], "src": "595:6:8" }, - "scope": 858, + "scope": 884, "src": "531:71:8", "stateMutability": "nonpayable", "superFunction": null, @@ -1057,22 +1093,22 @@ { "body": null, "documentation": null, - "id": 797, + "id": 810, "implemented": false, "kind": "function", "modifiers": [], "name": "borrowBalanceStored", "nodeType": "FunctionDefinition", "parameters": { - "id": 793, + "id": 806, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 792, + "id": 805, "name": "account", "nodeType": "VariableDeclaration", - "scope": 797, + "scope": 810, "src": "636:15:8", "stateVariable": false, "storageLocation": "default", @@ -1081,7 +1117,7 @@ "typeString": "address" }, "typeName": { - "id": 791, + "id": 804, "name": "address", "nodeType": "ElementaryTypeName", "src": "636:7:8", @@ -1098,15 +1134,15 @@ "src": "635:17:8" }, "returnParameters": { - "id": 796, + "id": 809, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 795, + "id": 808, "name": "", "nodeType": "VariableDeclaration", - "scope": 797, + "scope": 810, "src": "676:7:8", "stateVariable": false, "storageLocation": "default", @@ -1115,7 +1151,7 @@ "typeString": "uint256" }, "typeName": { - "id": 794, + "id": 807, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "676:7:8", @@ -1130,7 +1166,7 @@ ], "src": "675:9:8" }, - "scope": 858, + "scope": 884, "src": "607:78:8", "stateMutability": "view", "superFunction": null, @@ -1139,22 +1175,22 @@ { "body": null, "documentation": null, - "id": 804, + "id": 817, "implemented": false, "kind": "function", "modifiers": [], "name": "balanceOfUnderlying", "nodeType": "FunctionDefinition", "parameters": { - "id": 800, + "id": 813, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 799, + "id": 812, "name": "account", "nodeType": "VariableDeclaration", - "scope": 804, + "scope": 817, "src": "719:15:8", "stateVariable": false, "storageLocation": "default", @@ -1163,7 +1199,7 @@ "typeString": "address" }, "typeName": { - "id": 798, + "id": 811, "name": "address", "nodeType": "ElementaryTypeName", "src": "719:7:8", @@ -1180,15 +1216,15 @@ "src": "718:17:8" }, "returnParameters": { - "id": 803, + "id": 816, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 802, + "id": 815, "name": "", "nodeType": "VariableDeclaration", - "scope": 804, + "scope": 817, "src": "754:4:8", "stateVariable": false, "storageLocation": "default", @@ -1197,7 +1233,7 @@ "typeString": "uint256" }, "typeName": { - "id": 801, + "id": 814, "name": "uint", "nodeType": "ElementaryTypeName", "src": "754:4:8", @@ -1212,7 +1248,7 @@ ], "src": "753:6:8" }, - "scope": 858, + "scope": 884, "src": "690:70:8", "stateMutability": "nonpayable", "superFunction": null, @@ -1221,29 +1257,189 @@ { "body": null, "documentation": null, - "id": 809, + "id": 830, + "implemented": false, + "kind": "function", + "modifiers": [], + "name": "getAccountSnapshot", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 820, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 819, + "name": "account", + "nodeType": "VariableDeclaration", + "scope": 830, + "src": "793:15:8", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 818, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "793:7:8", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "792:17:8" + }, + "returnParameters": { + "id": 829, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 822, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 830, + "src": "833:4:8", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 821, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "833:4:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 824, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 830, + "src": "839:4:8", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 823, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "839:4:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 826, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 830, + "src": "845:4:8", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 825, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "845:4:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 828, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 830, + "src": "851:4:8", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 827, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "851:4:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "832:24:8" + }, + "scope": 884, + "src": "765:92:8", + "stateMutability": "view", + "superFunction": null, + "visibility": "external" + }, + { + "body": null, + "documentation": null, + "id": 835, "implemented": false, "kind": "function", "modifiers": [], "name": "underlying", "nodeType": "FunctionDefinition", "parameters": { - "id": 805, + "id": 831, "nodeType": "ParameterList", "parameters": [], - "src": "789:2:8" + "src": "886:2:8" }, "returnParameters": { - "id": 808, + "id": 834, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 807, + "id": 833, "name": "", "nodeType": "VariableDeclaration", - "scope": 809, - "src": "815:7:8", + "scope": 835, + "src": "912:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1251,10 +1447,10 @@ "typeString": "address" }, "typeName": { - "id": 806, + "id": 832, "name": "address", "nodeType": "ElementaryTypeName", - "src": "815:7:8", + "src": "912:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1265,10 +1461,10 @@ "visibility": "internal" } ], - "src": "814:9:8" + "src": "911:9:8" }, - "scope": 858, - "src": "770:54:8", + "scope": 884, + "src": "867:54:8", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -1276,29 +1472,29 @@ { "body": null, "documentation": null, - "id": 814, + "id": 840, "implemented": false, "kind": "function", "modifiers": [], "name": "totalSupply", "nodeType": "FunctionDefinition", "parameters": { - "id": 810, + "id": 836, "nodeType": "ParameterList", "parameters": [], - "src": "849:2:8" + "src": "946:2:8" }, "returnParameters": { - "id": 813, + "id": 839, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 812, + "id": 838, "name": "", "nodeType": "VariableDeclaration", - "scope": 814, - "src": "875:7:8", + "scope": 840, + "src": "972:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1306,10 +1502,10 @@ "typeString": "uint256" }, "typeName": { - "id": 811, + "id": 837, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "875:7:8", + "src": "972:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1319,10 +1515,10 @@ "visibility": "internal" } ], - "src": "874:9:8" + "src": "971:9:8" }, - "scope": 858, - "src": "829:55:8", + "scope": 884, + "src": "926:55:8", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -1330,23 +1526,23 @@ { "body": null, "documentation": null, - "id": 821, + "id": 847, "implemented": false, "kind": "function", "modifiers": [], "name": "balanceOf", "nodeType": "FunctionDefinition", "parameters": { - "id": 817, + "id": 843, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 816, + "id": 842, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 821, - "src": "908:13:8", + "scope": 847, + "src": "1005:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1354,10 +1550,10 @@ "typeString": "address" }, "typeName": { - "id": 815, + "id": 841, "name": "address", "nodeType": "ElementaryTypeName", - "src": "908:7:8", + "src": "1005:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1368,19 +1564,19 @@ "visibility": "internal" } ], - "src": "907:15:8" + "src": "1004:15:8" }, "returnParameters": { - "id": 820, + "id": 846, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 819, + "id": 845, "name": "balance", "nodeType": "VariableDeclaration", - "scope": 821, - "src": "946:15:8", + "scope": 847, + "src": "1043:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1388,10 +1584,10 @@ "typeString": "uint256" }, "typeName": { - "id": 818, + "id": 844, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "946:7:8", + "src": "1043:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1401,10 +1597,10 @@ "visibility": "internal" } ], - "src": "945:17:8" + "src": "1042:17:8" }, - "scope": 858, - "src": "889:74:8", + "scope": 884, + "src": "986:74:8", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -1412,23 +1608,23 @@ { "body": null, "documentation": null, - "id": 830, + "id": 856, "implemented": false, "kind": "function", "modifiers": [], "name": "allowance", "nodeType": "FunctionDefinition", "parameters": { - "id": 826, + "id": 852, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 823, + "id": 849, "name": "", "nodeType": "VariableDeclaration", - "scope": 830, - "src": "987:7:8", + "scope": 856, + "src": "1084:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1436,10 +1632,10 @@ "typeString": "address" }, "typeName": { - "id": 822, + "id": 848, "name": "address", "nodeType": "ElementaryTypeName", - "src": "987:7:8", + "src": "1084:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1451,11 +1647,11 @@ }, { "constant": false, - "id": 825, + "id": 851, "name": "", "nodeType": "VariableDeclaration", - "scope": 830, - "src": "996:7:8", + "scope": 856, + "src": "1093:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1463,10 +1659,10 @@ "typeString": "address" }, "typeName": { - "id": 824, + "id": 850, "name": "address", "nodeType": "ElementaryTypeName", - "src": "996:7:8", + "src": "1093:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1477,19 +1673,19 @@ "visibility": "internal" } ], - "src": "986:18:8" + "src": "1083:18:8" }, "returnParameters": { - "id": 829, + "id": 855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 828, + "id": 854, "name": "", "nodeType": "VariableDeclaration", - "scope": 830, - "src": "1028:4:8", + "scope": 856, + "src": "1125:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1497,10 +1693,10 @@ "typeString": "uint256" }, "typeName": { - "id": 827, + "id": 853, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1028:4:8", + "src": "1125:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1510,10 +1706,10 @@ "visibility": "internal" } ], - "src": "1027:6:8" + "src": "1124:6:8" }, - "scope": 858, - "src": "968:66:8", + "scope": 884, + "src": "1065:66:8", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -1521,23 +1717,23 @@ { "body": null, "documentation": null, - "id": 837, + "id": 863, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 835, + "id": 861, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 832, + "id": 858, "name": "", "nodeType": "VariableDeclaration", - "scope": 837, - "src": "1056:7:8", + "scope": 863, + "src": "1153:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1545,10 +1741,10 @@ "typeString": "address" }, "typeName": { - "id": 831, + "id": 857, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1056:7:8", + "src": "1153:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1560,11 +1756,11 @@ }, { "constant": false, - "id": 834, + "id": 860, "name": "", "nodeType": "VariableDeclaration", - "scope": 837, - "src": "1065:4:8", + "scope": 863, + "src": "1162:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1572,10 +1768,10 @@ "typeString": "uint256" }, "typeName": { - "id": 833, + "id": 859, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1065:4:8", + "src": "1162:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1585,16 +1781,16 @@ "visibility": "internal" } ], - "src": "1055:15:8" + "src": "1152:15:8" }, "returnParameters": { - "id": 836, + "id": 862, "nodeType": "ParameterList", "parameters": [], - "src": "1079:0:8" + "src": "1176:0:8" }, - "scope": 858, - "src": "1039:41:8", + "scope": 884, + "src": "1136:41:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -1602,23 +1798,23 @@ { "body": null, "documentation": null, - "id": 846, + "id": 872, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 842, + "id": 868, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 839, + "id": 865, "name": "", "nodeType": "VariableDeclaration", - "scope": 846, - "src": "1103:7:8", + "scope": 872, + "src": "1200:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1626,10 +1822,10 @@ "typeString": "address" }, "typeName": { - "id": 838, + "id": 864, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1103:7:8", + "src": "1200:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1641,11 +1837,11 @@ }, { "constant": false, - "id": 841, + "id": 867, "name": "", "nodeType": "VariableDeclaration", - "scope": 846, - "src": "1112:4:8", + "scope": 872, + "src": "1209:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1653,10 +1849,10 @@ "typeString": "uint256" }, "typeName": { - "id": 840, + "id": 866, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1112:4:8", + "src": "1209:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1666,19 +1862,19 @@ "visibility": "internal" } ], - "src": "1102:15:8" + "src": "1199:15:8" }, "returnParameters": { - "id": 845, + "id": 871, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 844, + "id": 870, "name": "", "nodeType": "VariableDeclaration", - "scope": 846, - "src": "1136:4:8", + "scope": 872, + "src": "1233:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1686,10 +1882,10 @@ "typeString": "bool" }, "typeName": { - "id": 843, + "id": 869, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1136:4:8", + "src": "1233:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1699,10 +1895,10 @@ "visibility": "internal" } ], - "src": "1135:6:8" + "src": "1232:6:8" }, - "scope": 858, - "src": "1085:57:8", + "scope": 884, + "src": "1182:57:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -1710,23 +1906,23 @@ { "body": null, "documentation": null, - "id": 857, + "id": 883, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 853, + "id": 879, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 848, + "id": 874, "name": "", "nodeType": "VariableDeclaration", - "scope": 857, - "src": "1169:7:8", + "scope": 883, + "src": "1266:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1734,10 +1930,10 @@ "typeString": "address" }, "typeName": { - "id": 847, + "id": 873, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1169:7:8", + "src": "1266:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1749,11 +1945,11 @@ }, { "constant": false, - "id": 850, + "id": 876, "name": "", "nodeType": "VariableDeclaration", - "scope": 857, - "src": "1178:7:8", + "scope": 883, + "src": "1275:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1761,10 +1957,10 @@ "typeString": "address" }, "typeName": { - "id": 849, + "id": 875, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1178:7:8", + "src": "1275:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1776,11 +1972,11 @@ }, { "constant": false, - "id": 852, + "id": 878, "name": "", "nodeType": "VariableDeclaration", - "scope": 857, - "src": "1187:4:8", + "scope": 883, + "src": "1284:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1788,10 +1984,10 @@ "typeString": "uint256" }, "typeName": { - "id": 851, + "id": 877, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1187:4:8", + "src": "1284:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1801,19 +1997,19 @@ "visibility": "internal" } ], - "src": "1168:24:8" + "src": "1265:24:8" }, "returnParameters": { - "id": 856, + "id": 882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 855, + "id": 881, "name": "", "nodeType": "VariableDeclaration", - "scope": 857, - "src": "1211:4:8", + "scope": 883, + "src": "1308:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1821,10 +2017,10 @@ "typeString": "bool" }, "typeName": { - "id": 854, + "id": 880, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1211:4:8", + "src": "1308:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1834,33 +2030,33 @@ "visibility": "internal" } ], - "src": "1210:6:8" + "src": "1307:6:8" }, - "scope": 858, - "src": "1147:70:8", + "scope": 884, + "src": "1244:70:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 859, - "src": "25:1194:8" + "scope": 885, + "src": "25:1291:8" } ], - "src": "0:1219:8" + "src": "0:1316:8" }, "legacyAST": { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICToken.sol", "exportedSymbols": { "ICToken": [ - 858 + 884 ] }, - "id": 859, + "id": 885, "nodeType": "SourceUnit", "nodes": [ { - "id": 734, + "id": 747, "literals": [ "solidity", "0.5", @@ -1875,9 +2071,9 @@ "contractKind": "interface", "documentation": null, "fullyImplemented": false, - "id": 858, + "id": 884, "linearizedBaseContracts": [ - 858 + 884 ], "name": "ICToken", "nodeType": "ContractDefinition", @@ -1885,22 +2081,22 @@ { "body": null, "documentation": null, - "id": 741, + "id": 754, "implemented": false, "kind": "function", "modifiers": [], "name": "mint", "nodeType": "FunctionDefinition", "parameters": { - "id": 737, + "id": 750, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 736, + "id": 749, "name": "mintAmount", "nodeType": "VariableDeclaration", - "scope": 741, + "scope": 754, "src": "63:15:8", "stateVariable": false, "storageLocation": "default", @@ -1909,7 +2105,7 @@ "typeString": "uint256" }, "typeName": { - "id": 735, + "id": 748, "name": "uint", "nodeType": "ElementaryTypeName", "src": "63:4:8", @@ -1925,15 +2121,15 @@ "src": "62:17:8" }, "returnParameters": { - "id": 740, + "id": 753, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 739, + "id": 752, "name": "", "nodeType": "VariableDeclaration", - "scope": 741, + "scope": 754, "src": "98:4:8", "stateVariable": false, "storageLocation": "default", @@ -1942,7 +2138,7 @@ "typeString": "uint256" }, "typeName": { - "id": 738, + "id": 751, "name": "uint", "nodeType": "ElementaryTypeName", "src": "98:4:8", @@ -1957,7 +2153,7 @@ ], "src": "97:6:8" }, - "scope": 858, + "scope": 884, "src": "49:55:8", "stateMutability": "nonpayable", "superFunction": null, @@ -1966,22 +2162,22 @@ { "body": null, "documentation": null, - "id": 748, + "id": 761, "implemented": false, "kind": "function", "modifiers": [], "name": "redeem", "nodeType": "FunctionDefinition", "parameters": { - "id": 744, + "id": 757, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 743, + "id": 756, "name": "redeemTokens", "nodeType": "VariableDeclaration", - "scope": 748, + "scope": 761, "src": "125:17:8", "stateVariable": false, "storageLocation": "default", @@ -1990,7 +2186,7 @@ "typeString": "uint256" }, "typeName": { - "id": 742, + "id": 755, "name": "uint", "nodeType": "ElementaryTypeName", "src": "125:4:8", @@ -2006,15 +2202,15 @@ "src": "124:19:8" }, "returnParameters": { - "id": 747, + "id": 760, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 746, + "id": 759, "name": "", "nodeType": "VariableDeclaration", - "scope": 748, + "scope": 761, "src": "162:4:8", "stateVariable": false, "storageLocation": "default", @@ -2023,7 +2219,7 @@ "typeString": "uint256" }, "typeName": { - "id": 745, + "id": 758, "name": "uint", "nodeType": "ElementaryTypeName", "src": "162:4:8", @@ -2038,7 +2234,7 @@ ], "src": "161:6:8" }, - "scope": 858, + "scope": 884, "src": "109:59:8", "stateMutability": "nonpayable", "superFunction": null, @@ -2047,22 +2243,22 @@ { "body": null, "documentation": null, - "id": 755, + "id": 768, "implemented": false, "kind": "function", "modifiers": [], "name": "redeemUnderlying", "nodeType": "FunctionDefinition", "parameters": { - "id": 751, + "id": 764, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 750, + "id": 763, "name": "redeemAmount", "nodeType": "VariableDeclaration", - "scope": 755, + "scope": 768, "src": "199:17:8", "stateVariable": false, "storageLocation": "default", @@ -2071,7 +2267,7 @@ "typeString": "uint256" }, "typeName": { - "id": 749, + "id": 762, "name": "uint", "nodeType": "ElementaryTypeName", "src": "199:4:8", @@ -2087,15 +2283,15 @@ "src": "198:19:8" }, "returnParameters": { - "id": 754, + "id": 767, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 753, + "id": 766, "name": "", "nodeType": "VariableDeclaration", - "scope": 755, + "scope": 768, "src": "236:4:8", "stateVariable": false, "storageLocation": "default", @@ -2104,7 +2300,7 @@ "typeString": "uint256" }, "typeName": { - "id": 752, + "id": 765, "name": "uint", "nodeType": "ElementaryTypeName", "src": "236:4:8", @@ -2119,7 +2315,7 @@ ], "src": "235:6:8" }, - "scope": 858, + "scope": 884, "src": "173:69:8", "stateMutability": "nonpayable", "superFunction": null, @@ -2128,22 +2324,22 @@ { "body": null, "documentation": null, - "id": 762, + "id": 775, "implemented": false, "kind": "function", "modifiers": [], "name": "borrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 758, + "id": 771, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 757, + "id": 770, "name": "borrowAmount", "nodeType": "VariableDeclaration", - "scope": 762, + "scope": 775, "src": "263:17:8", "stateVariable": false, "storageLocation": "default", @@ -2152,7 +2348,7 @@ "typeString": "uint256" }, "typeName": { - "id": 756, + "id": 769, "name": "uint", "nodeType": "ElementaryTypeName", "src": "263:4:8", @@ -2168,15 +2364,15 @@ "src": "262:19:8" }, "returnParameters": { - "id": 761, + "id": 774, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 760, + "id": 773, "name": "", "nodeType": "VariableDeclaration", - "scope": 762, + "scope": 775, "src": "300:4:8", "stateVariable": false, "storageLocation": "default", @@ -2185,7 +2381,7 @@ "typeString": "uint256" }, "typeName": { - "id": 759, + "id": 772, "name": "uint", "nodeType": "ElementaryTypeName", "src": "300:4:8", @@ -2200,7 +2396,7 @@ ], "src": "299:6:8" }, - "scope": 858, + "scope": 884, "src": "247:59:8", "stateMutability": "nonpayable", "superFunction": null, @@ -2209,22 +2405,22 @@ { "body": null, "documentation": null, - "id": 769, + "id": 782, "implemented": false, "kind": "function", "modifiers": [], "name": "repayBorrow", "nodeType": "FunctionDefinition", "parameters": { - "id": 765, + "id": 778, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 764, + "id": 777, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 769, + "scope": 782, "src": "332:16:8", "stateVariable": false, "storageLocation": "default", @@ -2233,7 +2429,7 @@ "typeString": "uint256" }, "typeName": { - "id": 763, + "id": 776, "name": "uint", "nodeType": "ElementaryTypeName", "src": "332:4:8", @@ -2249,15 +2445,15 @@ "src": "331:18:8" }, "returnParameters": { - "id": 768, + "id": 781, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 767, + "id": 780, "name": "", "nodeType": "VariableDeclaration", - "scope": 769, + "scope": 782, "src": "368:4:8", "stateVariable": false, "storageLocation": "default", @@ -2266,7 +2462,7 @@ "typeString": "uint256" }, "typeName": { - "id": 766, + "id": 779, "name": "uint", "nodeType": "ElementaryTypeName", "src": "368:4:8", @@ -2281,7 +2477,7 @@ ], "src": "367:6:8" }, - "scope": 858, + "scope": 884, "src": "311:63:8", "stateMutability": "nonpayable", "superFunction": null, @@ -2290,22 +2486,22 @@ { "body": null, "documentation": null, - "id": 778, + "id": 791, "implemented": false, "kind": "function", "modifiers": [], "name": "repayBorrowBehalf", "nodeType": "FunctionDefinition", "parameters": { - "id": 774, + "id": 787, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 771, + "id": 784, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 778, + "scope": 791, "src": "406:16:8", "stateVariable": false, "storageLocation": "default", @@ -2314,7 +2510,7 @@ "typeString": "address" }, "typeName": { - "id": 770, + "id": 783, "name": "address", "nodeType": "ElementaryTypeName", "src": "406:7:8", @@ -2329,10 +2525,10 @@ }, { "constant": false, - "id": 773, + "id": 786, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 778, + "scope": 791, "src": "424:16:8", "stateVariable": false, "storageLocation": "default", @@ -2341,7 +2537,7 @@ "typeString": "uint256" }, "typeName": { - "id": 772, + "id": 785, "name": "uint", "nodeType": "ElementaryTypeName", "src": "424:4:8", @@ -2357,15 +2553,15 @@ "src": "405:36:8" }, "returnParameters": { - "id": 777, + "id": 790, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 776, + "id": 789, "name": "", "nodeType": "VariableDeclaration", - "scope": 778, + "scope": 791, "src": "460:4:8", "stateVariable": false, "storageLocation": "default", @@ -2374,7 +2570,7 @@ "typeString": "uint256" }, "typeName": { - "id": 775, + "id": 788, "name": "uint", "nodeType": "ElementaryTypeName", "src": "460:4:8", @@ -2389,7 +2585,7 @@ ], "src": "459:6:8" }, - "scope": 858, + "scope": 884, "src": "379:87:8", "stateMutability": "nonpayable", "superFunction": null, @@ -2398,28 +2594,28 @@ { "body": null, "documentation": null, - "id": 783, + "id": 796, "implemented": false, "kind": "function", "modifiers": [], "name": "exchangeRateCurrent", "nodeType": "FunctionDefinition", "parameters": { - "id": 779, + "id": 792, "nodeType": "ParameterList", "parameters": [], "src": "499:2:8" }, "returnParameters": { - "id": 782, + "id": 795, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 781, + "id": 794, "name": "", "nodeType": "VariableDeclaration", - "scope": 783, + "scope": 796, "src": "520:4:8", "stateVariable": false, "storageLocation": "default", @@ -2428,7 +2624,7 @@ "typeString": "uint256" }, "typeName": { - "id": 780, + "id": 793, "name": "uint", "nodeType": "ElementaryTypeName", "src": "520:4:8", @@ -2443,7 +2639,7 @@ ], "src": "519:6:8" }, - "scope": 858, + "scope": 884, "src": "471:55:8", "stateMutability": "nonpayable", "superFunction": null, @@ -2452,22 +2648,22 @@ { "body": null, "documentation": null, - "id": 790, + "id": 803, "implemented": false, "kind": "function", "modifiers": [], "name": "borrowBalanceCurrent", "nodeType": "FunctionDefinition", "parameters": { - "id": 786, + "id": 799, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 785, + "id": 798, "name": "account", "nodeType": "VariableDeclaration", - "scope": 790, + "scope": 803, "src": "561:15:8", "stateVariable": false, "storageLocation": "default", @@ -2476,7 +2672,7 @@ "typeString": "address" }, "typeName": { - "id": 784, + "id": 797, "name": "address", "nodeType": "ElementaryTypeName", "src": "561:7:8", @@ -2493,15 +2689,15 @@ "src": "560:17:8" }, "returnParameters": { - "id": 789, + "id": 802, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 788, + "id": 801, "name": "", "nodeType": "VariableDeclaration", - "scope": 790, + "scope": 803, "src": "596:4:8", "stateVariable": false, "storageLocation": "default", @@ -2510,7 +2706,7 @@ "typeString": "uint256" }, "typeName": { - "id": 787, + "id": 800, "name": "uint", "nodeType": "ElementaryTypeName", "src": "596:4:8", @@ -2525,7 +2721,7 @@ ], "src": "595:6:8" }, - "scope": 858, + "scope": 884, "src": "531:71:8", "stateMutability": "nonpayable", "superFunction": null, @@ -2534,22 +2730,22 @@ { "body": null, "documentation": null, - "id": 797, + "id": 810, "implemented": false, "kind": "function", "modifiers": [], "name": "borrowBalanceStored", "nodeType": "FunctionDefinition", "parameters": { - "id": 793, + "id": 806, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 792, + "id": 805, "name": "account", "nodeType": "VariableDeclaration", - "scope": 797, + "scope": 810, "src": "636:15:8", "stateVariable": false, "storageLocation": "default", @@ -2558,7 +2754,7 @@ "typeString": "address" }, "typeName": { - "id": 791, + "id": 804, "name": "address", "nodeType": "ElementaryTypeName", "src": "636:7:8", @@ -2575,15 +2771,15 @@ "src": "635:17:8" }, "returnParameters": { - "id": 796, + "id": 809, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 795, + "id": 808, "name": "", "nodeType": "VariableDeclaration", - "scope": 797, + "scope": 810, "src": "676:7:8", "stateVariable": false, "storageLocation": "default", @@ -2592,7 +2788,7 @@ "typeString": "uint256" }, "typeName": { - "id": 794, + "id": 807, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "676:7:8", @@ -2607,7 +2803,7 @@ ], "src": "675:9:8" }, - "scope": 858, + "scope": 884, "src": "607:78:8", "stateMutability": "view", "superFunction": null, @@ -2616,22 +2812,22 @@ { "body": null, "documentation": null, - "id": 804, + "id": 817, "implemented": false, "kind": "function", "modifiers": [], "name": "balanceOfUnderlying", "nodeType": "FunctionDefinition", "parameters": { - "id": 800, + "id": 813, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 799, + "id": 812, "name": "account", "nodeType": "VariableDeclaration", - "scope": 804, + "scope": 817, "src": "719:15:8", "stateVariable": false, "storageLocation": "default", @@ -2640,7 +2836,7 @@ "typeString": "address" }, "typeName": { - "id": 798, + "id": 811, "name": "address", "nodeType": "ElementaryTypeName", "src": "719:7:8", @@ -2657,15 +2853,15 @@ "src": "718:17:8" }, "returnParameters": { - "id": 803, + "id": 816, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 802, + "id": 815, "name": "", "nodeType": "VariableDeclaration", - "scope": 804, + "scope": 817, "src": "754:4:8", "stateVariable": false, "storageLocation": "default", @@ -2674,7 +2870,7 @@ "typeString": "uint256" }, "typeName": { - "id": 801, + "id": 814, "name": "uint", "nodeType": "ElementaryTypeName", "src": "754:4:8", @@ -2689,7 +2885,7 @@ ], "src": "753:6:8" }, - "scope": 858, + "scope": 884, "src": "690:70:8", "stateMutability": "nonpayable", "superFunction": null, @@ -2698,29 +2894,189 @@ { "body": null, "documentation": null, - "id": 809, + "id": 830, + "implemented": false, + "kind": "function", + "modifiers": [], + "name": "getAccountSnapshot", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 820, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 819, + "name": "account", + "nodeType": "VariableDeclaration", + "scope": 830, + "src": "793:15:8", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 818, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "793:7:8", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "792:17:8" + }, + "returnParameters": { + "id": 829, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 822, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 830, + "src": "833:4:8", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 821, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "833:4:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 824, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 830, + "src": "839:4:8", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 823, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "839:4:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 826, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 830, + "src": "845:4:8", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 825, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "845:4:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 828, + "name": "", + "nodeType": "VariableDeclaration", + "scope": 830, + "src": "851:4:8", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + "typeName": { + "id": 827, + "name": "uint", + "nodeType": "ElementaryTypeName", + "src": "851:4:8", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "832:24:8" + }, + "scope": 884, + "src": "765:92:8", + "stateMutability": "view", + "superFunction": null, + "visibility": "external" + }, + { + "body": null, + "documentation": null, + "id": 835, "implemented": false, "kind": "function", "modifiers": [], "name": "underlying", "nodeType": "FunctionDefinition", "parameters": { - "id": 805, + "id": 831, "nodeType": "ParameterList", "parameters": [], - "src": "789:2:8" + "src": "886:2:8" }, "returnParameters": { - "id": 808, + "id": 834, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 807, + "id": 833, "name": "", "nodeType": "VariableDeclaration", - "scope": 809, - "src": "815:7:8", + "scope": 835, + "src": "912:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2728,10 +3084,10 @@ "typeString": "address" }, "typeName": { - "id": 806, + "id": 832, "name": "address", "nodeType": "ElementaryTypeName", - "src": "815:7:8", + "src": "912:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2742,10 +3098,10 @@ "visibility": "internal" } ], - "src": "814:9:8" + "src": "911:9:8" }, - "scope": 858, - "src": "770:54:8", + "scope": 884, + "src": "867:54:8", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -2753,29 +3109,29 @@ { "body": null, "documentation": null, - "id": 814, + "id": 840, "implemented": false, "kind": "function", "modifiers": [], "name": "totalSupply", "nodeType": "FunctionDefinition", "parameters": { - "id": 810, + "id": 836, "nodeType": "ParameterList", "parameters": [], - "src": "849:2:8" + "src": "946:2:8" }, "returnParameters": { - "id": 813, + "id": 839, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 812, + "id": 838, "name": "", "nodeType": "VariableDeclaration", - "scope": 814, - "src": "875:7:8", + "scope": 840, + "src": "972:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2783,10 +3139,10 @@ "typeString": "uint256" }, "typeName": { - "id": 811, + "id": 837, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "875:7:8", + "src": "972:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2796,10 +3152,10 @@ "visibility": "internal" } ], - "src": "874:9:8" + "src": "971:9:8" }, - "scope": 858, - "src": "829:55:8", + "scope": 884, + "src": "926:55:8", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -2807,23 +3163,23 @@ { "body": null, "documentation": null, - "id": 821, + "id": 847, "implemented": false, "kind": "function", "modifiers": [], "name": "balanceOf", "nodeType": "FunctionDefinition", "parameters": { - "id": 817, + "id": 843, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 816, + "id": 842, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 821, - "src": "908:13:8", + "scope": 847, + "src": "1005:13:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2831,10 +3187,10 @@ "typeString": "address" }, "typeName": { - "id": 815, + "id": 841, "name": "address", "nodeType": "ElementaryTypeName", - "src": "908:7:8", + "src": "1005:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2845,19 +3201,19 @@ "visibility": "internal" } ], - "src": "907:15:8" + "src": "1004:15:8" }, "returnParameters": { - "id": 820, + "id": 846, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 819, + "id": 845, "name": "balance", "nodeType": "VariableDeclaration", - "scope": 821, - "src": "946:15:8", + "scope": 847, + "src": "1043:15:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2865,10 +3221,10 @@ "typeString": "uint256" }, "typeName": { - "id": 818, + "id": 844, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "946:7:8", + "src": "1043:7:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2878,10 +3234,10 @@ "visibility": "internal" } ], - "src": "945:17:8" + "src": "1042:17:8" }, - "scope": 858, - "src": "889:74:8", + "scope": 884, + "src": "986:74:8", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -2889,23 +3245,23 @@ { "body": null, "documentation": null, - "id": 830, + "id": 856, "implemented": false, "kind": "function", "modifiers": [], "name": "allowance", "nodeType": "FunctionDefinition", "parameters": { - "id": 826, + "id": 852, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 823, + "id": 849, "name": "", "nodeType": "VariableDeclaration", - "scope": 830, - "src": "987:7:8", + "scope": 856, + "src": "1084:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2913,10 +3269,10 @@ "typeString": "address" }, "typeName": { - "id": 822, + "id": 848, "name": "address", "nodeType": "ElementaryTypeName", - "src": "987:7:8", + "src": "1084:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2928,11 +3284,11 @@ }, { "constant": false, - "id": 825, + "id": 851, "name": "", "nodeType": "VariableDeclaration", - "scope": 830, - "src": "996:7:8", + "scope": 856, + "src": "1093:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2940,10 +3296,10 @@ "typeString": "address" }, "typeName": { - "id": 824, + "id": 850, "name": "address", "nodeType": "ElementaryTypeName", - "src": "996:7:8", + "src": "1093:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2954,19 +3310,19 @@ "visibility": "internal" } ], - "src": "986:18:8" + "src": "1083:18:8" }, "returnParameters": { - "id": 829, + "id": 855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 828, + "id": 854, "name": "", "nodeType": "VariableDeclaration", - "scope": 830, - "src": "1028:4:8", + "scope": 856, + "src": "1125:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2974,10 +3330,10 @@ "typeString": "uint256" }, "typeName": { - "id": 827, + "id": 853, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1028:4:8", + "src": "1125:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2987,10 +3343,10 @@ "visibility": "internal" } ], - "src": "1027:6:8" + "src": "1124:6:8" }, - "scope": 858, - "src": "968:66:8", + "scope": 884, + "src": "1065:66:8", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -2998,23 +3354,23 @@ { "body": null, "documentation": null, - "id": 837, + "id": 863, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 835, + "id": 861, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 832, + "id": 858, "name": "", "nodeType": "VariableDeclaration", - "scope": 837, - "src": "1056:7:8", + "scope": 863, + "src": "1153:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3022,10 +3378,10 @@ "typeString": "address" }, "typeName": { - "id": 831, + "id": 857, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1056:7:8", + "src": "1153:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3037,11 +3393,11 @@ }, { "constant": false, - "id": 834, + "id": 860, "name": "", "nodeType": "VariableDeclaration", - "scope": 837, - "src": "1065:4:8", + "scope": 863, + "src": "1162:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3049,10 +3405,10 @@ "typeString": "uint256" }, "typeName": { - "id": 833, + "id": 859, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1065:4:8", + "src": "1162:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3062,16 +3418,16 @@ "visibility": "internal" } ], - "src": "1055:15:8" + "src": "1152:15:8" }, "returnParameters": { - "id": 836, + "id": 862, "nodeType": "ParameterList", "parameters": [], - "src": "1079:0:8" + "src": "1176:0:8" }, - "scope": 858, - "src": "1039:41:8", + "scope": 884, + "src": "1136:41:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -3079,23 +3435,23 @@ { "body": null, "documentation": null, - "id": 846, + "id": 872, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 842, + "id": 868, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 839, + "id": 865, "name": "", "nodeType": "VariableDeclaration", - "scope": 846, - "src": "1103:7:8", + "scope": 872, + "src": "1200:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3103,10 +3459,10 @@ "typeString": "address" }, "typeName": { - "id": 838, + "id": 864, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1103:7:8", + "src": "1200:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3118,11 +3474,11 @@ }, { "constant": false, - "id": 841, + "id": 867, "name": "", "nodeType": "VariableDeclaration", - "scope": 846, - "src": "1112:4:8", + "scope": 872, + "src": "1209:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3130,10 +3486,10 @@ "typeString": "uint256" }, "typeName": { - "id": 840, + "id": 866, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1112:4:8", + "src": "1209:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3143,19 +3499,19 @@ "visibility": "internal" } ], - "src": "1102:15:8" + "src": "1199:15:8" }, "returnParameters": { - "id": 845, + "id": 871, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 844, + "id": 870, "name": "", "nodeType": "VariableDeclaration", - "scope": 846, - "src": "1136:4:8", + "scope": 872, + "src": "1233:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3163,10 +3519,10 @@ "typeString": "bool" }, "typeName": { - "id": 843, + "id": 869, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1136:4:8", + "src": "1233:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3176,10 +3532,10 @@ "visibility": "internal" } ], - "src": "1135:6:8" + "src": "1232:6:8" }, - "scope": 858, - "src": "1085:57:8", + "scope": 884, + "src": "1182:57:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -3187,23 +3543,23 @@ { "body": null, "documentation": null, - "id": 857, + "id": 883, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 853, + "id": 879, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 848, + "id": 874, "name": "", "nodeType": "VariableDeclaration", - "scope": 857, - "src": "1169:7:8", + "scope": 883, + "src": "1266:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3211,10 +3567,10 @@ "typeString": "address" }, "typeName": { - "id": 847, + "id": 873, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1169:7:8", + "src": "1266:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3226,11 +3582,11 @@ }, { "constant": false, - "id": 850, + "id": 876, "name": "", "nodeType": "VariableDeclaration", - "scope": 857, - "src": "1178:7:8", + "scope": 883, + "src": "1275:7:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3238,10 +3594,10 @@ "typeString": "address" }, "typeName": { - "id": 849, + "id": 875, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1178:7:8", + "src": "1275:7:8", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3253,11 +3609,11 @@ }, { "constant": false, - "id": 852, + "id": 878, "name": "", "nodeType": "VariableDeclaration", - "scope": 857, - "src": "1187:4:8", + "scope": 883, + "src": "1284:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3265,10 +3621,10 @@ "typeString": "uint256" }, "typeName": { - "id": 851, + "id": 877, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "1187:4:8", + "src": "1284:4:8", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3278,19 +3634,19 @@ "visibility": "internal" } ], - "src": "1168:24:8" + "src": "1265:24:8" }, "returnParameters": { - "id": 856, + "id": 882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 855, + "id": 881, "name": "", "nodeType": "VariableDeclaration", - "scope": 857, - "src": "1211:4:8", + "scope": 883, + "src": "1308:4:8", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3298,10 +3654,10 @@ "typeString": "bool" }, "typeName": { - "id": 854, + "id": 880, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "1211:4:8", + "src": "1308:4:8", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3311,20 +3667,20 @@ "visibility": "internal" } ], - "src": "1210:6:8" + "src": "1307:6:8" }, - "scope": 858, - "src": "1147:70:8", + "scope": 884, + "src": "1244:70:8", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 859, - "src": "25:1194:8" + "scope": 885, + "src": "25:1291:8" } ], - "src": "0:1219:8" + "src": "0:1316:8" }, "compiler": { "name": "solc", @@ -3332,7 +3688,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.466Z", + "updatedAt": "2020-04-08T12:21:13.679Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/ICompoundPriceOracle.json b/packages/smart-contracts/artifacts/ICompoundPriceOracle.json index 6c6b500..81e2c1f 100644 --- a/packages/smart-contracts/artifacts/ICompoundPriceOracle.json +++ b/packages/smart-contracts/artifacts/ICompoundPriceOracle.json @@ -34,14 +34,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICompoundPriceOracle.sol", "exportedSymbols": { "ICompoundPriceOracle": [ - 868 + 894 ] }, - "id": 869, + "id": 895, "nodeType": "SourceUnit", "nodes": [ { - "id": 860, + "id": 886, "literals": [ "solidity", "0.5", @@ -56,9 +56,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 868, + "id": 894, "linearizedBaseContracts": [ - 868 + 894 ], "name": "ICompoundPriceOracle", "nodeType": "ContractDefinition", @@ -66,22 +66,22 @@ { "body": null, "documentation": null, - "id": 867, + "id": 893, "implemented": false, "kind": "function", "modifiers": [], "name": "getUnderlyingPrice", "nodeType": "FunctionDefinition", "parameters": { - "id": 863, + "id": 889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 862, + "id": 888, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 867, + "scope": 893, "src": "89:14:9", "stateVariable": false, "storageLocation": "default", @@ -90,7 +90,7 @@ "typeString": "address" }, "typeName": { - "id": 861, + "id": 887, "name": "address", "nodeType": "ElementaryTypeName", "src": "89:7:9", @@ -107,15 +107,15 @@ "src": "88:16:9" }, "returnParameters": { - "id": 866, + "id": 892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 865, + "id": 891, "name": "", "nodeType": "VariableDeclaration", - "scope": 867, + "scope": 893, "src": "128:7:9", "stateVariable": false, "storageLocation": "default", @@ -124,7 +124,7 @@ "typeString": "uint256" }, "typeName": { - "id": 864, + "id": 890, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "128:7:9", @@ -139,14 +139,14 @@ ], "src": "127:9:9" }, - "scope": 868, + "scope": 894, "src": "61:76:9", "stateMutability": "view", "superFunction": null, "visibility": "external" } ], - "scope": 869, + "scope": 895, "src": "25:114:9" } ], @@ -156,14 +156,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/ICompoundPriceOracle.sol", "exportedSymbols": { "ICompoundPriceOracle": [ - 868 + 894 ] }, - "id": 869, + "id": 895, "nodeType": "SourceUnit", "nodes": [ { - "id": 860, + "id": 886, "literals": [ "solidity", "0.5", @@ -178,9 +178,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 868, + "id": 894, "linearizedBaseContracts": [ - 868 + 894 ], "name": "ICompoundPriceOracle", "nodeType": "ContractDefinition", @@ -188,22 +188,22 @@ { "body": null, "documentation": null, - "id": 867, + "id": 893, "implemented": false, "kind": "function", "modifiers": [], "name": "getUnderlyingPrice", "nodeType": "FunctionDefinition", "parameters": { - "id": 863, + "id": 889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 862, + "id": 888, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 867, + "scope": 893, "src": "89:14:9", "stateVariable": false, "storageLocation": "default", @@ -212,7 +212,7 @@ "typeString": "address" }, "typeName": { - "id": 861, + "id": 887, "name": "address", "nodeType": "ElementaryTypeName", "src": "89:7:9", @@ -229,15 +229,15 @@ "src": "88:16:9" }, "returnParameters": { - "id": 866, + "id": 892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 865, + "id": 891, "name": "", "nodeType": "VariableDeclaration", - "scope": 867, + "scope": 893, "src": "128:7:9", "stateVariable": false, "storageLocation": "default", @@ -246,7 +246,7 @@ "typeString": "uint256" }, "typeName": { - "id": 864, + "id": 890, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "128:7:9", @@ -261,14 +261,14 @@ ], "src": "127:9:9" }, - "scope": 868, + "scope": 894, "src": "61:76:9", "stateMutability": "view", "superFunction": null, "visibility": "external" } ], - "scope": 869, + "scope": 895, "src": "25:114:9" } ], @@ -280,7 +280,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.468Z", + "updatedAt": "2020-04-08T12:21:13.680Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/IComptroller.json b/packages/smart-contracts/artifacts/IComptroller.json index 3f9740d..9d80b1d 100644 --- a/packages/smart-contracts/artifacts/IComptroller.json +++ b/packages/smart-contracts/artifacts/IComptroller.json @@ -630,14 +630,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", "exportedSymbols": { "IComptroller": [ - 1096 + 1122 ] }, - "id": 1097, + "id": 1123, "nodeType": "SourceUnit", "nodes": [ { - "id": 870, + "id": 896, "literals": [ "solidity", "0.5", @@ -652,9 +652,9 @@ "contractKind": "interface", "documentation": null, "fullyImplemented": false, - "id": 1096, + "id": 1122, "linearizedBaseContracts": [ - 1096 + 1122 ], "name": "IComptroller", "nodeType": "ContractDefinition", @@ -662,28 +662,28 @@ { "body": null, "documentation": "@notice Marker function used for light validation when updating the comptroller of a market\n@dev Implementations should simply return true.\n@return true", - "id": 875, + "id": 901, "implemented": false, "kind": "function", "modifiers": [], "name": "isComptroller", "nodeType": "FunctionDefinition", "parameters": { - "id": 871, + "id": 897, "nodeType": "ParameterList", "parameters": [], "src": "266:2:10" }, "returnParameters": { - "id": 874, + "id": 900, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 873, + "id": 899, "name": "", "nodeType": "VariableDeclaration", - "scope": 875, + "scope": 901, "src": "292:4:10", "stateVariable": false, "storageLocation": "default", @@ -692,7 +692,7 @@ "typeString": "bool" }, "typeName": { - "id": 872, + "id": 898, "name": "bool", "nodeType": "ElementaryTypeName", "src": "292:4:10", @@ -707,7 +707,7 @@ ], "src": "291:6:10" }, - "scope": 1096, + "scope": 1122, "src": "244:54:10", "stateMutability": "view", "superFunction": null, @@ -716,22 +716,22 @@ { "body": null, "documentation": "* Assets You Are In **", - "id": 884, + "id": 910, "implemented": false, "kind": "function", "modifiers": [], "name": "enterMarkets", "nodeType": "FunctionDefinition", "parameters": { - "id": 879, + "id": 905, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 878, + "id": 904, "name": "cTokens", "nodeType": "VariableDeclaration", - "scope": 884, + "scope": 910, "src": "359:26:10", "stateVariable": false, "storageLocation": "calldata", @@ -741,7 +741,7 @@ }, "typeName": { "baseType": { - "id": 876, + "id": 902, "name": "address", "nodeType": "ElementaryTypeName", "src": "359:7:10", @@ -751,7 +751,7 @@ "typeString": "address" } }, - "id": 877, + "id": 903, "length": null, "nodeType": "ArrayTypeName", "src": "359:9:10", @@ -767,15 +767,15 @@ "src": "358:28:10" }, "returnParameters": { - "id": 883, + "id": 909, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 882, + "id": 908, "name": "", "nodeType": "VariableDeclaration", - "scope": 884, + "scope": 910, "src": "405:13:10", "stateVariable": false, "storageLocation": "memory", @@ -785,7 +785,7 @@ }, "typeName": { "baseType": { - "id": 880, + "id": 906, "name": "uint", "nodeType": "ElementaryTypeName", "src": "405:4:10", @@ -794,7 +794,7 @@ "typeString": "uint256" } }, - "id": 881, + "id": 907, "length": null, "nodeType": "ArrayTypeName", "src": "405:6:10", @@ -809,7 +809,7 @@ ], "src": "404:15:10" }, - "scope": 1096, + "scope": 1122, "src": "337:83:10", "stateMutability": "nonpayable", "superFunction": null, @@ -818,22 +818,22 @@ { "body": null, "documentation": null, - "id": 891, + "id": 917, "implemented": false, "kind": "function", "modifiers": [], "name": "exitMarket", "nodeType": "FunctionDefinition", "parameters": { - "id": 887, + "id": 913, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 886, + "id": 912, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 891, + "scope": 917, "src": "445:14:10", "stateVariable": false, "storageLocation": "default", @@ -842,7 +842,7 @@ "typeString": "address" }, "typeName": { - "id": 885, + "id": 911, "name": "address", "nodeType": "ElementaryTypeName", "src": "445:7:10", @@ -859,15 +859,15 @@ "src": "444:16:10" }, "returnParameters": { - "id": 890, + "id": 916, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 889, + "id": 915, "name": "", "nodeType": "VariableDeclaration", - "scope": 891, + "scope": 917, "src": "479:4:10", "stateVariable": false, "storageLocation": "default", @@ -876,7 +876,7 @@ "typeString": "uint256" }, "typeName": { - "id": 888, + "id": 914, "name": "uint", "nodeType": "ElementaryTypeName", "src": "479:4:10", @@ -891,7 +891,7 @@ ], "src": "478:6:10" }, - "scope": 1096, + "scope": 1122, "src": "425:60:10", "stateMutability": "nonpayable", "superFunction": null, @@ -900,22 +900,22 @@ { "body": null, "documentation": "* Policy Hooks **", - "id": 902, + "id": 928, "implemented": false, "kind": "function", "modifiers": [], "name": "getAccountLiquidity", "nodeType": "FunctionDefinition", "parameters": { - "id": 894, + "id": 920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 893, + "id": 919, "name": "account", "nodeType": "VariableDeclaration", - "scope": 902, + "scope": 928, "src": "548:15:10", "stateVariable": false, "storageLocation": "default", @@ -924,7 +924,7 @@ "typeString": "address" }, "typeName": { - "id": 892, + "id": 918, "name": "address", "nodeType": "ElementaryTypeName", "src": "548:7:10", @@ -941,15 +941,15 @@ "src": "547:17:10" }, "returnParameters": { - "id": 901, + "id": 927, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 896, + "id": 922, "name": "", "nodeType": "VariableDeclaration", - "scope": 902, + "scope": 928, "src": "588:4:10", "stateVariable": false, "storageLocation": "default", @@ -958,7 +958,7 @@ "typeString": "uint256" }, "typeName": { - "id": 895, + "id": 921, "name": "uint", "nodeType": "ElementaryTypeName", "src": "588:4:10", @@ -972,10 +972,10 @@ }, { "constant": false, - "id": 898, + "id": 924, "name": "", "nodeType": "VariableDeclaration", - "scope": 902, + "scope": 928, "src": "594:4:10", "stateVariable": false, "storageLocation": "default", @@ -984,7 +984,7 @@ "typeString": "uint256" }, "typeName": { - "id": 897, + "id": 923, "name": "uint", "nodeType": "ElementaryTypeName", "src": "594:4:10", @@ -998,10 +998,10 @@ }, { "constant": false, - "id": 900, + "id": 926, "name": "", "nodeType": "VariableDeclaration", - "scope": 902, + "scope": 928, "src": "600:4:10", "stateVariable": false, "storageLocation": "default", @@ -1010,7 +1010,7 @@ "typeString": "uint256" }, "typeName": { - "id": 899, + "id": 925, "name": "uint", "nodeType": "ElementaryTypeName", "src": "600:4:10", @@ -1025,7 +1025,7 @@ ], "src": "587:18:10" }, - "scope": 1096, + "scope": 1122, "src": "519:87:10", "stateMutability": "view", "superFunction": null, @@ -1034,22 +1034,22 @@ { "body": null, "documentation": null, - "id": 910, + "id": 936, "implemented": false, "kind": "function", "modifiers": [], "name": "getAssetsIn", "nodeType": "FunctionDefinition", "parameters": { - "id": 905, + "id": 931, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 904, + "id": 930, "name": "account", "nodeType": "VariableDeclaration", - "scope": 910, + "scope": 936, "src": "632:15:10", "stateVariable": false, "storageLocation": "default", @@ -1058,7 +1058,7 @@ "typeString": "address" }, "typeName": { - "id": 903, + "id": 929, "name": "address", "nodeType": "ElementaryTypeName", "src": "632:7:10", @@ -1075,15 +1075,15 @@ "src": "631:17:10" }, "returnParameters": { - "id": 909, + "id": 935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 908, + "id": 934, "name": "", "nodeType": "VariableDeclaration", - "scope": 910, + "scope": 936, "src": "672:16:10", "stateVariable": false, "storageLocation": "memory", @@ -1093,7 +1093,7 @@ }, "typeName": { "baseType": { - "id": 906, + "id": 932, "name": "address", "nodeType": "ElementaryTypeName", "src": "672:7:10", @@ -1103,7 +1103,7 @@ "typeString": "address" } }, - "id": 907, + "id": 933, "length": null, "nodeType": "ArrayTypeName", "src": "672:9:10", @@ -1118,7 +1118,7 @@ ], "src": "671:18:10" }, - "scope": 1096, + "scope": 1122, "src": "611:79:10", "stateMutability": "view", "superFunction": null, @@ -1127,22 +1127,22 @@ { "body": null, "documentation": null, - "id": 921, + "id": 947, "implemented": false, "kind": "function", "modifiers": [], "name": "mintAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 917, + "id": 943, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 912, + "id": 938, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 921, + "scope": 947, "src": "717:14:10", "stateVariable": false, "storageLocation": "default", @@ -1151,7 +1151,7 @@ "typeString": "address" }, "typeName": { - "id": 911, + "id": 937, "name": "address", "nodeType": "ElementaryTypeName", "src": "717:7:10", @@ -1166,10 +1166,10 @@ }, { "constant": false, - "id": 914, + "id": 940, "name": "minter", "nodeType": "VariableDeclaration", - "scope": 921, + "scope": 947, "src": "733:14:10", "stateVariable": false, "storageLocation": "default", @@ -1178,7 +1178,7 @@ "typeString": "address" }, "typeName": { - "id": 913, + "id": 939, "name": "address", "nodeType": "ElementaryTypeName", "src": "733:7:10", @@ -1193,10 +1193,10 @@ }, { "constant": false, - "id": 916, + "id": 942, "name": "mintAmount", "nodeType": "VariableDeclaration", - "scope": 921, + "scope": 947, "src": "749:15:10", "stateVariable": false, "storageLocation": "default", @@ -1205,7 +1205,7 @@ "typeString": "uint256" }, "typeName": { - "id": 915, + "id": 941, "name": "uint", "nodeType": "ElementaryTypeName", "src": "749:4:10", @@ -1221,15 +1221,15 @@ "src": "716:49:10" }, "returnParameters": { - "id": 920, + "id": 946, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 919, + "id": 945, "name": "", "nodeType": "VariableDeclaration", - "scope": 921, + "scope": 947, "src": "784:4:10", "stateVariable": false, "storageLocation": "default", @@ -1238,7 +1238,7 @@ "typeString": "uint256" }, "typeName": { - "id": 918, + "id": 944, "name": "uint", "nodeType": "ElementaryTypeName", "src": "784:4:10", @@ -1253,7 +1253,7 @@ ], "src": "783:6:10" }, - "scope": 1096, + "scope": 1122, "src": "696:94:10", "stateMutability": "nonpayable", "superFunction": null, @@ -1262,22 +1262,22 @@ { "body": null, "documentation": null, - "id": 932, + "id": 958, "implemented": false, "kind": "function", "modifiers": [], "name": "mintVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 930, + "id": 956, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 923, + "id": 949, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 932, + "scope": 958, "src": "815:14:10", "stateVariable": false, "storageLocation": "default", @@ -1286,7 +1286,7 @@ "typeString": "address" }, "typeName": { - "id": 922, + "id": 948, "name": "address", "nodeType": "ElementaryTypeName", "src": "815:7:10", @@ -1301,10 +1301,10 @@ }, { "constant": false, - "id": 925, + "id": 951, "name": "minter", "nodeType": "VariableDeclaration", - "scope": 932, + "scope": 958, "src": "831:14:10", "stateVariable": false, "storageLocation": "default", @@ -1313,7 +1313,7 @@ "typeString": "address" }, "typeName": { - "id": 924, + "id": 950, "name": "address", "nodeType": "ElementaryTypeName", "src": "831:7:10", @@ -1328,10 +1328,10 @@ }, { "constant": false, - "id": 927, + "id": 953, "name": "mintAmount", "nodeType": "VariableDeclaration", - "scope": 932, + "scope": 958, "src": "847:15:10", "stateVariable": false, "storageLocation": "default", @@ -1340,7 +1340,7 @@ "typeString": "uint256" }, "typeName": { - "id": 926, + "id": 952, "name": "uint", "nodeType": "ElementaryTypeName", "src": "847:4:10", @@ -1354,10 +1354,10 @@ }, { "constant": false, - "id": 929, + "id": 955, "name": "mintTokens", "nodeType": "VariableDeclaration", - "scope": 932, + "scope": 958, "src": "864:15:10", "stateVariable": false, "storageLocation": "default", @@ -1366,7 +1366,7 @@ "typeString": "uint256" }, "typeName": { - "id": 928, + "id": 954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "864:4:10", @@ -1382,12 +1382,12 @@ "src": "814:66:10" }, "returnParameters": { - "id": 931, + "id": 957, "nodeType": "ParameterList", "parameters": [], "src": "889:0:10" }, - "scope": 1096, + "scope": 1122, "src": "795:95:10", "stateMutability": "nonpayable", "superFunction": null, @@ -1396,22 +1396,22 @@ { "body": null, "documentation": null, - "id": 943, + "id": 969, "implemented": false, "kind": "function", "modifiers": [], "name": "redeemAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 939, + "id": 965, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 934, + "id": 960, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 943, + "scope": 969, "src": "919:14:10", "stateVariable": false, "storageLocation": "default", @@ -1420,7 +1420,7 @@ "typeString": "address" }, "typeName": { - "id": 933, + "id": 959, "name": "address", "nodeType": "ElementaryTypeName", "src": "919:7:10", @@ -1435,10 +1435,10 @@ }, { "constant": false, - "id": 936, + "id": 962, "name": "redeemer", "nodeType": "VariableDeclaration", - "scope": 943, + "scope": 969, "src": "935:16:10", "stateVariable": false, "storageLocation": "default", @@ -1447,7 +1447,7 @@ "typeString": "address" }, "typeName": { - "id": 935, + "id": 961, "name": "address", "nodeType": "ElementaryTypeName", "src": "935:7:10", @@ -1462,10 +1462,10 @@ }, { "constant": false, - "id": 938, + "id": 964, "name": "redeemTokens", "nodeType": "VariableDeclaration", - "scope": 943, + "scope": 969, "src": "953:17:10", "stateVariable": false, "storageLocation": "default", @@ -1474,7 +1474,7 @@ "typeString": "uint256" }, "typeName": { - "id": 937, + "id": 963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "953:4:10", @@ -1490,15 +1490,15 @@ "src": "918:53:10" }, "returnParameters": { - "id": 942, + "id": 968, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 941, + "id": 967, "name": "", "nodeType": "VariableDeclaration", - "scope": 943, + "scope": 969, "src": "990:4:10", "stateVariable": false, "storageLocation": "default", @@ -1507,7 +1507,7 @@ "typeString": "uint256" }, "typeName": { - "id": 940, + "id": 966, "name": "uint", "nodeType": "ElementaryTypeName", "src": "990:4:10", @@ -1522,7 +1522,7 @@ ], "src": "989:6:10" }, - "scope": 1096, + "scope": 1122, "src": "896:100:10", "stateMutability": "nonpayable", "superFunction": null, @@ -1531,22 +1531,22 @@ { "body": null, "documentation": null, - "id": 954, + "id": 980, "implemented": false, "kind": "function", "modifiers": [], "name": "redeemVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 952, + "id": 978, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 945, + "id": 971, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 954, + "scope": 980, "src": "1023:14:10", "stateVariable": false, "storageLocation": "default", @@ -1555,7 +1555,7 @@ "typeString": "address" }, "typeName": { - "id": 944, + "id": 970, "name": "address", "nodeType": "ElementaryTypeName", "src": "1023:7:10", @@ -1570,10 +1570,10 @@ }, { "constant": false, - "id": 947, + "id": 973, "name": "redeemer", "nodeType": "VariableDeclaration", - "scope": 954, + "scope": 980, "src": "1039:16:10", "stateVariable": false, "storageLocation": "default", @@ -1582,7 +1582,7 @@ "typeString": "address" }, "typeName": { - "id": 946, + "id": 972, "name": "address", "nodeType": "ElementaryTypeName", "src": "1039:7:10", @@ -1597,10 +1597,10 @@ }, { "constant": false, - "id": 949, + "id": 975, "name": "redeemAmount", "nodeType": "VariableDeclaration", - "scope": 954, + "scope": 980, "src": "1057:17:10", "stateVariable": false, "storageLocation": "default", @@ -1609,7 +1609,7 @@ "typeString": "uint256" }, "typeName": { - "id": 948, + "id": 974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1057:4:10", @@ -1623,10 +1623,10 @@ }, { "constant": false, - "id": 951, + "id": 977, "name": "redeemTokens", "nodeType": "VariableDeclaration", - "scope": 954, + "scope": 980, "src": "1076:17:10", "stateVariable": false, "storageLocation": "default", @@ -1635,7 +1635,7 @@ "typeString": "uint256" }, "typeName": { - "id": 950, + "id": 976, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:10", @@ -1651,12 +1651,12 @@ "src": "1022:72:10" }, "returnParameters": { - "id": 953, + "id": 979, "nodeType": "ParameterList", "parameters": [], "src": "1103:0:10" }, - "scope": 1096, + "scope": 1122, "src": "1001:103:10", "stateMutability": "nonpayable", "superFunction": null, @@ -1665,22 +1665,22 @@ { "body": null, "documentation": null, - "id": 965, + "id": 991, "implemented": false, "kind": "function", "modifiers": [], "name": "borrowAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 961, + "id": 987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 956, + "id": 982, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 965, + "scope": 991, "src": "1133:14:10", "stateVariable": false, "storageLocation": "default", @@ -1689,7 +1689,7 @@ "typeString": "address" }, "typeName": { - "id": 955, + "id": 981, "name": "address", "nodeType": "ElementaryTypeName", "src": "1133:7:10", @@ -1704,10 +1704,10 @@ }, { "constant": false, - "id": 958, + "id": 984, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 965, + "scope": 991, "src": "1149:16:10", "stateVariable": false, "storageLocation": "default", @@ -1716,7 +1716,7 @@ "typeString": "address" }, "typeName": { - "id": 957, + "id": 983, "name": "address", "nodeType": "ElementaryTypeName", "src": "1149:7:10", @@ -1731,10 +1731,10 @@ }, { "constant": false, - "id": 960, + "id": 986, "name": "borrowAmount", "nodeType": "VariableDeclaration", - "scope": 965, + "scope": 991, "src": "1167:17:10", "stateVariable": false, "storageLocation": "default", @@ -1743,7 +1743,7 @@ "typeString": "uint256" }, "typeName": { - "id": 959, + "id": 985, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1167:4:10", @@ -1759,15 +1759,15 @@ "src": "1132:53:10" }, "returnParameters": { - "id": 964, + "id": 990, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 963, + "id": 989, "name": "", "nodeType": "VariableDeclaration", - "scope": 965, + "scope": 991, "src": "1204:4:10", "stateVariable": false, "storageLocation": "default", @@ -1776,7 +1776,7 @@ "typeString": "uint256" }, "typeName": { - "id": 962, + "id": 988, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1204:4:10", @@ -1791,7 +1791,7 @@ ], "src": "1203:6:10" }, - "scope": 1096, + "scope": 1122, "src": "1110:100:10", "stateMutability": "nonpayable", "superFunction": null, @@ -1800,22 +1800,22 @@ { "body": null, "documentation": null, - "id": 974, + "id": 1000, "implemented": false, "kind": "function", "modifiers": [], "name": "borrowVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 972, + "id": 998, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 967, + "id": 993, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 974, + "scope": 1000, "src": "1237:14:10", "stateVariable": false, "storageLocation": "default", @@ -1824,7 +1824,7 @@ "typeString": "address" }, "typeName": { - "id": 966, + "id": 992, "name": "address", "nodeType": "ElementaryTypeName", "src": "1237:7:10", @@ -1839,10 +1839,10 @@ }, { "constant": false, - "id": 969, + "id": 995, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 974, + "scope": 1000, "src": "1253:16:10", "stateVariable": false, "storageLocation": "default", @@ -1851,7 +1851,7 @@ "typeString": "address" }, "typeName": { - "id": 968, + "id": 994, "name": "address", "nodeType": "ElementaryTypeName", "src": "1253:7:10", @@ -1866,10 +1866,10 @@ }, { "constant": false, - "id": 971, + "id": 997, "name": "borrowAmount", "nodeType": "VariableDeclaration", - "scope": 974, + "scope": 1000, "src": "1271:17:10", "stateVariable": false, "storageLocation": "default", @@ -1878,7 +1878,7 @@ "typeString": "uint256" }, "typeName": { - "id": 970, + "id": 996, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1271:4:10", @@ -1894,12 +1894,12 @@ "src": "1236:53:10" }, "returnParameters": { - "id": 973, + "id": 999, "nodeType": "ParameterList", "parameters": [], "src": "1298:0:10" }, - "scope": 1096, + "scope": 1122, "src": "1215:84:10", "stateMutability": "nonpayable", "superFunction": null, @@ -1908,22 +1908,22 @@ { "body": null, "documentation": null, - "id": 987, + "id": 1013, "implemented": false, "kind": "function", "modifiers": [], "name": "repayBorrowAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 983, + "id": 1009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 976, + "id": 1002, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 987, + "scope": 1013, "src": "1342:14:10", "stateVariable": false, "storageLocation": "default", @@ -1932,7 +1932,7 @@ "typeString": "address" }, "typeName": { - "id": 975, + "id": 1001, "name": "address", "nodeType": "ElementaryTypeName", "src": "1342:7:10", @@ -1947,10 +1947,10 @@ }, { "constant": false, - "id": 978, + "id": 1004, "name": "payer", "nodeType": "VariableDeclaration", - "scope": 987, + "scope": 1013, "src": "1366:13:10", "stateVariable": false, "storageLocation": "default", @@ -1959,7 +1959,7 @@ "typeString": "address" }, "typeName": { - "id": 977, + "id": 1003, "name": "address", "nodeType": "ElementaryTypeName", "src": "1366:7:10", @@ -1974,10 +1974,10 @@ }, { "constant": false, - "id": 980, + "id": 1006, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 987, + "scope": 1013, "src": "1389:16:10", "stateVariable": false, "storageLocation": "default", @@ -1986,7 +1986,7 @@ "typeString": "address" }, "typeName": { - "id": 979, + "id": 1005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1389:7:10", @@ -2001,10 +2001,10 @@ }, { "constant": false, - "id": 982, + "id": 1008, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 987, + "scope": 1013, "src": "1415:16:10", "stateVariable": false, "storageLocation": "default", @@ -2013,7 +2013,7 @@ "typeString": "uint256" }, "typeName": { - "id": 981, + "id": 1007, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1415:4:10", @@ -2029,15 +2029,15 @@ "src": "1332:100:10" }, "returnParameters": { - "id": 986, + "id": 1012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 985, + "id": 1011, "name": "", "nodeType": "VariableDeclaration", - "scope": 987, + "scope": 1013, "src": "1451:4:10", "stateVariable": false, "storageLocation": "default", @@ -2046,7 +2046,7 @@ "typeString": "uint256" }, "typeName": { - "id": 984, + "id": 1010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1451:4:10", @@ -2061,7 +2061,7 @@ ], "src": "1450:6:10" }, - "scope": 1096, + "scope": 1122, "src": "1305:152:10", "stateMutability": "nonpayable", "superFunction": null, @@ -2070,22 +2070,22 @@ { "body": null, "documentation": null, - "id": 1000, + "id": 1026, "implemented": false, "kind": "function", "modifiers": [], "name": "repayBorrowVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 998, + "id": 1024, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 989, + "id": 1015, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 1000, + "scope": 1026, "src": "1498:14:10", "stateVariable": false, "storageLocation": "default", @@ -2094,7 +2094,7 @@ "typeString": "address" }, "typeName": { - "id": 988, + "id": 1014, "name": "address", "nodeType": "ElementaryTypeName", "src": "1498:7:10", @@ -2109,10 +2109,10 @@ }, { "constant": false, - "id": 991, + "id": 1017, "name": "payer", "nodeType": "VariableDeclaration", - "scope": 1000, + "scope": 1026, "src": "1522:13:10", "stateVariable": false, "storageLocation": "default", @@ -2121,7 +2121,7 @@ "typeString": "address" }, "typeName": { - "id": 990, + "id": 1016, "name": "address", "nodeType": "ElementaryTypeName", "src": "1522:7:10", @@ -2136,10 +2136,10 @@ }, { "constant": false, - "id": 993, + "id": 1019, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 1000, + "scope": 1026, "src": "1545:16:10", "stateVariable": false, "storageLocation": "default", @@ -2148,7 +2148,7 @@ "typeString": "address" }, "typeName": { - "id": 992, + "id": 1018, "name": "address", "nodeType": "ElementaryTypeName", "src": "1545:7:10", @@ -2163,10 +2163,10 @@ }, { "constant": false, - "id": 995, + "id": 1021, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 1000, + "scope": 1026, "src": "1571:16:10", "stateVariable": false, "storageLocation": "default", @@ -2175,7 +2175,7 @@ "typeString": "uint256" }, "typeName": { - "id": 994, + "id": 1020, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1571:4:10", @@ -2189,10 +2189,10 @@ }, { "constant": false, - "id": 997, + "id": 1023, "name": "borrowerIndex", "nodeType": "VariableDeclaration", - "scope": 1000, + "scope": 1026, "src": "1597:18:10", "stateVariable": false, "storageLocation": "default", @@ -2201,7 +2201,7 @@ "typeString": "uint256" }, "typeName": { - "id": 996, + "id": 1022, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1597:4:10", @@ -2217,12 +2217,12 @@ "src": "1488:128:10" }, "returnParameters": { - "id": 999, + "id": 1025, "nodeType": "ParameterList", "parameters": [], "src": "1625:0:10" }, - "scope": 1096, + "scope": 1122, "src": "1462:164:10", "stateMutability": "nonpayable", "superFunction": null, @@ -2231,22 +2231,22 @@ { "body": null, "documentation": null, - "id": 1015, + "id": 1041, "implemented": false, "kind": "function", "modifiers": [], "name": "liquidateBorrowAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 1011, + "id": 1037, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1002, + "id": 1028, "name": "cTokenBorrowed", "nodeType": "VariableDeclaration", - "scope": 1015, + "scope": 1041, "src": "1673:22:10", "stateVariable": false, "storageLocation": "default", @@ -2255,7 +2255,7 @@ "typeString": "address" }, "typeName": { - "id": 1001, + "id": 1027, "name": "address", "nodeType": "ElementaryTypeName", "src": "1673:7:10", @@ -2270,10 +2270,10 @@ }, { "constant": false, - "id": 1004, + "id": 1030, "name": "cTokenCollateral", "nodeType": "VariableDeclaration", - "scope": 1015, + "scope": 1041, "src": "1705:24:10", "stateVariable": false, "storageLocation": "default", @@ -2282,7 +2282,7 @@ "typeString": "address" }, "typeName": { - "id": 1003, + "id": 1029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:10", @@ -2297,10 +2297,10 @@ }, { "constant": false, - "id": 1006, + "id": 1032, "name": "liquidator", "nodeType": "VariableDeclaration", - "scope": 1015, + "scope": 1041, "src": "1739:18:10", "stateVariable": false, "storageLocation": "default", @@ -2309,7 +2309,7 @@ "typeString": "address" }, "typeName": { - "id": 1005, + "id": 1031, "name": "address", "nodeType": "ElementaryTypeName", "src": "1739:7:10", @@ -2324,10 +2324,10 @@ }, { "constant": false, - "id": 1008, + "id": 1034, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 1015, + "scope": 1041, "src": "1767:16:10", "stateVariable": false, "storageLocation": "default", @@ -2336,7 +2336,7 @@ "typeString": "address" }, "typeName": { - "id": 1007, + "id": 1033, "name": "address", "nodeType": "ElementaryTypeName", "src": "1767:7:10", @@ -2351,10 +2351,10 @@ }, { "constant": false, - "id": 1010, + "id": 1036, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 1015, + "scope": 1041, "src": "1793:16:10", "stateVariable": false, "storageLocation": "default", @@ -2363,7 +2363,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1009, + "id": 1035, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1793:4:10", @@ -2379,15 +2379,15 @@ "src": "1663:147:10" }, "returnParameters": { - "id": 1014, + "id": 1040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1013, + "id": 1039, "name": "", "nodeType": "VariableDeclaration", - "scope": 1015, + "scope": 1041, "src": "1829:4:10", "stateVariable": false, "storageLocation": "default", @@ -2396,7 +2396,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1012, + "id": 1038, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1829:4:10", @@ -2411,7 +2411,7 @@ ], "src": "1828:6:10" }, - "scope": 1096, + "scope": 1122, "src": "1632:203:10", "stateMutability": "nonpayable", "superFunction": null, @@ -2420,22 +2420,22 @@ { "body": null, "documentation": null, - "id": 1030, + "id": 1056, "implemented": false, "kind": "function", "modifiers": [], "name": "liquidateBorrowVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 1028, + "id": 1054, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1017, + "id": 1043, "name": "cTokenBorrowed", "nodeType": "VariableDeclaration", - "scope": 1030, + "scope": 1056, "src": "1880:22:10", "stateVariable": false, "storageLocation": "default", @@ -2444,7 +2444,7 @@ "typeString": "address" }, "typeName": { - "id": 1016, + "id": 1042, "name": "address", "nodeType": "ElementaryTypeName", "src": "1880:7:10", @@ -2459,10 +2459,10 @@ }, { "constant": false, - "id": 1019, + "id": 1045, "name": "cTokenCollateral", "nodeType": "VariableDeclaration", - "scope": 1030, + "scope": 1056, "src": "1912:24:10", "stateVariable": false, "storageLocation": "default", @@ -2471,7 +2471,7 @@ "typeString": "address" }, "typeName": { - "id": 1018, + "id": 1044, "name": "address", "nodeType": "ElementaryTypeName", "src": "1912:7:10", @@ -2486,10 +2486,10 @@ }, { "constant": false, - "id": 1021, + "id": 1047, "name": "liquidator", "nodeType": "VariableDeclaration", - "scope": 1030, + "scope": 1056, "src": "1946:18:10", "stateVariable": false, "storageLocation": "default", @@ -2498,7 +2498,7 @@ "typeString": "address" }, "typeName": { - "id": 1020, + "id": 1046, "name": "address", "nodeType": "ElementaryTypeName", "src": "1946:7:10", @@ -2513,10 +2513,10 @@ }, { "constant": false, - "id": 1023, + "id": 1049, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 1030, + "scope": 1056, "src": "1974:16:10", "stateVariable": false, "storageLocation": "default", @@ -2525,7 +2525,7 @@ "typeString": "address" }, "typeName": { - "id": 1022, + "id": 1048, "name": "address", "nodeType": "ElementaryTypeName", "src": "1974:7:10", @@ -2540,10 +2540,10 @@ }, { "constant": false, - "id": 1025, + "id": 1051, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 1030, + "scope": 1056, "src": "2000:16:10", "stateVariable": false, "storageLocation": "default", @@ -2552,7 +2552,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1024, + "id": 1050, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2000:4:10", @@ -2566,10 +2566,10 @@ }, { "constant": false, - "id": 1027, + "id": 1053, "name": "seizeTokens", "nodeType": "VariableDeclaration", - "scope": 1030, + "scope": 1056, "src": "2026:16:10", "stateVariable": false, "storageLocation": "default", @@ -2578,7 +2578,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1026, + "id": 1052, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2026:4:10", @@ -2594,12 +2594,12 @@ "src": "1870:173:10" }, "returnParameters": { - "id": 1029, + "id": 1055, "nodeType": "ParameterList", "parameters": [], "src": "2052:0:10" }, - "scope": 1096, + "scope": 1122, "src": "1840:213:10", "stateMutability": "nonpayable", "superFunction": null, @@ -2608,22 +2608,22 @@ { "body": null, "documentation": null, - "id": 1045, + "id": 1071, "implemented": false, "kind": "function", "modifiers": [], "name": "seizeAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 1041, + "id": 1067, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1032, + "id": 1058, "name": "cTokenCollateral", "nodeType": "VariableDeclaration", - "scope": 1045, + "scope": 1071, "src": "2090:24:10", "stateVariable": false, "storageLocation": "default", @@ -2632,7 +2632,7 @@ "typeString": "address" }, "typeName": { - "id": 1031, + "id": 1057, "name": "address", "nodeType": "ElementaryTypeName", "src": "2090:7:10", @@ -2647,10 +2647,10 @@ }, { "constant": false, - "id": 1034, + "id": 1060, "name": "cTokenBorrowed", "nodeType": "VariableDeclaration", - "scope": 1045, + "scope": 1071, "src": "2124:22:10", "stateVariable": false, "storageLocation": "default", @@ -2659,7 +2659,7 @@ "typeString": "address" }, "typeName": { - "id": 1033, + "id": 1059, "name": "address", "nodeType": "ElementaryTypeName", "src": "2124:7:10", @@ -2674,10 +2674,10 @@ }, { "constant": false, - "id": 1036, + "id": 1062, "name": "liquidator", "nodeType": "VariableDeclaration", - "scope": 1045, + "scope": 1071, "src": "2156:18:10", "stateVariable": false, "storageLocation": "default", @@ -2686,7 +2686,7 @@ "typeString": "address" }, "typeName": { - "id": 1035, + "id": 1061, "name": "address", "nodeType": "ElementaryTypeName", "src": "2156:7:10", @@ -2701,10 +2701,10 @@ }, { "constant": false, - "id": 1038, + "id": 1064, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 1045, + "scope": 1071, "src": "2184:16:10", "stateVariable": false, "storageLocation": "default", @@ -2713,7 +2713,7 @@ "typeString": "address" }, "typeName": { - "id": 1037, + "id": 1063, "name": "address", "nodeType": "ElementaryTypeName", "src": "2184:7:10", @@ -2728,10 +2728,10 @@ }, { "constant": false, - "id": 1040, + "id": 1066, "name": "seizeTokens", "nodeType": "VariableDeclaration", - "scope": 1045, + "scope": 1071, "src": "2210:16:10", "stateVariable": false, "storageLocation": "default", @@ -2740,7 +2740,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1039, + "id": 1065, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2210:4:10", @@ -2756,15 +2756,15 @@ "src": "2080:147:10" }, "returnParameters": { - "id": 1044, + "id": 1070, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1043, + "id": 1069, "name": "", "nodeType": "VariableDeclaration", - "scope": 1045, + "scope": 1071, "src": "2246:4:10", "stateVariable": false, "storageLocation": "default", @@ -2773,7 +2773,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1042, + "id": 1068, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2246:4:10", @@ -2788,7 +2788,7 @@ ], "src": "2245:6:10" }, - "scope": 1096, + "scope": 1122, "src": "2059:193:10", "stateMutability": "nonpayable", "superFunction": null, @@ -2797,22 +2797,22 @@ { "body": null, "documentation": null, - "id": 1058, + "id": 1084, "implemented": false, "kind": "function", "modifiers": [], "name": "seizeVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 1056, + "id": 1082, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1047, + "id": 1073, "name": "cTokenCollateral", "nodeType": "VariableDeclaration", - "scope": 1058, + "scope": 1084, "src": "2287:24:10", "stateVariable": false, "storageLocation": "default", @@ -2821,7 +2821,7 @@ "typeString": "address" }, "typeName": { - "id": 1046, + "id": 1072, "name": "address", "nodeType": "ElementaryTypeName", "src": "2287:7:10", @@ -2836,10 +2836,10 @@ }, { "constant": false, - "id": 1049, + "id": 1075, "name": "cTokenBorrowed", "nodeType": "VariableDeclaration", - "scope": 1058, + "scope": 1084, "src": "2321:22:10", "stateVariable": false, "storageLocation": "default", @@ -2848,7 +2848,7 @@ "typeString": "address" }, "typeName": { - "id": 1048, + "id": 1074, "name": "address", "nodeType": "ElementaryTypeName", "src": "2321:7:10", @@ -2863,10 +2863,10 @@ }, { "constant": false, - "id": 1051, + "id": 1077, "name": "liquidator", "nodeType": "VariableDeclaration", - "scope": 1058, + "scope": 1084, "src": "2353:18:10", "stateVariable": false, "storageLocation": "default", @@ -2875,7 +2875,7 @@ "typeString": "address" }, "typeName": { - "id": 1050, + "id": 1076, "name": "address", "nodeType": "ElementaryTypeName", "src": "2353:7:10", @@ -2890,10 +2890,10 @@ }, { "constant": false, - "id": 1053, + "id": 1079, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 1058, + "scope": 1084, "src": "2381:16:10", "stateVariable": false, "storageLocation": "default", @@ -2902,7 +2902,7 @@ "typeString": "address" }, "typeName": { - "id": 1052, + "id": 1078, "name": "address", "nodeType": "ElementaryTypeName", "src": "2381:7:10", @@ -2917,10 +2917,10 @@ }, { "constant": false, - "id": 1055, + "id": 1081, "name": "seizeTokens", "nodeType": "VariableDeclaration", - "scope": 1058, + "scope": 1084, "src": "2407:16:10", "stateVariable": false, "storageLocation": "default", @@ -2929,7 +2929,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1054, + "id": 1080, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2407:4:10", @@ -2945,12 +2945,12 @@ "src": "2277:147:10" }, "returnParameters": { - "id": 1057, + "id": 1083, "nodeType": "ParameterList", "parameters": [], "src": "2433:0:10" }, - "scope": 1096, + "scope": 1122, "src": "2257:177:10", "stateMutability": "nonpayable", "superFunction": null, @@ -2959,22 +2959,22 @@ { "body": null, "documentation": null, - "id": 1071, + "id": 1097, "implemented": false, "kind": "function", "modifiers": [], "name": "transferAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 1067, + "id": 1093, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1060, + "id": 1086, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 1071, + "scope": 1097, "src": "2465:14:10", "stateVariable": false, "storageLocation": "default", @@ -2983,7 +2983,7 @@ "typeString": "address" }, "typeName": { - "id": 1059, + "id": 1085, "name": "address", "nodeType": "ElementaryTypeName", "src": "2465:7:10", @@ -2998,10 +2998,10 @@ }, { "constant": false, - "id": 1062, + "id": 1088, "name": "src", "nodeType": "VariableDeclaration", - "scope": 1071, + "scope": 1097, "src": "2481:11:10", "stateVariable": false, "storageLocation": "default", @@ -3010,7 +3010,7 @@ "typeString": "address" }, "typeName": { - "id": 1061, + "id": 1087, "name": "address", "nodeType": "ElementaryTypeName", "src": "2481:7:10", @@ -3025,10 +3025,10 @@ }, { "constant": false, - "id": 1064, + "id": 1090, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1071, + "scope": 1097, "src": "2494:11:10", "stateVariable": false, "storageLocation": "default", @@ -3037,7 +3037,7 @@ "typeString": "address" }, "typeName": { - "id": 1063, + "id": 1089, "name": "address", "nodeType": "ElementaryTypeName", "src": "2494:7:10", @@ -3052,10 +3052,10 @@ }, { "constant": false, - "id": 1066, + "id": 1092, "name": "transferTokens", "nodeType": "VariableDeclaration", - "scope": 1071, + "scope": 1097, "src": "2507:19:10", "stateVariable": false, "storageLocation": "default", @@ -3064,7 +3064,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1065, + "id": 1091, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2507:4:10", @@ -3080,15 +3080,15 @@ "src": "2464:63:10" }, "returnParameters": { - "id": 1070, + "id": 1096, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1069, + "id": 1095, "name": "", "nodeType": "VariableDeclaration", - "scope": 1071, + "scope": 1097, "src": "2546:4:10", "stateVariable": false, "storageLocation": "default", @@ -3097,7 +3097,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1068, + "id": 1094, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2546:4:10", @@ -3112,7 +3112,7 @@ ], "src": "2545:6:10" }, - "scope": 1096, + "scope": 1122, "src": "2440:112:10", "stateMutability": "nonpayable", "superFunction": null, @@ -3121,22 +3121,22 @@ { "body": null, "documentation": null, - "id": 1082, + "id": 1108, "implemented": false, "kind": "function", "modifiers": [], "name": "transferVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 1080, + "id": 1106, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1073, + "id": 1099, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 1082, + "scope": 1108, "src": "2581:14:10", "stateVariable": false, "storageLocation": "default", @@ -3145,7 +3145,7 @@ "typeString": "address" }, "typeName": { - "id": 1072, + "id": 1098, "name": "address", "nodeType": "ElementaryTypeName", "src": "2581:7:10", @@ -3160,10 +3160,10 @@ }, { "constant": false, - "id": 1075, + "id": 1101, "name": "src", "nodeType": "VariableDeclaration", - "scope": 1082, + "scope": 1108, "src": "2597:11:10", "stateVariable": false, "storageLocation": "default", @@ -3172,7 +3172,7 @@ "typeString": "address" }, "typeName": { - "id": 1074, + "id": 1100, "name": "address", "nodeType": "ElementaryTypeName", "src": "2597:7:10", @@ -3187,10 +3187,10 @@ }, { "constant": false, - "id": 1077, + "id": 1103, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1082, + "scope": 1108, "src": "2610:11:10", "stateVariable": false, "storageLocation": "default", @@ -3199,7 +3199,7 @@ "typeString": "address" }, "typeName": { - "id": 1076, + "id": 1102, "name": "address", "nodeType": "ElementaryTypeName", "src": "2610:7:10", @@ -3214,10 +3214,10 @@ }, { "constant": false, - "id": 1079, + "id": 1105, "name": "transferTokens", "nodeType": "VariableDeclaration", - "scope": 1082, + "scope": 1108, "src": "2623:19:10", "stateVariable": false, "storageLocation": "default", @@ -3226,7 +3226,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1078, + "id": 1104, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2623:4:10", @@ -3242,12 +3242,12 @@ "src": "2580:63:10" }, "returnParameters": { - "id": 1081, + "id": 1107, "nodeType": "ParameterList", "parameters": [], "src": "2652:0:10" }, - "scope": 1096, + "scope": 1122, "src": "2557:96:10", "stateMutability": "nonpayable", "superFunction": null, @@ -3256,22 +3256,22 @@ { "body": null, "documentation": "* Liquidity/Liquidation Calculations **", - "id": 1095, + "id": 1121, "implemented": false, "kind": "function", "modifiers": [], "name": "liquidateCalculateSeizeTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 1089, + "id": 1115, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1084, + "id": 1110, "name": "cTokenBorrowed", "nodeType": "VariableDeclaration", - "scope": 1095, + "scope": 1121, "src": "2757:22:10", "stateVariable": false, "storageLocation": "default", @@ -3280,7 +3280,7 @@ "typeString": "address" }, "typeName": { - "id": 1083, + "id": 1109, "name": "address", "nodeType": "ElementaryTypeName", "src": "2757:7:10", @@ -3295,10 +3295,10 @@ }, { "constant": false, - "id": 1086, + "id": 1112, "name": "cTokenCollateral", "nodeType": "VariableDeclaration", - "scope": 1095, + "scope": 1121, "src": "2789:24:10", "stateVariable": false, "storageLocation": "default", @@ -3307,7 +3307,7 @@ "typeString": "address" }, "typeName": { - "id": 1085, + "id": 1111, "name": "address", "nodeType": "ElementaryTypeName", "src": "2789:7:10", @@ -3322,10 +3322,10 @@ }, { "constant": false, - "id": 1088, + "id": 1114, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 1095, + "scope": 1121, "src": "2823:16:10", "stateVariable": false, "storageLocation": "default", @@ -3334,7 +3334,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1087, + "id": 1113, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2823:4:10", @@ -3350,15 +3350,15 @@ "src": "2747:93:10" }, "returnParameters": { - "id": 1094, + "id": 1120, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1091, + "id": 1117, "name": "", "nodeType": "VariableDeclaration", - "scope": 1095, + "scope": 1121, "src": "2864:4:10", "stateVariable": false, "storageLocation": "default", @@ -3367,7 +3367,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1090, + "id": 1116, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2864:4:10", @@ -3381,10 +3381,10 @@ }, { "constant": false, - "id": 1093, + "id": 1119, "name": "", "nodeType": "VariableDeclaration", - "scope": 1095, + "scope": 1121, "src": "2870:4:10", "stateVariable": false, "storageLocation": "default", @@ -3393,7 +3393,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1092, + "id": 1118, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2870:4:10", @@ -3408,14 +3408,14 @@ ], "src": "2863:12:10" }, - "scope": 1096, + "scope": 1122, "src": "2709:167:10", "stateMutability": "view", "superFunction": null, "visibility": "external" } ], - "scope": 1097, + "scope": 1123, "src": "25:2853:10" } ], @@ -3425,14 +3425,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/compound/IComptroller.sol", "exportedSymbols": { "IComptroller": [ - 1096 + 1122 ] }, - "id": 1097, + "id": 1123, "nodeType": "SourceUnit", "nodes": [ { - "id": 870, + "id": 896, "literals": [ "solidity", "0.5", @@ -3447,9 +3447,9 @@ "contractKind": "interface", "documentation": null, "fullyImplemented": false, - "id": 1096, + "id": 1122, "linearizedBaseContracts": [ - 1096 + 1122 ], "name": "IComptroller", "nodeType": "ContractDefinition", @@ -3457,28 +3457,28 @@ { "body": null, "documentation": "@notice Marker function used for light validation when updating the comptroller of a market\n@dev Implementations should simply return true.\n@return true", - "id": 875, + "id": 901, "implemented": false, "kind": "function", "modifiers": [], "name": "isComptroller", "nodeType": "FunctionDefinition", "parameters": { - "id": 871, + "id": 897, "nodeType": "ParameterList", "parameters": [], "src": "266:2:10" }, "returnParameters": { - "id": 874, + "id": 900, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 873, + "id": 899, "name": "", "nodeType": "VariableDeclaration", - "scope": 875, + "scope": 901, "src": "292:4:10", "stateVariable": false, "storageLocation": "default", @@ -3487,7 +3487,7 @@ "typeString": "bool" }, "typeName": { - "id": 872, + "id": 898, "name": "bool", "nodeType": "ElementaryTypeName", "src": "292:4:10", @@ -3502,7 +3502,7 @@ ], "src": "291:6:10" }, - "scope": 1096, + "scope": 1122, "src": "244:54:10", "stateMutability": "view", "superFunction": null, @@ -3511,22 +3511,22 @@ { "body": null, "documentation": "* Assets You Are In **", - "id": 884, + "id": 910, "implemented": false, "kind": "function", "modifiers": [], "name": "enterMarkets", "nodeType": "FunctionDefinition", "parameters": { - "id": 879, + "id": 905, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 878, + "id": 904, "name": "cTokens", "nodeType": "VariableDeclaration", - "scope": 884, + "scope": 910, "src": "359:26:10", "stateVariable": false, "storageLocation": "calldata", @@ -3536,7 +3536,7 @@ }, "typeName": { "baseType": { - "id": 876, + "id": 902, "name": "address", "nodeType": "ElementaryTypeName", "src": "359:7:10", @@ -3546,7 +3546,7 @@ "typeString": "address" } }, - "id": 877, + "id": 903, "length": null, "nodeType": "ArrayTypeName", "src": "359:9:10", @@ -3562,15 +3562,15 @@ "src": "358:28:10" }, "returnParameters": { - "id": 883, + "id": 909, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 882, + "id": 908, "name": "", "nodeType": "VariableDeclaration", - "scope": 884, + "scope": 910, "src": "405:13:10", "stateVariable": false, "storageLocation": "memory", @@ -3580,7 +3580,7 @@ }, "typeName": { "baseType": { - "id": 880, + "id": 906, "name": "uint", "nodeType": "ElementaryTypeName", "src": "405:4:10", @@ -3589,7 +3589,7 @@ "typeString": "uint256" } }, - "id": 881, + "id": 907, "length": null, "nodeType": "ArrayTypeName", "src": "405:6:10", @@ -3604,7 +3604,7 @@ ], "src": "404:15:10" }, - "scope": 1096, + "scope": 1122, "src": "337:83:10", "stateMutability": "nonpayable", "superFunction": null, @@ -3613,22 +3613,22 @@ { "body": null, "documentation": null, - "id": 891, + "id": 917, "implemented": false, "kind": "function", "modifiers": [], "name": "exitMarket", "nodeType": "FunctionDefinition", "parameters": { - "id": 887, + "id": 913, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 886, + "id": 912, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 891, + "scope": 917, "src": "445:14:10", "stateVariable": false, "storageLocation": "default", @@ -3637,7 +3637,7 @@ "typeString": "address" }, "typeName": { - "id": 885, + "id": 911, "name": "address", "nodeType": "ElementaryTypeName", "src": "445:7:10", @@ -3654,15 +3654,15 @@ "src": "444:16:10" }, "returnParameters": { - "id": 890, + "id": 916, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 889, + "id": 915, "name": "", "nodeType": "VariableDeclaration", - "scope": 891, + "scope": 917, "src": "479:4:10", "stateVariable": false, "storageLocation": "default", @@ -3671,7 +3671,7 @@ "typeString": "uint256" }, "typeName": { - "id": 888, + "id": 914, "name": "uint", "nodeType": "ElementaryTypeName", "src": "479:4:10", @@ -3686,7 +3686,7 @@ ], "src": "478:6:10" }, - "scope": 1096, + "scope": 1122, "src": "425:60:10", "stateMutability": "nonpayable", "superFunction": null, @@ -3695,22 +3695,22 @@ { "body": null, "documentation": "* Policy Hooks **", - "id": 902, + "id": 928, "implemented": false, "kind": "function", "modifiers": [], "name": "getAccountLiquidity", "nodeType": "FunctionDefinition", "parameters": { - "id": 894, + "id": 920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 893, + "id": 919, "name": "account", "nodeType": "VariableDeclaration", - "scope": 902, + "scope": 928, "src": "548:15:10", "stateVariable": false, "storageLocation": "default", @@ -3719,7 +3719,7 @@ "typeString": "address" }, "typeName": { - "id": 892, + "id": 918, "name": "address", "nodeType": "ElementaryTypeName", "src": "548:7:10", @@ -3736,15 +3736,15 @@ "src": "547:17:10" }, "returnParameters": { - "id": 901, + "id": 927, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 896, + "id": 922, "name": "", "nodeType": "VariableDeclaration", - "scope": 902, + "scope": 928, "src": "588:4:10", "stateVariable": false, "storageLocation": "default", @@ -3753,7 +3753,7 @@ "typeString": "uint256" }, "typeName": { - "id": 895, + "id": 921, "name": "uint", "nodeType": "ElementaryTypeName", "src": "588:4:10", @@ -3767,10 +3767,10 @@ }, { "constant": false, - "id": 898, + "id": 924, "name": "", "nodeType": "VariableDeclaration", - "scope": 902, + "scope": 928, "src": "594:4:10", "stateVariable": false, "storageLocation": "default", @@ -3779,7 +3779,7 @@ "typeString": "uint256" }, "typeName": { - "id": 897, + "id": 923, "name": "uint", "nodeType": "ElementaryTypeName", "src": "594:4:10", @@ -3793,10 +3793,10 @@ }, { "constant": false, - "id": 900, + "id": 926, "name": "", "nodeType": "VariableDeclaration", - "scope": 902, + "scope": 928, "src": "600:4:10", "stateVariable": false, "storageLocation": "default", @@ -3805,7 +3805,7 @@ "typeString": "uint256" }, "typeName": { - "id": 899, + "id": 925, "name": "uint", "nodeType": "ElementaryTypeName", "src": "600:4:10", @@ -3820,7 +3820,7 @@ ], "src": "587:18:10" }, - "scope": 1096, + "scope": 1122, "src": "519:87:10", "stateMutability": "view", "superFunction": null, @@ -3829,22 +3829,22 @@ { "body": null, "documentation": null, - "id": 910, + "id": 936, "implemented": false, "kind": "function", "modifiers": [], "name": "getAssetsIn", "nodeType": "FunctionDefinition", "parameters": { - "id": 905, + "id": 931, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 904, + "id": 930, "name": "account", "nodeType": "VariableDeclaration", - "scope": 910, + "scope": 936, "src": "632:15:10", "stateVariable": false, "storageLocation": "default", @@ -3853,7 +3853,7 @@ "typeString": "address" }, "typeName": { - "id": 903, + "id": 929, "name": "address", "nodeType": "ElementaryTypeName", "src": "632:7:10", @@ -3870,15 +3870,15 @@ "src": "631:17:10" }, "returnParameters": { - "id": 909, + "id": 935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 908, + "id": 934, "name": "", "nodeType": "VariableDeclaration", - "scope": 910, + "scope": 936, "src": "672:16:10", "stateVariable": false, "storageLocation": "memory", @@ -3888,7 +3888,7 @@ }, "typeName": { "baseType": { - "id": 906, + "id": 932, "name": "address", "nodeType": "ElementaryTypeName", "src": "672:7:10", @@ -3898,7 +3898,7 @@ "typeString": "address" } }, - "id": 907, + "id": 933, "length": null, "nodeType": "ArrayTypeName", "src": "672:9:10", @@ -3913,7 +3913,7 @@ ], "src": "671:18:10" }, - "scope": 1096, + "scope": 1122, "src": "611:79:10", "stateMutability": "view", "superFunction": null, @@ -3922,22 +3922,22 @@ { "body": null, "documentation": null, - "id": 921, + "id": 947, "implemented": false, "kind": "function", "modifiers": [], "name": "mintAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 917, + "id": 943, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 912, + "id": 938, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 921, + "scope": 947, "src": "717:14:10", "stateVariable": false, "storageLocation": "default", @@ -3946,7 +3946,7 @@ "typeString": "address" }, "typeName": { - "id": 911, + "id": 937, "name": "address", "nodeType": "ElementaryTypeName", "src": "717:7:10", @@ -3961,10 +3961,10 @@ }, { "constant": false, - "id": 914, + "id": 940, "name": "minter", "nodeType": "VariableDeclaration", - "scope": 921, + "scope": 947, "src": "733:14:10", "stateVariable": false, "storageLocation": "default", @@ -3973,7 +3973,7 @@ "typeString": "address" }, "typeName": { - "id": 913, + "id": 939, "name": "address", "nodeType": "ElementaryTypeName", "src": "733:7:10", @@ -3988,10 +3988,10 @@ }, { "constant": false, - "id": 916, + "id": 942, "name": "mintAmount", "nodeType": "VariableDeclaration", - "scope": 921, + "scope": 947, "src": "749:15:10", "stateVariable": false, "storageLocation": "default", @@ -4000,7 +4000,7 @@ "typeString": "uint256" }, "typeName": { - "id": 915, + "id": 941, "name": "uint", "nodeType": "ElementaryTypeName", "src": "749:4:10", @@ -4016,15 +4016,15 @@ "src": "716:49:10" }, "returnParameters": { - "id": 920, + "id": 946, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 919, + "id": 945, "name": "", "nodeType": "VariableDeclaration", - "scope": 921, + "scope": 947, "src": "784:4:10", "stateVariable": false, "storageLocation": "default", @@ -4033,7 +4033,7 @@ "typeString": "uint256" }, "typeName": { - "id": 918, + "id": 944, "name": "uint", "nodeType": "ElementaryTypeName", "src": "784:4:10", @@ -4048,7 +4048,7 @@ ], "src": "783:6:10" }, - "scope": 1096, + "scope": 1122, "src": "696:94:10", "stateMutability": "nonpayable", "superFunction": null, @@ -4057,22 +4057,22 @@ { "body": null, "documentation": null, - "id": 932, + "id": 958, "implemented": false, "kind": "function", "modifiers": [], "name": "mintVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 930, + "id": 956, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 923, + "id": 949, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 932, + "scope": 958, "src": "815:14:10", "stateVariable": false, "storageLocation": "default", @@ -4081,7 +4081,7 @@ "typeString": "address" }, "typeName": { - "id": 922, + "id": 948, "name": "address", "nodeType": "ElementaryTypeName", "src": "815:7:10", @@ -4096,10 +4096,10 @@ }, { "constant": false, - "id": 925, + "id": 951, "name": "minter", "nodeType": "VariableDeclaration", - "scope": 932, + "scope": 958, "src": "831:14:10", "stateVariable": false, "storageLocation": "default", @@ -4108,7 +4108,7 @@ "typeString": "address" }, "typeName": { - "id": 924, + "id": 950, "name": "address", "nodeType": "ElementaryTypeName", "src": "831:7:10", @@ -4123,10 +4123,10 @@ }, { "constant": false, - "id": 927, + "id": 953, "name": "mintAmount", "nodeType": "VariableDeclaration", - "scope": 932, + "scope": 958, "src": "847:15:10", "stateVariable": false, "storageLocation": "default", @@ -4135,7 +4135,7 @@ "typeString": "uint256" }, "typeName": { - "id": 926, + "id": 952, "name": "uint", "nodeType": "ElementaryTypeName", "src": "847:4:10", @@ -4149,10 +4149,10 @@ }, { "constant": false, - "id": 929, + "id": 955, "name": "mintTokens", "nodeType": "VariableDeclaration", - "scope": 932, + "scope": 958, "src": "864:15:10", "stateVariable": false, "storageLocation": "default", @@ -4161,7 +4161,7 @@ "typeString": "uint256" }, "typeName": { - "id": 928, + "id": 954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "864:4:10", @@ -4177,12 +4177,12 @@ "src": "814:66:10" }, "returnParameters": { - "id": 931, + "id": 957, "nodeType": "ParameterList", "parameters": [], "src": "889:0:10" }, - "scope": 1096, + "scope": 1122, "src": "795:95:10", "stateMutability": "nonpayable", "superFunction": null, @@ -4191,22 +4191,22 @@ { "body": null, "documentation": null, - "id": 943, + "id": 969, "implemented": false, "kind": "function", "modifiers": [], "name": "redeemAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 939, + "id": 965, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 934, + "id": 960, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 943, + "scope": 969, "src": "919:14:10", "stateVariable": false, "storageLocation": "default", @@ -4215,7 +4215,7 @@ "typeString": "address" }, "typeName": { - "id": 933, + "id": 959, "name": "address", "nodeType": "ElementaryTypeName", "src": "919:7:10", @@ -4230,10 +4230,10 @@ }, { "constant": false, - "id": 936, + "id": 962, "name": "redeemer", "nodeType": "VariableDeclaration", - "scope": 943, + "scope": 969, "src": "935:16:10", "stateVariable": false, "storageLocation": "default", @@ -4242,7 +4242,7 @@ "typeString": "address" }, "typeName": { - "id": 935, + "id": 961, "name": "address", "nodeType": "ElementaryTypeName", "src": "935:7:10", @@ -4257,10 +4257,10 @@ }, { "constant": false, - "id": 938, + "id": 964, "name": "redeemTokens", "nodeType": "VariableDeclaration", - "scope": 943, + "scope": 969, "src": "953:17:10", "stateVariable": false, "storageLocation": "default", @@ -4269,7 +4269,7 @@ "typeString": "uint256" }, "typeName": { - "id": 937, + "id": 963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "953:4:10", @@ -4285,15 +4285,15 @@ "src": "918:53:10" }, "returnParameters": { - "id": 942, + "id": 968, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 941, + "id": 967, "name": "", "nodeType": "VariableDeclaration", - "scope": 943, + "scope": 969, "src": "990:4:10", "stateVariable": false, "storageLocation": "default", @@ -4302,7 +4302,7 @@ "typeString": "uint256" }, "typeName": { - "id": 940, + "id": 966, "name": "uint", "nodeType": "ElementaryTypeName", "src": "990:4:10", @@ -4317,7 +4317,7 @@ ], "src": "989:6:10" }, - "scope": 1096, + "scope": 1122, "src": "896:100:10", "stateMutability": "nonpayable", "superFunction": null, @@ -4326,22 +4326,22 @@ { "body": null, "documentation": null, - "id": 954, + "id": 980, "implemented": false, "kind": "function", "modifiers": [], "name": "redeemVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 952, + "id": 978, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 945, + "id": 971, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 954, + "scope": 980, "src": "1023:14:10", "stateVariable": false, "storageLocation": "default", @@ -4350,7 +4350,7 @@ "typeString": "address" }, "typeName": { - "id": 944, + "id": 970, "name": "address", "nodeType": "ElementaryTypeName", "src": "1023:7:10", @@ -4365,10 +4365,10 @@ }, { "constant": false, - "id": 947, + "id": 973, "name": "redeemer", "nodeType": "VariableDeclaration", - "scope": 954, + "scope": 980, "src": "1039:16:10", "stateVariable": false, "storageLocation": "default", @@ -4377,7 +4377,7 @@ "typeString": "address" }, "typeName": { - "id": 946, + "id": 972, "name": "address", "nodeType": "ElementaryTypeName", "src": "1039:7:10", @@ -4392,10 +4392,10 @@ }, { "constant": false, - "id": 949, + "id": 975, "name": "redeemAmount", "nodeType": "VariableDeclaration", - "scope": 954, + "scope": 980, "src": "1057:17:10", "stateVariable": false, "storageLocation": "default", @@ -4404,7 +4404,7 @@ "typeString": "uint256" }, "typeName": { - "id": 948, + "id": 974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1057:4:10", @@ -4418,10 +4418,10 @@ }, { "constant": false, - "id": 951, + "id": 977, "name": "redeemTokens", "nodeType": "VariableDeclaration", - "scope": 954, + "scope": 980, "src": "1076:17:10", "stateVariable": false, "storageLocation": "default", @@ -4430,7 +4430,7 @@ "typeString": "uint256" }, "typeName": { - "id": 950, + "id": 976, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:10", @@ -4446,12 +4446,12 @@ "src": "1022:72:10" }, "returnParameters": { - "id": 953, + "id": 979, "nodeType": "ParameterList", "parameters": [], "src": "1103:0:10" }, - "scope": 1096, + "scope": 1122, "src": "1001:103:10", "stateMutability": "nonpayable", "superFunction": null, @@ -4460,22 +4460,22 @@ { "body": null, "documentation": null, - "id": 965, + "id": 991, "implemented": false, "kind": "function", "modifiers": [], "name": "borrowAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 961, + "id": 987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 956, + "id": 982, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 965, + "scope": 991, "src": "1133:14:10", "stateVariable": false, "storageLocation": "default", @@ -4484,7 +4484,7 @@ "typeString": "address" }, "typeName": { - "id": 955, + "id": 981, "name": "address", "nodeType": "ElementaryTypeName", "src": "1133:7:10", @@ -4499,10 +4499,10 @@ }, { "constant": false, - "id": 958, + "id": 984, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 965, + "scope": 991, "src": "1149:16:10", "stateVariable": false, "storageLocation": "default", @@ -4511,7 +4511,7 @@ "typeString": "address" }, "typeName": { - "id": 957, + "id": 983, "name": "address", "nodeType": "ElementaryTypeName", "src": "1149:7:10", @@ -4526,10 +4526,10 @@ }, { "constant": false, - "id": 960, + "id": 986, "name": "borrowAmount", "nodeType": "VariableDeclaration", - "scope": 965, + "scope": 991, "src": "1167:17:10", "stateVariable": false, "storageLocation": "default", @@ -4538,7 +4538,7 @@ "typeString": "uint256" }, "typeName": { - "id": 959, + "id": 985, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1167:4:10", @@ -4554,15 +4554,15 @@ "src": "1132:53:10" }, "returnParameters": { - "id": 964, + "id": 990, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 963, + "id": 989, "name": "", "nodeType": "VariableDeclaration", - "scope": 965, + "scope": 991, "src": "1204:4:10", "stateVariable": false, "storageLocation": "default", @@ -4571,7 +4571,7 @@ "typeString": "uint256" }, "typeName": { - "id": 962, + "id": 988, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1204:4:10", @@ -4586,7 +4586,7 @@ ], "src": "1203:6:10" }, - "scope": 1096, + "scope": 1122, "src": "1110:100:10", "stateMutability": "nonpayable", "superFunction": null, @@ -4595,22 +4595,22 @@ { "body": null, "documentation": null, - "id": 974, + "id": 1000, "implemented": false, "kind": "function", "modifiers": [], "name": "borrowVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 972, + "id": 998, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 967, + "id": 993, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 974, + "scope": 1000, "src": "1237:14:10", "stateVariable": false, "storageLocation": "default", @@ -4619,7 +4619,7 @@ "typeString": "address" }, "typeName": { - "id": 966, + "id": 992, "name": "address", "nodeType": "ElementaryTypeName", "src": "1237:7:10", @@ -4634,10 +4634,10 @@ }, { "constant": false, - "id": 969, + "id": 995, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 974, + "scope": 1000, "src": "1253:16:10", "stateVariable": false, "storageLocation": "default", @@ -4646,7 +4646,7 @@ "typeString": "address" }, "typeName": { - "id": 968, + "id": 994, "name": "address", "nodeType": "ElementaryTypeName", "src": "1253:7:10", @@ -4661,10 +4661,10 @@ }, { "constant": false, - "id": 971, + "id": 997, "name": "borrowAmount", "nodeType": "VariableDeclaration", - "scope": 974, + "scope": 1000, "src": "1271:17:10", "stateVariable": false, "storageLocation": "default", @@ -4673,7 +4673,7 @@ "typeString": "uint256" }, "typeName": { - "id": 970, + "id": 996, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1271:4:10", @@ -4689,12 +4689,12 @@ "src": "1236:53:10" }, "returnParameters": { - "id": 973, + "id": 999, "nodeType": "ParameterList", "parameters": [], "src": "1298:0:10" }, - "scope": 1096, + "scope": 1122, "src": "1215:84:10", "stateMutability": "nonpayable", "superFunction": null, @@ -4703,22 +4703,22 @@ { "body": null, "documentation": null, - "id": 987, + "id": 1013, "implemented": false, "kind": "function", "modifiers": [], "name": "repayBorrowAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 983, + "id": 1009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 976, + "id": 1002, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 987, + "scope": 1013, "src": "1342:14:10", "stateVariable": false, "storageLocation": "default", @@ -4727,7 +4727,7 @@ "typeString": "address" }, "typeName": { - "id": 975, + "id": 1001, "name": "address", "nodeType": "ElementaryTypeName", "src": "1342:7:10", @@ -4742,10 +4742,10 @@ }, { "constant": false, - "id": 978, + "id": 1004, "name": "payer", "nodeType": "VariableDeclaration", - "scope": 987, + "scope": 1013, "src": "1366:13:10", "stateVariable": false, "storageLocation": "default", @@ -4754,7 +4754,7 @@ "typeString": "address" }, "typeName": { - "id": 977, + "id": 1003, "name": "address", "nodeType": "ElementaryTypeName", "src": "1366:7:10", @@ -4769,10 +4769,10 @@ }, { "constant": false, - "id": 980, + "id": 1006, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 987, + "scope": 1013, "src": "1389:16:10", "stateVariable": false, "storageLocation": "default", @@ -4781,7 +4781,7 @@ "typeString": "address" }, "typeName": { - "id": 979, + "id": 1005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1389:7:10", @@ -4796,10 +4796,10 @@ }, { "constant": false, - "id": 982, + "id": 1008, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 987, + "scope": 1013, "src": "1415:16:10", "stateVariable": false, "storageLocation": "default", @@ -4808,7 +4808,7 @@ "typeString": "uint256" }, "typeName": { - "id": 981, + "id": 1007, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1415:4:10", @@ -4824,15 +4824,15 @@ "src": "1332:100:10" }, "returnParameters": { - "id": 986, + "id": 1012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 985, + "id": 1011, "name": "", "nodeType": "VariableDeclaration", - "scope": 987, + "scope": 1013, "src": "1451:4:10", "stateVariable": false, "storageLocation": "default", @@ -4841,7 +4841,7 @@ "typeString": "uint256" }, "typeName": { - "id": 984, + "id": 1010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1451:4:10", @@ -4856,7 +4856,7 @@ ], "src": "1450:6:10" }, - "scope": 1096, + "scope": 1122, "src": "1305:152:10", "stateMutability": "nonpayable", "superFunction": null, @@ -4865,22 +4865,22 @@ { "body": null, "documentation": null, - "id": 1000, + "id": 1026, "implemented": false, "kind": "function", "modifiers": [], "name": "repayBorrowVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 998, + "id": 1024, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 989, + "id": 1015, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 1000, + "scope": 1026, "src": "1498:14:10", "stateVariable": false, "storageLocation": "default", @@ -4889,7 +4889,7 @@ "typeString": "address" }, "typeName": { - "id": 988, + "id": 1014, "name": "address", "nodeType": "ElementaryTypeName", "src": "1498:7:10", @@ -4904,10 +4904,10 @@ }, { "constant": false, - "id": 991, + "id": 1017, "name": "payer", "nodeType": "VariableDeclaration", - "scope": 1000, + "scope": 1026, "src": "1522:13:10", "stateVariable": false, "storageLocation": "default", @@ -4916,7 +4916,7 @@ "typeString": "address" }, "typeName": { - "id": 990, + "id": 1016, "name": "address", "nodeType": "ElementaryTypeName", "src": "1522:7:10", @@ -4931,10 +4931,10 @@ }, { "constant": false, - "id": 993, + "id": 1019, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 1000, + "scope": 1026, "src": "1545:16:10", "stateVariable": false, "storageLocation": "default", @@ -4943,7 +4943,7 @@ "typeString": "address" }, "typeName": { - "id": 992, + "id": 1018, "name": "address", "nodeType": "ElementaryTypeName", "src": "1545:7:10", @@ -4958,10 +4958,10 @@ }, { "constant": false, - "id": 995, + "id": 1021, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 1000, + "scope": 1026, "src": "1571:16:10", "stateVariable": false, "storageLocation": "default", @@ -4970,7 +4970,7 @@ "typeString": "uint256" }, "typeName": { - "id": 994, + "id": 1020, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1571:4:10", @@ -4984,10 +4984,10 @@ }, { "constant": false, - "id": 997, + "id": 1023, "name": "borrowerIndex", "nodeType": "VariableDeclaration", - "scope": 1000, + "scope": 1026, "src": "1597:18:10", "stateVariable": false, "storageLocation": "default", @@ -4996,7 +4996,7 @@ "typeString": "uint256" }, "typeName": { - "id": 996, + "id": 1022, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1597:4:10", @@ -5012,12 +5012,12 @@ "src": "1488:128:10" }, "returnParameters": { - "id": 999, + "id": 1025, "nodeType": "ParameterList", "parameters": [], "src": "1625:0:10" }, - "scope": 1096, + "scope": 1122, "src": "1462:164:10", "stateMutability": "nonpayable", "superFunction": null, @@ -5026,22 +5026,22 @@ { "body": null, "documentation": null, - "id": 1015, + "id": 1041, "implemented": false, "kind": "function", "modifiers": [], "name": "liquidateBorrowAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 1011, + "id": 1037, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1002, + "id": 1028, "name": "cTokenBorrowed", "nodeType": "VariableDeclaration", - "scope": 1015, + "scope": 1041, "src": "1673:22:10", "stateVariable": false, "storageLocation": "default", @@ -5050,7 +5050,7 @@ "typeString": "address" }, "typeName": { - "id": 1001, + "id": 1027, "name": "address", "nodeType": "ElementaryTypeName", "src": "1673:7:10", @@ -5065,10 +5065,10 @@ }, { "constant": false, - "id": 1004, + "id": 1030, "name": "cTokenCollateral", "nodeType": "VariableDeclaration", - "scope": 1015, + "scope": 1041, "src": "1705:24:10", "stateVariable": false, "storageLocation": "default", @@ -5077,7 +5077,7 @@ "typeString": "address" }, "typeName": { - "id": 1003, + "id": 1029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:10", @@ -5092,10 +5092,10 @@ }, { "constant": false, - "id": 1006, + "id": 1032, "name": "liquidator", "nodeType": "VariableDeclaration", - "scope": 1015, + "scope": 1041, "src": "1739:18:10", "stateVariable": false, "storageLocation": "default", @@ -5104,7 +5104,7 @@ "typeString": "address" }, "typeName": { - "id": 1005, + "id": 1031, "name": "address", "nodeType": "ElementaryTypeName", "src": "1739:7:10", @@ -5119,10 +5119,10 @@ }, { "constant": false, - "id": 1008, + "id": 1034, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 1015, + "scope": 1041, "src": "1767:16:10", "stateVariable": false, "storageLocation": "default", @@ -5131,7 +5131,7 @@ "typeString": "address" }, "typeName": { - "id": 1007, + "id": 1033, "name": "address", "nodeType": "ElementaryTypeName", "src": "1767:7:10", @@ -5146,10 +5146,10 @@ }, { "constant": false, - "id": 1010, + "id": 1036, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 1015, + "scope": 1041, "src": "1793:16:10", "stateVariable": false, "storageLocation": "default", @@ -5158,7 +5158,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1009, + "id": 1035, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1793:4:10", @@ -5174,15 +5174,15 @@ "src": "1663:147:10" }, "returnParameters": { - "id": 1014, + "id": 1040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1013, + "id": 1039, "name": "", "nodeType": "VariableDeclaration", - "scope": 1015, + "scope": 1041, "src": "1829:4:10", "stateVariable": false, "storageLocation": "default", @@ -5191,7 +5191,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1012, + "id": 1038, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1829:4:10", @@ -5206,7 +5206,7 @@ ], "src": "1828:6:10" }, - "scope": 1096, + "scope": 1122, "src": "1632:203:10", "stateMutability": "nonpayable", "superFunction": null, @@ -5215,22 +5215,22 @@ { "body": null, "documentation": null, - "id": 1030, + "id": 1056, "implemented": false, "kind": "function", "modifiers": [], "name": "liquidateBorrowVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 1028, + "id": 1054, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1017, + "id": 1043, "name": "cTokenBorrowed", "nodeType": "VariableDeclaration", - "scope": 1030, + "scope": 1056, "src": "1880:22:10", "stateVariable": false, "storageLocation": "default", @@ -5239,7 +5239,7 @@ "typeString": "address" }, "typeName": { - "id": 1016, + "id": 1042, "name": "address", "nodeType": "ElementaryTypeName", "src": "1880:7:10", @@ -5254,10 +5254,10 @@ }, { "constant": false, - "id": 1019, + "id": 1045, "name": "cTokenCollateral", "nodeType": "VariableDeclaration", - "scope": 1030, + "scope": 1056, "src": "1912:24:10", "stateVariable": false, "storageLocation": "default", @@ -5266,7 +5266,7 @@ "typeString": "address" }, "typeName": { - "id": 1018, + "id": 1044, "name": "address", "nodeType": "ElementaryTypeName", "src": "1912:7:10", @@ -5281,10 +5281,10 @@ }, { "constant": false, - "id": 1021, + "id": 1047, "name": "liquidator", "nodeType": "VariableDeclaration", - "scope": 1030, + "scope": 1056, "src": "1946:18:10", "stateVariable": false, "storageLocation": "default", @@ -5293,7 +5293,7 @@ "typeString": "address" }, "typeName": { - "id": 1020, + "id": 1046, "name": "address", "nodeType": "ElementaryTypeName", "src": "1946:7:10", @@ -5308,10 +5308,10 @@ }, { "constant": false, - "id": 1023, + "id": 1049, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 1030, + "scope": 1056, "src": "1974:16:10", "stateVariable": false, "storageLocation": "default", @@ -5320,7 +5320,7 @@ "typeString": "address" }, "typeName": { - "id": 1022, + "id": 1048, "name": "address", "nodeType": "ElementaryTypeName", "src": "1974:7:10", @@ -5335,10 +5335,10 @@ }, { "constant": false, - "id": 1025, + "id": 1051, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 1030, + "scope": 1056, "src": "2000:16:10", "stateVariable": false, "storageLocation": "default", @@ -5347,7 +5347,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1024, + "id": 1050, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2000:4:10", @@ -5361,10 +5361,10 @@ }, { "constant": false, - "id": 1027, + "id": 1053, "name": "seizeTokens", "nodeType": "VariableDeclaration", - "scope": 1030, + "scope": 1056, "src": "2026:16:10", "stateVariable": false, "storageLocation": "default", @@ -5373,7 +5373,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1026, + "id": 1052, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2026:4:10", @@ -5389,12 +5389,12 @@ "src": "1870:173:10" }, "returnParameters": { - "id": 1029, + "id": 1055, "nodeType": "ParameterList", "parameters": [], "src": "2052:0:10" }, - "scope": 1096, + "scope": 1122, "src": "1840:213:10", "stateMutability": "nonpayable", "superFunction": null, @@ -5403,22 +5403,22 @@ { "body": null, "documentation": null, - "id": 1045, + "id": 1071, "implemented": false, "kind": "function", "modifiers": [], "name": "seizeAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 1041, + "id": 1067, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1032, + "id": 1058, "name": "cTokenCollateral", "nodeType": "VariableDeclaration", - "scope": 1045, + "scope": 1071, "src": "2090:24:10", "stateVariable": false, "storageLocation": "default", @@ -5427,7 +5427,7 @@ "typeString": "address" }, "typeName": { - "id": 1031, + "id": 1057, "name": "address", "nodeType": "ElementaryTypeName", "src": "2090:7:10", @@ -5442,10 +5442,10 @@ }, { "constant": false, - "id": 1034, + "id": 1060, "name": "cTokenBorrowed", "nodeType": "VariableDeclaration", - "scope": 1045, + "scope": 1071, "src": "2124:22:10", "stateVariable": false, "storageLocation": "default", @@ -5454,7 +5454,7 @@ "typeString": "address" }, "typeName": { - "id": 1033, + "id": 1059, "name": "address", "nodeType": "ElementaryTypeName", "src": "2124:7:10", @@ -5469,10 +5469,10 @@ }, { "constant": false, - "id": 1036, + "id": 1062, "name": "liquidator", "nodeType": "VariableDeclaration", - "scope": 1045, + "scope": 1071, "src": "2156:18:10", "stateVariable": false, "storageLocation": "default", @@ -5481,7 +5481,7 @@ "typeString": "address" }, "typeName": { - "id": 1035, + "id": 1061, "name": "address", "nodeType": "ElementaryTypeName", "src": "2156:7:10", @@ -5496,10 +5496,10 @@ }, { "constant": false, - "id": 1038, + "id": 1064, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 1045, + "scope": 1071, "src": "2184:16:10", "stateVariable": false, "storageLocation": "default", @@ -5508,7 +5508,7 @@ "typeString": "address" }, "typeName": { - "id": 1037, + "id": 1063, "name": "address", "nodeType": "ElementaryTypeName", "src": "2184:7:10", @@ -5523,10 +5523,10 @@ }, { "constant": false, - "id": 1040, + "id": 1066, "name": "seizeTokens", "nodeType": "VariableDeclaration", - "scope": 1045, + "scope": 1071, "src": "2210:16:10", "stateVariable": false, "storageLocation": "default", @@ -5535,7 +5535,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1039, + "id": 1065, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2210:4:10", @@ -5551,15 +5551,15 @@ "src": "2080:147:10" }, "returnParameters": { - "id": 1044, + "id": 1070, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1043, + "id": 1069, "name": "", "nodeType": "VariableDeclaration", - "scope": 1045, + "scope": 1071, "src": "2246:4:10", "stateVariable": false, "storageLocation": "default", @@ -5568,7 +5568,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1042, + "id": 1068, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2246:4:10", @@ -5583,7 +5583,7 @@ ], "src": "2245:6:10" }, - "scope": 1096, + "scope": 1122, "src": "2059:193:10", "stateMutability": "nonpayable", "superFunction": null, @@ -5592,22 +5592,22 @@ { "body": null, "documentation": null, - "id": 1058, + "id": 1084, "implemented": false, "kind": "function", "modifiers": [], "name": "seizeVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 1056, + "id": 1082, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1047, + "id": 1073, "name": "cTokenCollateral", "nodeType": "VariableDeclaration", - "scope": 1058, + "scope": 1084, "src": "2287:24:10", "stateVariable": false, "storageLocation": "default", @@ -5616,7 +5616,7 @@ "typeString": "address" }, "typeName": { - "id": 1046, + "id": 1072, "name": "address", "nodeType": "ElementaryTypeName", "src": "2287:7:10", @@ -5631,10 +5631,10 @@ }, { "constant": false, - "id": 1049, + "id": 1075, "name": "cTokenBorrowed", "nodeType": "VariableDeclaration", - "scope": 1058, + "scope": 1084, "src": "2321:22:10", "stateVariable": false, "storageLocation": "default", @@ -5643,7 +5643,7 @@ "typeString": "address" }, "typeName": { - "id": 1048, + "id": 1074, "name": "address", "nodeType": "ElementaryTypeName", "src": "2321:7:10", @@ -5658,10 +5658,10 @@ }, { "constant": false, - "id": 1051, + "id": 1077, "name": "liquidator", "nodeType": "VariableDeclaration", - "scope": 1058, + "scope": 1084, "src": "2353:18:10", "stateVariable": false, "storageLocation": "default", @@ -5670,7 +5670,7 @@ "typeString": "address" }, "typeName": { - "id": 1050, + "id": 1076, "name": "address", "nodeType": "ElementaryTypeName", "src": "2353:7:10", @@ -5685,10 +5685,10 @@ }, { "constant": false, - "id": 1053, + "id": 1079, "name": "borrower", "nodeType": "VariableDeclaration", - "scope": 1058, + "scope": 1084, "src": "2381:16:10", "stateVariable": false, "storageLocation": "default", @@ -5697,7 +5697,7 @@ "typeString": "address" }, "typeName": { - "id": 1052, + "id": 1078, "name": "address", "nodeType": "ElementaryTypeName", "src": "2381:7:10", @@ -5712,10 +5712,10 @@ }, { "constant": false, - "id": 1055, + "id": 1081, "name": "seizeTokens", "nodeType": "VariableDeclaration", - "scope": 1058, + "scope": 1084, "src": "2407:16:10", "stateVariable": false, "storageLocation": "default", @@ -5724,7 +5724,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1054, + "id": 1080, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2407:4:10", @@ -5740,12 +5740,12 @@ "src": "2277:147:10" }, "returnParameters": { - "id": 1057, + "id": 1083, "nodeType": "ParameterList", "parameters": [], "src": "2433:0:10" }, - "scope": 1096, + "scope": 1122, "src": "2257:177:10", "stateMutability": "nonpayable", "superFunction": null, @@ -5754,22 +5754,22 @@ { "body": null, "documentation": null, - "id": 1071, + "id": 1097, "implemented": false, "kind": "function", "modifiers": [], "name": "transferAllowed", "nodeType": "FunctionDefinition", "parameters": { - "id": 1067, + "id": 1093, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1060, + "id": 1086, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 1071, + "scope": 1097, "src": "2465:14:10", "stateVariable": false, "storageLocation": "default", @@ -5778,7 +5778,7 @@ "typeString": "address" }, "typeName": { - "id": 1059, + "id": 1085, "name": "address", "nodeType": "ElementaryTypeName", "src": "2465:7:10", @@ -5793,10 +5793,10 @@ }, { "constant": false, - "id": 1062, + "id": 1088, "name": "src", "nodeType": "VariableDeclaration", - "scope": 1071, + "scope": 1097, "src": "2481:11:10", "stateVariable": false, "storageLocation": "default", @@ -5805,7 +5805,7 @@ "typeString": "address" }, "typeName": { - "id": 1061, + "id": 1087, "name": "address", "nodeType": "ElementaryTypeName", "src": "2481:7:10", @@ -5820,10 +5820,10 @@ }, { "constant": false, - "id": 1064, + "id": 1090, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1071, + "scope": 1097, "src": "2494:11:10", "stateVariable": false, "storageLocation": "default", @@ -5832,7 +5832,7 @@ "typeString": "address" }, "typeName": { - "id": 1063, + "id": 1089, "name": "address", "nodeType": "ElementaryTypeName", "src": "2494:7:10", @@ -5847,10 +5847,10 @@ }, { "constant": false, - "id": 1066, + "id": 1092, "name": "transferTokens", "nodeType": "VariableDeclaration", - "scope": 1071, + "scope": 1097, "src": "2507:19:10", "stateVariable": false, "storageLocation": "default", @@ -5859,7 +5859,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1065, + "id": 1091, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2507:4:10", @@ -5875,15 +5875,15 @@ "src": "2464:63:10" }, "returnParameters": { - "id": 1070, + "id": 1096, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1069, + "id": 1095, "name": "", "nodeType": "VariableDeclaration", - "scope": 1071, + "scope": 1097, "src": "2546:4:10", "stateVariable": false, "storageLocation": "default", @@ -5892,7 +5892,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1068, + "id": 1094, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2546:4:10", @@ -5907,7 +5907,7 @@ ], "src": "2545:6:10" }, - "scope": 1096, + "scope": 1122, "src": "2440:112:10", "stateMutability": "nonpayable", "superFunction": null, @@ -5916,22 +5916,22 @@ { "body": null, "documentation": null, - "id": 1082, + "id": 1108, "implemented": false, "kind": "function", "modifiers": [], "name": "transferVerify", "nodeType": "FunctionDefinition", "parameters": { - "id": 1080, + "id": 1106, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1073, + "id": 1099, "name": "cToken", "nodeType": "VariableDeclaration", - "scope": 1082, + "scope": 1108, "src": "2581:14:10", "stateVariable": false, "storageLocation": "default", @@ -5940,7 +5940,7 @@ "typeString": "address" }, "typeName": { - "id": 1072, + "id": 1098, "name": "address", "nodeType": "ElementaryTypeName", "src": "2581:7:10", @@ -5955,10 +5955,10 @@ }, { "constant": false, - "id": 1075, + "id": 1101, "name": "src", "nodeType": "VariableDeclaration", - "scope": 1082, + "scope": 1108, "src": "2597:11:10", "stateVariable": false, "storageLocation": "default", @@ -5967,7 +5967,7 @@ "typeString": "address" }, "typeName": { - "id": 1074, + "id": 1100, "name": "address", "nodeType": "ElementaryTypeName", "src": "2597:7:10", @@ -5982,10 +5982,10 @@ }, { "constant": false, - "id": 1077, + "id": 1103, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1082, + "scope": 1108, "src": "2610:11:10", "stateVariable": false, "storageLocation": "default", @@ -5994,7 +5994,7 @@ "typeString": "address" }, "typeName": { - "id": 1076, + "id": 1102, "name": "address", "nodeType": "ElementaryTypeName", "src": "2610:7:10", @@ -6009,10 +6009,10 @@ }, { "constant": false, - "id": 1079, + "id": 1105, "name": "transferTokens", "nodeType": "VariableDeclaration", - "scope": 1082, + "scope": 1108, "src": "2623:19:10", "stateVariable": false, "storageLocation": "default", @@ -6021,7 +6021,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1078, + "id": 1104, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2623:4:10", @@ -6037,12 +6037,12 @@ "src": "2580:63:10" }, "returnParameters": { - "id": 1081, + "id": 1107, "nodeType": "ParameterList", "parameters": [], "src": "2652:0:10" }, - "scope": 1096, + "scope": 1122, "src": "2557:96:10", "stateMutability": "nonpayable", "superFunction": null, @@ -6051,22 +6051,22 @@ { "body": null, "documentation": "* Liquidity/Liquidation Calculations **", - "id": 1095, + "id": 1121, "implemented": false, "kind": "function", "modifiers": [], "name": "liquidateCalculateSeizeTokens", "nodeType": "FunctionDefinition", "parameters": { - "id": 1089, + "id": 1115, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1084, + "id": 1110, "name": "cTokenBorrowed", "nodeType": "VariableDeclaration", - "scope": 1095, + "scope": 1121, "src": "2757:22:10", "stateVariable": false, "storageLocation": "default", @@ -6075,7 +6075,7 @@ "typeString": "address" }, "typeName": { - "id": 1083, + "id": 1109, "name": "address", "nodeType": "ElementaryTypeName", "src": "2757:7:10", @@ -6090,10 +6090,10 @@ }, { "constant": false, - "id": 1086, + "id": 1112, "name": "cTokenCollateral", "nodeType": "VariableDeclaration", - "scope": 1095, + "scope": 1121, "src": "2789:24:10", "stateVariable": false, "storageLocation": "default", @@ -6102,7 +6102,7 @@ "typeString": "address" }, "typeName": { - "id": 1085, + "id": 1111, "name": "address", "nodeType": "ElementaryTypeName", "src": "2789:7:10", @@ -6117,10 +6117,10 @@ }, { "constant": false, - "id": 1088, + "id": 1114, "name": "repayAmount", "nodeType": "VariableDeclaration", - "scope": 1095, + "scope": 1121, "src": "2823:16:10", "stateVariable": false, "storageLocation": "default", @@ -6129,7 +6129,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1087, + "id": 1113, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2823:4:10", @@ -6145,15 +6145,15 @@ "src": "2747:93:10" }, "returnParameters": { - "id": 1094, + "id": 1120, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1091, + "id": 1117, "name": "", "nodeType": "VariableDeclaration", - "scope": 1095, + "scope": 1121, "src": "2864:4:10", "stateVariable": false, "storageLocation": "default", @@ -6162,7 +6162,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1090, + "id": 1116, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2864:4:10", @@ -6176,10 +6176,10 @@ }, { "constant": false, - "id": 1093, + "id": 1119, "name": "", "nodeType": "VariableDeclaration", - "scope": 1095, + "scope": 1121, "src": "2870:4:10", "stateVariable": false, "storageLocation": "default", @@ -6188,7 +6188,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1092, + "id": 1118, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2870:4:10", @@ -6203,14 +6203,14 @@ ], "src": "2863:12:10" }, - "scope": 1096, + "scope": 1122, "src": "2709:167:10", "stateMutability": "view", "superFunction": null, "visibility": "external" } ], - "scope": 1097, + "scope": 1123, "src": "25:2853:10" } ], @@ -6222,7 +6222,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.468Z", + "updatedAt": "2020-04-08T12:21:13.682Z", "devdoc": { "methods": { "isComptroller()": { diff --git a/packages/smart-contracts/artifacts/IDssProxyActions.json b/packages/smart-contracts/artifacts/IDssProxyActions.json index 2dede97..7fe204a 100644 --- a/packages/smart-contracts/artifacts/IDssProxyActions.json +++ b/packages/smart-contracts/artifacts/IDssProxyActions.json @@ -1283,14 +1283,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/makerdao/IDssProxyActions.sol", "exportedSymbols": { "IDssProxyActions": [ - 1565 + 1591 ] }, - "id": 1566, + "id": 1592, "nodeType": "SourceUnit", "nodes": [ { - "id": 1098, + "id": 1124, "literals": [ "solidity", "0.5", @@ -1305,9 +1305,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1565, + "id": 1591, "linearizedBaseContracts": [ - 1565 + 1591 ], "name": "IDssProxyActions", "nodeType": "ContractDefinition", @@ -1315,22 +1315,22 @@ { "body": null, "documentation": null, - "id": 1109, + "id": 1135, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 1107, + "id": 1133, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1100, + "id": 1126, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1109, + "scope": 1135, "src": "74:15:11", "stateVariable": false, "storageLocation": "default", @@ -1339,7 +1339,7 @@ "typeString": "address" }, "typeName": { - "id": 1099, + "id": 1125, "name": "address", "nodeType": "ElementaryTypeName", "src": "74:7:11", @@ -1354,10 +1354,10 @@ }, { "constant": false, - "id": 1102, + "id": 1128, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1109, + "scope": 1135, "src": "90:11:11", "stateVariable": false, "storageLocation": "default", @@ -1366,7 +1366,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1101, + "id": 1127, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "90:7:11", @@ -1380,10 +1380,10 @@ }, { "constant": false, - "id": 1104, + "id": 1130, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 1109, + "scope": 1135, "src": "102:11:11", "stateVariable": false, "storageLocation": "default", @@ -1392,7 +1392,7 @@ "typeString": "address" }, "typeName": { - "id": 1103, + "id": 1129, "name": "address", "nodeType": "ElementaryTypeName", "src": "102:7:11", @@ -1407,10 +1407,10 @@ }, { "constant": false, - "id": 1106, + "id": 1132, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 1109, + "scope": 1135, "src": "114:10:11", "stateVariable": false, "storageLocation": "default", @@ -1419,7 +1419,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1105, + "id": 1131, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "114:7:11", @@ -1435,12 +1435,12 @@ "src": "73:52:11" }, "returnParameters": { - "id": 1108, + "id": 1134, "nodeType": "ParameterList", "parameters": [], "src": "134:0:11" }, - "scope": 1565, + "scope": 1591, "src": "56:79:11", "stateMutability": "nonpayable", "superFunction": null, @@ -1449,22 +1449,22 @@ { "body": null, "documentation": null, - "id": 1118, + "id": 1144, "implemented": false, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 1116, + "id": 1142, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1111, + "id": 1137, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 1118, + "scope": 1144, "src": "162:11:11", "stateVariable": false, "storageLocation": "default", @@ -1473,7 +1473,7 @@ "typeString": "address" }, "typeName": { - "id": 1110, + "id": 1136, "name": "address", "nodeType": "ElementaryTypeName", "src": "162:7:11", @@ -1488,10 +1488,10 @@ }, { "constant": false, - "id": 1113, + "id": 1139, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 1118, + "scope": 1144, "src": "174:11:11", "stateVariable": false, "storageLocation": "default", @@ -1500,7 +1500,7 @@ "typeString": "address" }, "typeName": { - "id": 1112, + "id": 1138, "name": "address", "nodeType": "ElementaryTypeName", "src": "174:7:11", @@ -1515,10 +1515,10 @@ }, { "constant": false, - "id": 1115, + "id": 1141, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1118, + "scope": 1144, "src": "186:11:11", "stateVariable": false, "storageLocation": "default", @@ -1527,7 +1527,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1114, + "id": 1140, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "186:7:11", @@ -1543,12 +1543,12 @@ "src": "161:37:11" }, "returnParameters": { - "id": 1117, + "id": 1143, "nodeType": "ParameterList", "parameters": [], "src": "207:0:11" }, - "scope": 1565, + "scope": 1591, "src": "140:68:11", "stateMutability": "nonpayable", "superFunction": null, @@ -1557,22 +1557,22 @@ { "body": null, "documentation": null, - "id": 1131, + "id": 1157, "implemented": false, "kind": "function", "modifiers": [], "name": "draw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1129, + "id": 1155, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1120, + "id": 1146, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1131, + "scope": 1157, "src": "227:15:11", "stateVariable": false, "storageLocation": "default", @@ -1581,7 +1581,7 @@ "typeString": "address" }, "typeName": { - "id": 1119, + "id": 1145, "name": "address", "nodeType": "ElementaryTypeName", "src": "227:7:11", @@ -1596,10 +1596,10 @@ }, { "constant": false, - "id": 1122, + "id": 1148, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 1131, + "scope": 1157, "src": "243:11:11", "stateVariable": false, "storageLocation": "default", @@ -1608,7 +1608,7 @@ "typeString": "address" }, "typeName": { - "id": 1121, + "id": 1147, "name": "address", "nodeType": "ElementaryTypeName", "src": "243:7:11", @@ -1623,10 +1623,10 @@ }, { "constant": false, - "id": 1124, + "id": 1150, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1131, + "scope": 1157, "src": "255:15:11", "stateVariable": false, "storageLocation": "default", @@ -1635,7 +1635,7 @@ "typeString": "address" }, "typeName": { - "id": 1123, + "id": 1149, "name": "address", "nodeType": "ElementaryTypeName", "src": "255:7:11", @@ -1650,10 +1650,10 @@ }, { "constant": false, - "id": 1126, + "id": 1152, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1131, + "scope": 1157, "src": "271:11:11", "stateVariable": false, "storageLocation": "default", @@ -1662,7 +1662,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1125, + "id": 1151, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "271:7:11", @@ -1676,10 +1676,10 @@ }, { "constant": false, - "id": 1128, + "id": 1154, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1131, + "scope": 1157, "src": "283:11:11", "stateVariable": false, "storageLocation": "default", @@ -1688,7 +1688,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1127, + "id": 1153, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "283:7:11", @@ -1704,12 +1704,12 @@ "src": "226:69:11" }, "returnParameters": { - "id": 1130, + "id": 1156, "nodeType": "ParameterList", "parameters": [], "src": "304:0:11" }, - "scope": 1565, + "scope": 1591, "src": "213:92:11", "stateMutability": "nonpayable", "superFunction": null, @@ -1718,22 +1718,22 @@ { "body": null, "documentation": null, - "id": 1140, + "id": 1166, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 1138, + "id": 1164, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1133, + "id": 1159, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1140, + "scope": 1166, "src": "325:15:11", "stateVariable": false, "storageLocation": "default", @@ -1742,7 +1742,7 @@ "typeString": "address" }, "typeName": { - "id": 1132, + "id": 1158, "name": "address", "nodeType": "ElementaryTypeName", "src": "325:7:11", @@ -1757,10 +1757,10 @@ }, { "constant": false, - "id": 1135, + "id": 1161, "name": "src", "nodeType": "VariableDeclaration", - "scope": 1140, + "scope": 1166, "src": "341:11:11", "stateVariable": false, "storageLocation": "default", @@ -1769,7 +1769,7 @@ "typeString": "address" }, "typeName": { - "id": 1134, + "id": 1160, "name": "address", "nodeType": "ElementaryTypeName", "src": "341:7:11", @@ -1784,10 +1784,10 @@ }, { "constant": false, - "id": 1137, + "id": 1163, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1140, + "scope": 1166, "src": "353:11:11", "stateVariable": false, "storageLocation": "default", @@ -1796,7 +1796,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1136, + "id": 1162, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "353:7:11", @@ -1812,12 +1812,12 @@ "src": "324:41:11" }, "returnParameters": { - "id": 1139, + "id": 1165, "nodeType": "ParameterList", "parameters": [], "src": "374:0:11" }, - "scope": 1565, + "scope": 1591, "src": "310:65:11", "stateMutability": "nonpayable", "superFunction": null, @@ -1826,22 +1826,22 @@ { "body": null, "documentation": null, - "id": 1147, + "id": 1173, "implemented": false, "kind": "function", "modifiers": [], "name": "ethJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 1145, + "id": 1171, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1142, + "id": 1168, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 1147, + "scope": 1173, "src": "402:11:11", "stateVariable": false, "storageLocation": "default", @@ -1850,7 +1850,7 @@ "typeString": "address" }, "typeName": { - "id": 1141, + "id": 1167, "name": "address", "nodeType": "ElementaryTypeName", "src": "402:7:11", @@ -1865,10 +1865,10 @@ }, { "constant": false, - "id": 1144, + "id": 1170, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 1147, + "scope": 1173, "src": "414:11:11", "stateVariable": false, "storageLocation": "default", @@ -1877,7 +1877,7 @@ "typeString": "address" }, "typeName": { - "id": 1143, + "id": 1169, "name": "address", "nodeType": "ElementaryTypeName", "src": "414:7:11", @@ -1894,12 +1894,12 @@ "src": "401:25:11" }, "returnParameters": { - "id": 1146, + "id": 1172, "nodeType": "ParameterList", "parameters": [], "src": "435:0:11" }, - "scope": 1565, + "scope": 1591, "src": "380:56:11", "stateMutability": "nonpayable", "superFunction": null, @@ -1908,22 +1908,22 @@ { "body": null, "documentation": null, - "id": 1158, + "id": 1184, "implemented": false, "kind": "function", "modifiers": [], "name": "exitETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 1156, + "id": 1182, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1149, + "id": 1175, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1158, + "scope": 1184, "src": "458:15:11", "stateVariable": false, "storageLocation": "default", @@ -1932,7 +1932,7 @@ "typeString": "address" }, "typeName": { - "id": 1148, + "id": 1174, "name": "address", "nodeType": "ElementaryTypeName", "src": "458:7:11", @@ -1947,10 +1947,10 @@ }, { "constant": false, - "id": 1151, + "id": 1177, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1158, + "scope": 1184, "src": "474:15:11", "stateVariable": false, "storageLocation": "default", @@ -1959,7 +1959,7 @@ "typeString": "address" }, "typeName": { - "id": 1150, + "id": 1176, "name": "address", "nodeType": "ElementaryTypeName", "src": "474:7:11", @@ -1974,10 +1974,10 @@ }, { "constant": false, - "id": 1153, + "id": 1179, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1158, + "scope": 1184, "src": "490:11:11", "stateVariable": false, "storageLocation": "default", @@ -1986,7 +1986,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1152, + "id": 1178, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "490:7:11", @@ -2000,10 +2000,10 @@ }, { "constant": false, - "id": 1155, + "id": 1181, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1158, + "scope": 1184, "src": "502:11:11", "stateVariable": false, "storageLocation": "default", @@ -2012,7 +2012,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1154, + "id": 1180, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "502:7:11", @@ -2028,12 +2028,12 @@ "src": "457:57:11" }, "returnParameters": { - "id": 1157, + "id": 1183, "nodeType": "ParameterList", "parameters": [], "src": "523:0:11" }, - "scope": 1565, + "scope": 1591, "src": "441:83:11", "stateMutability": "nonpayable", "superFunction": null, @@ -2042,22 +2042,22 @@ { "body": null, "documentation": null, - "id": 1169, + "id": 1195, "implemented": false, "kind": "function", "modifiers": [], "name": "exitGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 1167, + "id": 1193, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1160, + "id": 1186, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1169, + "scope": 1195, "src": "546:15:11", "stateVariable": false, "storageLocation": "default", @@ -2066,7 +2066,7 @@ "typeString": "address" }, "typeName": { - "id": 1159, + "id": 1185, "name": "address", "nodeType": "ElementaryTypeName", "src": "546:7:11", @@ -2081,10 +2081,10 @@ }, { "constant": false, - "id": 1162, + "id": 1188, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1169, + "scope": 1195, "src": "562:15:11", "stateVariable": false, "storageLocation": "default", @@ -2093,7 +2093,7 @@ "typeString": "address" }, "typeName": { - "id": 1161, + "id": 1187, "name": "address", "nodeType": "ElementaryTypeName", "src": "562:7:11", @@ -2108,10 +2108,10 @@ }, { "constant": false, - "id": 1164, + "id": 1190, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1169, + "scope": 1195, "src": "578:11:11", "stateVariable": false, "storageLocation": "default", @@ -2120,7 +2120,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1163, + "id": 1189, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "578:7:11", @@ -2134,10 +2134,10 @@ }, { "constant": false, - "id": 1166, + "id": 1192, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1169, + "scope": 1195, "src": "590:11:11", "stateVariable": false, "storageLocation": "default", @@ -2146,7 +2146,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1165, + "id": 1191, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "590:7:11", @@ -2162,12 +2162,12 @@ "src": "545:57:11" }, "returnParameters": { - "id": 1168, + "id": 1194, "nodeType": "ParameterList", "parameters": [], "src": "611:0:11" }, - "scope": 1565, + "scope": 1591, "src": "529:83:11", "stateMutability": "nonpayable", "superFunction": null, @@ -2176,22 +2176,22 @@ { "body": null, "documentation": null, - "id": 1180, + "id": 1206, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 1178, + "id": 1204, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1171, + "id": 1197, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1180, + "scope": 1206, "src": "631:15:11", "stateVariable": false, "storageLocation": "default", @@ -2200,7 +2200,7 @@ "typeString": "address" }, "typeName": { - "id": 1170, + "id": 1196, "name": "address", "nodeType": "ElementaryTypeName", "src": "631:7:11", @@ -2215,10 +2215,10 @@ }, { "constant": false, - "id": 1173, + "id": 1199, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1180, + "scope": 1206, "src": "647:11:11", "stateVariable": false, "storageLocation": "default", @@ -2227,7 +2227,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1172, + "id": 1198, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "647:7:11", @@ -2241,10 +2241,10 @@ }, { "constant": false, - "id": 1175, + "id": 1201, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1180, + "scope": 1206, "src": "659:11:11", "stateVariable": false, "storageLocation": "default", @@ -2253,7 +2253,7 @@ "typeString": "address" }, "typeName": { - "id": 1174, + "id": 1200, "name": "address", "nodeType": "ElementaryTypeName", "src": "659:7:11", @@ -2268,10 +2268,10 @@ }, { "constant": false, - "id": 1177, + "id": 1203, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1180, + "scope": 1206, "src": "671:11:11", "stateVariable": false, "storageLocation": "default", @@ -2280,7 +2280,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1176, + "id": 1202, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "671:7:11", @@ -2296,12 +2296,12 @@ "src": "630:53:11" }, "returnParameters": { - "id": 1179, + "id": 1205, "nodeType": "ParameterList", "parameters": [], "src": "692:0:11" }, - "scope": 1565, + "scope": 1591, "src": "617:76:11", "stateMutability": "nonpayable", "superFunction": null, @@ -2310,22 +2310,22 @@ { "body": null, "documentation": null, - "id": 1191, + "id": 1217, "implemented": false, "kind": "function", "modifiers": [], "name": "freeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 1189, + "id": 1215, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1182, + "id": 1208, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1191, + "scope": 1217, "src": "715:15:11", "stateVariable": false, "storageLocation": "default", @@ -2334,7 +2334,7 @@ "typeString": "address" }, "typeName": { - "id": 1181, + "id": 1207, "name": "address", "nodeType": "ElementaryTypeName", "src": "715:7:11", @@ -2349,10 +2349,10 @@ }, { "constant": false, - "id": 1184, + "id": 1210, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1191, + "scope": 1217, "src": "731:15:11", "stateVariable": false, "storageLocation": "default", @@ -2361,7 +2361,7 @@ "typeString": "address" }, "typeName": { - "id": 1183, + "id": 1209, "name": "address", "nodeType": "ElementaryTypeName", "src": "731:7:11", @@ -2376,10 +2376,10 @@ }, { "constant": false, - "id": 1186, + "id": 1212, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1191, + "scope": 1217, "src": "747:11:11", "stateVariable": false, "storageLocation": "default", @@ -2388,7 +2388,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1185, + "id": 1211, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "747:7:11", @@ -2402,10 +2402,10 @@ }, { "constant": false, - "id": 1188, + "id": 1214, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1191, + "scope": 1217, "src": "759:11:11", "stateVariable": false, "storageLocation": "default", @@ -2414,7 +2414,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1187, + "id": 1213, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "759:7:11", @@ -2430,12 +2430,12 @@ "src": "714:57:11" }, "returnParameters": { - "id": 1190, + "id": 1216, "nodeType": "ParameterList", "parameters": [], "src": "780:0:11" }, - "scope": 1565, + "scope": 1591, "src": "698:83:11", "stateMutability": "nonpayable", "superFunction": null, @@ -2444,22 +2444,22 @@ { "body": null, "documentation": null, - "id": 1202, + "id": 1228, "implemented": false, "kind": "function", "modifiers": [], "name": "freeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 1200, + "id": 1226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1193, + "id": 1219, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1202, + "scope": 1228, "src": "803:15:11", "stateVariable": false, "storageLocation": "default", @@ -2468,7 +2468,7 @@ "typeString": "address" }, "typeName": { - "id": 1192, + "id": 1218, "name": "address", "nodeType": "ElementaryTypeName", "src": "803:7:11", @@ -2483,10 +2483,10 @@ }, { "constant": false, - "id": 1195, + "id": 1221, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1202, + "scope": 1228, "src": "819:15:11", "stateVariable": false, "storageLocation": "default", @@ -2495,7 +2495,7 @@ "typeString": "address" }, "typeName": { - "id": 1194, + "id": 1220, "name": "address", "nodeType": "ElementaryTypeName", "src": "819:7:11", @@ -2510,10 +2510,10 @@ }, { "constant": false, - "id": 1197, + "id": 1223, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1202, + "scope": 1228, "src": "835:11:11", "stateVariable": false, "storageLocation": "default", @@ -2522,7 +2522,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1196, + "id": 1222, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "835:7:11", @@ -2536,10 +2536,10 @@ }, { "constant": false, - "id": 1199, + "id": 1225, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1202, + "scope": 1228, "src": "847:11:11", "stateVariable": false, "storageLocation": "default", @@ -2548,7 +2548,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1198, + "id": 1224, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "847:7:11", @@ -2564,12 +2564,12 @@ "src": "802:57:11" }, "returnParameters": { - "id": 1201, + "id": 1227, "nodeType": "ParameterList", "parameters": [], "src": "868:0:11" }, - "scope": 1565, + "scope": 1591, "src": "786:83:11", "stateMutability": "nonpayable", "superFunction": null, @@ -2578,22 +2578,22 @@ { "body": null, "documentation": null, - "id": 1213, + "id": 1239, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 1211, + "id": 1237, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1204, + "id": 1230, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1213, + "scope": 1239, "src": "888:15:11", "stateVariable": false, "storageLocation": "default", @@ -2602,7 +2602,7 @@ "typeString": "address" }, "typeName": { - "id": 1203, + "id": 1229, "name": "address", "nodeType": "ElementaryTypeName", "src": "888:7:11", @@ -2617,10 +2617,10 @@ }, { "constant": false, - "id": 1206, + "id": 1232, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1213, + "scope": 1239, "src": "904:11:11", "stateVariable": false, "storageLocation": "default", @@ -2629,7 +2629,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1205, + "id": 1231, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "904:7:11", @@ -2643,10 +2643,10 @@ }, { "constant": false, - "id": 1208, + "id": 1234, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 1213, + "scope": 1239, "src": "916:11:11", "stateVariable": false, "storageLocation": "default", @@ -2655,7 +2655,7 @@ "typeString": "int256" }, "typeName": { - "id": 1207, + "id": 1233, "name": "int256", "nodeType": "ElementaryTypeName", "src": "916:6:11", @@ -2669,10 +2669,10 @@ }, { "constant": false, - "id": 1210, + "id": 1236, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 1213, + "scope": 1239, "src": "928:11:11", "stateVariable": false, "storageLocation": "default", @@ -2681,7 +2681,7 @@ "typeString": "int256" }, "typeName": { - "id": 1209, + "id": 1235, "name": "int256", "nodeType": "ElementaryTypeName", "src": "928:6:11", @@ -2697,12 +2697,12 @@ "src": "887:53:11" }, "returnParameters": { - "id": 1212, + "id": 1238, "nodeType": "ParameterList", "parameters": [], "src": "949:0:11" }, - "scope": 1565, + "scope": 1591, "src": "874:76:11", "stateMutability": "nonpayable", "superFunction": null, @@ -2711,22 +2711,22 @@ { "body": null, "documentation": null, - "id": 1224, + "id": 1250, "implemented": false, "kind": "function", "modifiers": [], "name": "gemJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 1222, + "id": 1248, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1215, + "id": 1241, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 1224, + "scope": 1250, "src": "977:11:11", "stateVariable": false, "storageLocation": "default", @@ -2735,7 +2735,7 @@ "typeString": "address" }, "typeName": { - "id": 1214, + "id": 1240, "name": "address", "nodeType": "ElementaryTypeName", "src": "977:7:11", @@ -2750,10 +2750,10 @@ }, { "constant": false, - "id": 1217, + "id": 1243, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 1224, + "scope": 1250, "src": "989:11:11", "stateVariable": false, "storageLocation": "default", @@ -2762,7 +2762,7 @@ "typeString": "address" }, "typeName": { - "id": 1216, + "id": 1242, "name": "address", "nodeType": "ElementaryTypeName", "src": "989:7:11", @@ -2777,10 +2777,10 @@ }, { "constant": false, - "id": 1219, + "id": 1245, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1224, + "scope": 1250, "src": "1001:11:11", "stateVariable": false, "storageLocation": "default", @@ -2789,7 +2789,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1218, + "id": 1244, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1001:7:11", @@ -2803,10 +2803,10 @@ }, { "constant": false, - "id": 1221, + "id": 1247, "name": "transferFrom", "nodeType": "VariableDeclaration", - "scope": 1224, + "scope": 1250, "src": "1013:17:11", "stateVariable": false, "storageLocation": "default", @@ -2815,7 +2815,7 @@ "typeString": "bool" }, "typeName": { - "id": 1220, + "id": 1246, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1013:4:11", @@ -2831,12 +2831,12 @@ "src": "976:55:11" }, "returnParameters": { - "id": 1223, + "id": 1249, "nodeType": "ParameterList", "parameters": [], "src": "1040:0:11" }, - "scope": 1565, + "scope": 1591, "src": "955:86:11", "stateMutability": "nonpayable", "superFunction": null, @@ -2845,22 +2845,22 @@ { "body": null, "documentation": null, - "id": 1233, + "id": 1259, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 1231, + "id": 1257, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1226, + "id": 1252, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1233, + "scope": 1259, "src": "1060:15:11", "stateVariable": false, "storageLocation": "default", @@ -2869,7 +2869,7 @@ "typeString": "address" }, "typeName": { - "id": 1225, + "id": 1251, "name": "address", "nodeType": "ElementaryTypeName", "src": "1060:7:11", @@ -2884,10 +2884,10 @@ }, { "constant": false, - "id": 1228, + "id": 1254, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1233, + "scope": 1259, "src": "1076:11:11", "stateVariable": false, "storageLocation": "default", @@ -2896,7 +2896,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1227, + "id": 1253, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1076:7:11", @@ -2910,10 +2910,10 @@ }, { "constant": false, - "id": 1230, + "id": 1256, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 1233, + "scope": 1259, "src": "1088:11:11", "stateVariable": false, "storageLocation": "default", @@ -2922,7 +2922,7 @@ "typeString": "address" }, "typeName": { - "id": 1229, + "id": 1255, "name": "address", "nodeType": "ElementaryTypeName", "src": "1088:7:11", @@ -2939,12 +2939,12 @@ "src": "1059:41:11" }, "returnParameters": { - "id": 1232, + "id": 1258, "nodeType": "ParameterList", "parameters": [], "src": "1109:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1046:64:11", "stateMutability": "nonpayable", "superFunction": null, @@ -2953,22 +2953,22 @@ { "body": null, "documentation": null, - "id": 1244, + "id": 1270, "implemented": false, "kind": "function", "modifiers": [], "name": "giveToProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 1242, + "id": 1268, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1235, + "id": 1261, "name": "proxyRegistry", "nodeType": "VariableDeclaration", - "scope": 1244, + "scope": 1270, "src": "1136:21:11", "stateVariable": false, "storageLocation": "default", @@ -2977,7 +2977,7 @@ "typeString": "address" }, "typeName": { - "id": 1234, + "id": 1260, "name": "address", "nodeType": "ElementaryTypeName", "src": "1136:7:11", @@ -2992,10 +2992,10 @@ }, { "constant": false, - "id": 1237, + "id": 1263, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1244, + "scope": 1270, "src": "1158:15:11", "stateVariable": false, "storageLocation": "default", @@ -3004,7 +3004,7 @@ "typeString": "address" }, "typeName": { - "id": 1236, + "id": 1262, "name": "address", "nodeType": "ElementaryTypeName", "src": "1158:7:11", @@ -3019,10 +3019,10 @@ }, { "constant": false, - "id": 1239, + "id": 1265, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1244, + "scope": 1270, "src": "1174:11:11", "stateVariable": false, "storageLocation": "default", @@ -3031,7 +3031,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1238, + "id": 1264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1174:7:11", @@ -3045,10 +3045,10 @@ }, { "constant": false, - "id": 1241, + "id": 1267, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1244, + "scope": 1270, "src": "1186:11:11", "stateVariable": false, "storageLocation": "default", @@ -3057,7 +3057,7 @@ "typeString": "address" }, "typeName": { - "id": 1240, + "id": 1266, "name": "address", "nodeType": "ElementaryTypeName", "src": "1186:7:11", @@ -3074,12 +3074,12 @@ "src": "1135:63:11" }, "returnParameters": { - "id": 1243, + "id": 1269, "nodeType": "ParameterList", "parameters": [], "src": "1207:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1115:93:11", "stateMutability": "nonpayable", "superFunction": null, @@ -3088,22 +3088,22 @@ { "body": null, "documentation": null, - "id": 1251, + "id": 1277, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 1249, + "id": 1275, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1246, + "id": 1272, "name": "obj", "nodeType": "VariableDeclaration", - "scope": 1251, + "scope": 1277, "src": "1227:11:11", "stateVariable": false, "storageLocation": "default", @@ -3112,7 +3112,7 @@ "typeString": "address" }, "typeName": { - "id": 1245, + "id": 1271, "name": "address", "nodeType": "ElementaryTypeName", "src": "1227:7:11", @@ -3127,10 +3127,10 @@ }, { "constant": false, - "id": 1248, + "id": 1274, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 1251, + "scope": 1277, "src": "1239:11:11", "stateVariable": false, "storageLocation": "default", @@ -3139,7 +3139,7 @@ "typeString": "address" }, "typeName": { - "id": 1247, + "id": 1273, "name": "address", "nodeType": "ElementaryTypeName", "src": "1239:7:11", @@ -3156,12 +3156,12 @@ "src": "1226:25:11" }, "returnParameters": { - "id": 1250, + "id": 1276, "nodeType": "ParameterList", "parameters": [], "src": "1260:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1213:48:11", "stateMutability": "nonpayable", "superFunction": null, @@ -3170,22 +3170,22 @@ { "body": null, "documentation": null, - "id": 1260, + "id": 1286, "implemented": false, "kind": "function", "modifiers": [], "name": "lockETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 1258, + "id": 1284, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1253, + "id": 1279, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1260, + "scope": 1286, "src": "1283:15:11", "stateVariable": false, "storageLocation": "default", @@ -3194,7 +3194,7 @@ "typeString": "address" }, "typeName": { - "id": 1252, + "id": 1278, "name": "address", "nodeType": "ElementaryTypeName", "src": "1283:7:11", @@ -3209,10 +3209,10 @@ }, { "constant": false, - "id": 1255, + "id": 1281, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1260, + "scope": 1286, "src": "1299:15:11", "stateVariable": false, "storageLocation": "default", @@ -3221,7 +3221,7 @@ "typeString": "address" }, "typeName": { - "id": 1254, + "id": 1280, "name": "address", "nodeType": "ElementaryTypeName", "src": "1299:7:11", @@ -3236,10 +3236,10 @@ }, { "constant": false, - "id": 1257, + "id": 1283, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1260, + "scope": 1286, "src": "1315:11:11", "stateVariable": false, "storageLocation": "default", @@ -3248,7 +3248,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1256, + "id": 1282, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1315:7:11", @@ -3264,12 +3264,12 @@ "src": "1282:45:11" }, "returnParameters": { - "id": 1259, + "id": 1285, "nodeType": "ParameterList", "parameters": [], "src": "1336:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1266:71:11", "stateMutability": "nonpayable", "superFunction": null, @@ -3278,22 +3278,22 @@ { "body": null, "documentation": null, - "id": 1275, + "id": 1301, "implemented": false, "kind": "function", "modifiers": [], "name": "lockETHAndDraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1273, + "id": 1299, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1262, + "id": 1288, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1275, + "scope": 1301, "src": "1366:15:11", "stateVariable": false, "storageLocation": "default", @@ -3302,7 +3302,7 @@ "typeString": "address" }, "typeName": { - "id": 1261, + "id": 1287, "name": "address", "nodeType": "ElementaryTypeName", "src": "1366:7:11", @@ -3317,10 +3317,10 @@ }, { "constant": false, - "id": 1264, + "id": 1290, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 1275, + "scope": 1301, "src": "1382:11:11", "stateVariable": false, "storageLocation": "default", @@ -3329,7 +3329,7 @@ "typeString": "address" }, "typeName": { - "id": 1263, + "id": 1289, "name": "address", "nodeType": "ElementaryTypeName", "src": "1382:7:11", @@ -3344,10 +3344,10 @@ }, { "constant": false, - "id": 1266, + "id": 1292, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1275, + "scope": 1301, "src": "1394:15:11", "stateVariable": false, "storageLocation": "default", @@ -3356,7 +3356,7 @@ "typeString": "address" }, "typeName": { - "id": 1265, + "id": 1291, "name": "address", "nodeType": "ElementaryTypeName", "src": "1394:7:11", @@ -3371,10 +3371,10 @@ }, { "constant": false, - "id": 1268, + "id": 1294, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1275, + "scope": 1301, "src": "1410:15:11", "stateVariable": false, "storageLocation": "default", @@ -3383,7 +3383,7 @@ "typeString": "address" }, "typeName": { - "id": 1267, + "id": 1293, "name": "address", "nodeType": "ElementaryTypeName", "src": "1410:7:11", @@ -3398,10 +3398,10 @@ }, { "constant": false, - "id": 1270, + "id": 1296, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1275, + "scope": 1301, "src": "1426:11:11", "stateVariable": false, "storageLocation": "default", @@ -3410,7 +3410,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1269, + "id": 1295, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1426:7:11", @@ -3424,10 +3424,10 @@ }, { "constant": false, - "id": 1272, + "id": 1298, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1275, + "scope": 1301, "src": "1438:12:11", "stateVariable": false, "storageLocation": "default", @@ -3436,7 +3436,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1271, + "id": 1297, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1438:7:11", @@ -3452,12 +3452,12 @@ "src": "1365:86:11" }, "returnParameters": { - "id": 1274, + "id": 1300, "nodeType": "ParameterList", "parameters": [], "src": "1460:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1342:119:11", "stateMutability": "nonpayable", "superFunction": null, @@ -3466,22 +3466,22 @@ { "body": null, "documentation": null, - "id": 1288, + "id": 1314, "implemented": false, "kind": "function", "modifiers": [], "name": "lockGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 1286, + "id": 1312, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1277, + "id": 1303, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1288, + "scope": 1314, "src": "1483:15:11", "stateVariable": false, "storageLocation": "default", @@ -3490,7 +3490,7 @@ "typeString": "address" }, "typeName": { - "id": 1276, + "id": 1302, "name": "address", "nodeType": "ElementaryTypeName", "src": "1483:7:11", @@ -3505,10 +3505,10 @@ }, { "constant": false, - "id": 1279, + "id": 1305, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1288, + "scope": 1314, "src": "1499:15:11", "stateVariable": false, "storageLocation": "default", @@ -3517,7 +3517,7 @@ "typeString": "address" }, "typeName": { - "id": 1278, + "id": 1304, "name": "address", "nodeType": "ElementaryTypeName", "src": "1499:7:11", @@ -3532,10 +3532,10 @@ }, { "constant": false, - "id": 1281, + "id": 1307, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1288, + "scope": 1314, "src": "1515:11:11", "stateVariable": false, "storageLocation": "default", @@ -3544,7 +3544,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1280, + "id": 1306, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1515:7:11", @@ -3558,10 +3558,10 @@ }, { "constant": false, - "id": 1283, + "id": 1309, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1288, + "scope": 1314, "src": "1527:11:11", "stateVariable": false, "storageLocation": "default", @@ -3570,7 +3570,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1282, + "id": 1308, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1527:7:11", @@ -3584,10 +3584,10 @@ }, { "constant": false, - "id": 1285, + "id": 1311, "name": "transferFrom", "nodeType": "VariableDeclaration", - "scope": 1288, + "scope": 1314, "src": "1539:17:11", "stateVariable": false, "storageLocation": "default", @@ -3596,7 +3596,7 @@ "typeString": "bool" }, "typeName": { - "id": 1284, + "id": 1310, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1539:4:11", @@ -3612,12 +3612,12 @@ "src": "1482:75:11" }, "returnParameters": { - "id": 1287, + "id": 1313, "nodeType": "ParameterList", "parameters": [], "src": "1566:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1466:101:11", "stateMutability": "nonpayable", "superFunction": null, @@ -3626,22 +3626,22 @@ { "body": null, "documentation": null, - "id": 1307, + "id": 1333, "implemented": false, "kind": "function", "modifiers": [], "name": "lockGemAndDraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1305, + "id": 1331, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1290, + "id": 1316, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1596:15:11", "stateVariable": false, "storageLocation": "default", @@ -3650,7 +3650,7 @@ "typeString": "address" }, "typeName": { - "id": 1289, + "id": 1315, "name": "address", "nodeType": "ElementaryTypeName", "src": "1596:7:11", @@ -3665,10 +3665,10 @@ }, { "constant": false, - "id": 1292, + "id": 1318, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1612:11:11", "stateVariable": false, "storageLocation": "default", @@ -3677,7 +3677,7 @@ "typeString": "address" }, "typeName": { - "id": 1291, + "id": 1317, "name": "address", "nodeType": "ElementaryTypeName", "src": "1612:7:11", @@ -3692,10 +3692,10 @@ }, { "constant": false, - "id": 1294, + "id": 1320, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1624:15:11", "stateVariable": false, "storageLocation": "default", @@ -3704,7 +3704,7 @@ "typeString": "address" }, "typeName": { - "id": 1293, + "id": 1319, "name": "address", "nodeType": "ElementaryTypeName", "src": "1624:7:11", @@ -3719,10 +3719,10 @@ }, { "constant": false, - "id": 1296, + "id": 1322, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1640:15:11", "stateVariable": false, "storageLocation": "default", @@ -3731,7 +3731,7 @@ "typeString": "address" }, "typeName": { - "id": 1295, + "id": 1321, "name": "address", "nodeType": "ElementaryTypeName", "src": "1640:7:11", @@ -3746,10 +3746,10 @@ }, { "constant": false, - "id": 1298, + "id": 1324, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1656:11:11", "stateVariable": false, "storageLocation": "default", @@ -3758,7 +3758,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1297, + "id": 1323, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1656:7:11", @@ -3772,10 +3772,10 @@ }, { "constant": false, - "id": 1300, + "id": 1326, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1668:12:11", "stateVariable": false, "storageLocation": "default", @@ -3784,7 +3784,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1299, + "id": 1325, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1668:7:11", @@ -3798,10 +3798,10 @@ }, { "constant": false, - "id": 1302, + "id": 1328, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1681:12:11", "stateVariable": false, "storageLocation": "default", @@ -3810,7 +3810,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1301, + "id": 1327, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1681:7:11", @@ -3824,10 +3824,10 @@ }, { "constant": false, - "id": 1304, + "id": 1330, "name": "transferFrom", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1694:17:11", "stateVariable": false, "storageLocation": "default", @@ -3836,7 +3836,7 @@ "typeString": "bool" }, "typeName": { - "id": 1303, + "id": 1329, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1694:4:11", @@ -3852,12 +3852,12 @@ "src": "1595:117:11" }, "returnParameters": { - "id": 1306, + "id": 1332, "nodeType": "ParameterList", "parameters": [], "src": "1721:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1572:150:11", "stateMutability": "nonpayable", "superFunction": null, @@ -3866,22 +3866,22 @@ { "body": null, "documentation": null, - "id": 1314, + "id": 1340, "implemented": false, "kind": "function", "modifiers": [], "name": "makeGemBag", "nodeType": "FunctionDefinition", "parameters": { - "id": 1310, + "id": 1336, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1309, + "id": 1335, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1314, + "scope": 1340, "src": "1747:15:11", "stateVariable": false, "storageLocation": "default", @@ -3890,7 +3890,7 @@ "typeString": "address" }, "typeName": { - "id": 1308, + "id": 1334, "name": "address", "nodeType": "ElementaryTypeName", "src": "1747:7:11", @@ -3907,15 +3907,15 @@ "src": "1746:17:11" }, "returnParameters": { - "id": 1313, + "id": 1339, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1312, + "id": 1338, "name": "bag", "nodeType": "VariableDeclaration", - "scope": 1314, + "scope": 1340, "src": "1782:11:11", "stateVariable": false, "storageLocation": "default", @@ -3924,7 +3924,7 @@ "typeString": "address" }, "typeName": { - "id": 1311, + "id": 1337, "name": "address", "nodeType": "ElementaryTypeName", "src": "1782:7:11", @@ -3940,7 +3940,7 @@ ], "src": "1781:13:11" }, - "scope": 1565, + "scope": 1591, "src": "1727:68:11", "stateMutability": "nonpayable", "superFunction": null, @@ -3949,22 +3949,22 @@ { "body": null, "documentation": null, - "id": 1325, + "id": 1351, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 1323, + "id": 1349, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1316, + "id": 1342, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1325, + "scope": 1351, "src": "1814:15:11", "stateVariable": false, "storageLocation": "default", @@ -3973,7 +3973,7 @@ "typeString": "address" }, "typeName": { - "id": 1315, + "id": 1341, "name": "address", "nodeType": "ElementaryTypeName", "src": "1814:7:11", @@ -3988,10 +3988,10 @@ }, { "constant": false, - "id": 1318, + "id": 1344, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1325, + "scope": 1351, "src": "1830:11:11", "stateVariable": false, "storageLocation": "default", @@ -4000,7 +4000,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1317, + "id": 1343, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1830:7:11", @@ -4014,10 +4014,10 @@ }, { "constant": false, - "id": 1320, + "id": 1346, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1325, + "scope": 1351, "src": "1842:11:11", "stateVariable": false, "storageLocation": "default", @@ -4026,7 +4026,7 @@ "typeString": "address" }, "typeName": { - "id": 1319, + "id": 1345, "name": "address", "nodeType": "ElementaryTypeName", "src": "1842:7:11", @@ -4041,10 +4041,10 @@ }, { "constant": false, - "id": 1322, + "id": 1348, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 1325, + "scope": 1351, "src": "1854:11:11", "stateVariable": false, "storageLocation": "default", @@ -4053,7 +4053,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1321, + "id": 1347, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1854:7:11", @@ -4069,12 +4069,12 @@ "src": "1813:53:11" }, "returnParameters": { - "id": 1324, + "id": 1350, "nodeType": "ParameterList", "parameters": [], "src": "1875:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1800:76:11", "stateMutability": "nonpayable", "superFunction": null, @@ -4083,22 +4083,22 @@ { "body": null, "documentation": null, - "id": 1332, + "id": 1358, "implemented": false, "kind": "function", "modifiers": [], "name": "nope", "nodeType": "FunctionDefinition", "parameters": { - "id": 1330, + "id": 1356, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1327, + "id": 1353, "name": "obj", "nodeType": "VariableDeclaration", - "scope": 1332, + "scope": 1358, "src": "1895:11:11", "stateVariable": false, "storageLocation": "default", @@ -4107,7 +4107,7 @@ "typeString": "address" }, "typeName": { - "id": 1326, + "id": 1352, "name": "address", "nodeType": "ElementaryTypeName", "src": "1895:7:11", @@ -4122,10 +4122,10 @@ }, { "constant": false, - "id": 1329, + "id": 1355, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 1332, + "scope": 1358, "src": "1907:11:11", "stateVariable": false, "storageLocation": "default", @@ -4134,7 +4134,7 @@ "typeString": "address" }, "typeName": { - "id": 1328, + "id": 1354, "name": "address", "nodeType": "ElementaryTypeName", "src": "1907:7:11", @@ -4151,12 +4151,12 @@ "src": "1894:25:11" }, "returnParameters": { - "id": 1331, + "id": 1357, "nodeType": "ParameterList", "parameters": [], "src": "1928:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1881:48:11", "stateMutability": "nonpayable", "superFunction": null, @@ -4165,22 +4165,22 @@ { "body": null, "documentation": null, - "id": 1343, + "id": 1369, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 1339, + "id": 1365, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1334, + "id": 1360, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1343, + "scope": 1369, "src": "1948:15:11", "stateVariable": false, "storageLocation": "default", @@ -4189,7 +4189,7 @@ "typeString": "address" }, "typeName": { - "id": 1333, + "id": 1359, "name": "address", "nodeType": "ElementaryTypeName", "src": "1948:7:11", @@ -4204,10 +4204,10 @@ }, { "constant": false, - "id": 1336, + "id": 1362, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 1343, + "scope": 1369, "src": "1964:11:11", "stateVariable": false, "storageLocation": "default", @@ -4216,7 +4216,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 1335, + "id": 1361, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1964:7:11", @@ -4230,10 +4230,10 @@ }, { "constant": false, - "id": 1338, + "id": 1364, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 1343, + "scope": 1369, "src": "1976:11:11", "stateVariable": false, "storageLocation": "default", @@ -4242,7 +4242,7 @@ "typeString": "address" }, "typeName": { - "id": 1337, + "id": 1363, "name": "address", "nodeType": "ElementaryTypeName", "src": "1976:7:11", @@ -4259,15 +4259,15 @@ "src": "1947:41:11" }, "returnParameters": { - "id": 1342, + "id": 1368, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1341, + "id": 1367, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1343, + "scope": 1369, "src": "2007:11:11", "stateVariable": false, "storageLocation": "default", @@ -4276,7 +4276,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1340, + "id": 1366, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2007:7:11", @@ -4291,7 +4291,7 @@ ], "src": "2006:13:11" }, - "scope": 1565, + "scope": 1591, "src": "1934:86:11", "stateMutability": "nonpayable", "superFunction": null, @@ -4300,22 +4300,22 @@ { "body": null, "documentation": null, - "id": 1360, + "id": 1386, "implemented": false, "kind": "function", "modifiers": [], "name": "openLockETHAndDraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1356, + "id": 1382, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1345, + "id": 1371, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2053:15:11", "stateVariable": false, "storageLocation": "default", @@ -4324,7 +4324,7 @@ "typeString": "address" }, "typeName": { - "id": 1344, + "id": 1370, "name": "address", "nodeType": "ElementaryTypeName", "src": "2053:7:11", @@ -4339,10 +4339,10 @@ }, { "constant": false, - "id": 1347, + "id": 1373, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2069:11:11", "stateVariable": false, "storageLocation": "default", @@ -4351,7 +4351,7 @@ "typeString": "address" }, "typeName": { - "id": 1346, + "id": 1372, "name": "address", "nodeType": "ElementaryTypeName", "src": "2069:7:11", @@ -4366,10 +4366,10 @@ }, { "constant": false, - "id": 1349, + "id": 1375, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2081:15:11", "stateVariable": false, "storageLocation": "default", @@ -4378,7 +4378,7 @@ "typeString": "address" }, "typeName": { - "id": 1348, + "id": 1374, "name": "address", "nodeType": "ElementaryTypeName", "src": "2081:7:11", @@ -4393,10 +4393,10 @@ }, { "constant": false, - "id": 1351, + "id": 1377, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2097:15:11", "stateVariable": false, "storageLocation": "default", @@ -4405,7 +4405,7 @@ "typeString": "address" }, "typeName": { - "id": 1350, + "id": 1376, "name": "address", "nodeType": "ElementaryTypeName", "src": "2097:7:11", @@ -4420,10 +4420,10 @@ }, { "constant": false, - "id": 1353, + "id": 1379, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2113:11:11", "stateVariable": false, "storageLocation": "default", @@ -4432,7 +4432,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 1352, + "id": 1378, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2113:7:11", @@ -4446,10 +4446,10 @@ }, { "constant": false, - "id": 1355, + "id": 1381, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2125:12:11", "stateVariable": false, "storageLocation": "default", @@ -4458,7 +4458,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1354, + "id": 1380, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2125:7:11", @@ -4474,15 +4474,15 @@ "src": "2052:86:11" }, "returnParameters": { - "id": 1359, + "id": 1385, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1358, + "id": 1384, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2157:11:11", "stateVariable": false, "storageLocation": "default", @@ -4491,7 +4491,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1357, + "id": 1383, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2157:7:11", @@ -4506,7 +4506,7 @@ ], "src": "2156:13:11" }, - "scope": 1565, + "scope": 1591, "src": "2025:145:11", "stateMutability": "nonpayable", "superFunction": null, @@ -4515,22 +4515,22 @@ { "body": null, "documentation": null, - "id": 1381, + "id": 1407, "implemented": false, "kind": "function", "modifiers": [], "name": "openLockGNTAndDraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1375, + "id": 1401, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1362, + "id": 1388, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2203:15:11", "stateVariable": false, "storageLocation": "default", @@ -4539,7 +4539,7 @@ "typeString": "address" }, "typeName": { - "id": 1361, + "id": 1387, "name": "address", "nodeType": "ElementaryTypeName", "src": "2203:7:11", @@ -4554,10 +4554,10 @@ }, { "constant": false, - "id": 1364, + "id": 1390, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2219:11:11", "stateVariable": false, "storageLocation": "default", @@ -4566,7 +4566,7 @@ "typeString": "address" }, "typeName": { - "id": 1363, + "id": 1389, "name": "address", "nodeType": "ElementaryTypeName", "src": "2219:7:11", @@ -4581,10 +4581,10 @@ }, { "constant": false, - "id": 1366, + "id": 1392, "name": "gntJoin", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2231:15:11", "stateVariable": false, "storageLocation": "default", @@ -4593,7 +4593,7 @@ "typeString": "address" }, "typeName": { - "id": 1365, + "id": 1391, "name": "address", "nodeType": "ElementaryTypeName", "src": "2231:7:11", @@ -4608,10 +4608,10 @@ }, { "constant": false, - "id": 1368, + "id": 1394, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2247:15:11", "stateVariable": false, "storageLocation": "default", @@ -4620,7 +4620,7 @@ "typeString": "address" }, "typeName": { - "id": 1367, + "id": 1393, "name": "address", "nodeType": "ElementaryTypeName", "src": "2247:7:11", @@ -4635,10 +4635,10 @@ }, { "constant": false, - "id": 1370, + "id": 1396, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2263:11:11", "stateVariable": false, "storageLocation": "default", @@ -4647,7 +4647,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 1369, + "id": 1395, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2263:7:11", @@ -4661,10 +4661,10 @@ }, { "constant": false, - "id": 1372, + "id": 1398, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2275:12:11", "stateVariable": false, "storageLocation": "default", @@ -4673,7 +4673,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1371, + "id": 1397, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2275:7:11", @@ -4687,10 +4687,10 @@ }, { "constant": false, - "id": 1374, + "id": 1400, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2288:12:11", "stateVariable": false, "storageLocation": "default", @@ -4699,7 +4699,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1373, + "id": 1399, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2288:7:11", @@ -4715,15 +4715,15 @@ "src": "2202:99:11" }, "returnParameters": { - "id": 1380, + "id": 1406, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1377, + "id": 1403, "name": "bag", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2320:11:11", "stateVariable": false, "storageLocation": "default", @@ -4732,7 +4732,7 @@ "typeString": "address" }, "typeName": { - "id": 1376, + "id": 1402, "name": "address", "nodeType": "ElementaryTypeName", "src": "2320:7:11", @@ -4747,10 +4747,10 @@ }, { "constant": false, - "id": 1379, + "id": 1405, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2332:11:11", "stateVariable": false, "storageLocation": "default", @@ -4759,7 +4759,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1378, + "id": 1404, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2332:7:11", @@ -4774,7 +4774,7 @@ ], "src": "2319:25:11" }, - "scope": 1565, + "scope": 1591, "src": "2175:170:11", "stateMutability": "nonpayable", "superFunction": null, @@ -4783,22 +4783,22 @@ { "body": null, "documentation": null, - "id": 1402, + "id": 1428, "implemented": false, "kind": "function", "modifiers": [], "name": "openLockGemAndDraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1398, + "id": 1424, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1383, + "id": 1409, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2378:15:11", "stateVariable": false, "storageLocation": "default", @@ -4807,7 +4807,7 @@ "typeString": "address" }, "typeName": { - "id": 1382, + "id": 1408, "name": "address", "nodeType": "ElementaryTypeName", "src": "2378:7:11", @@ -4822,10 +4822,10 @@ }, { "constant": false, - "id": 1385, + "id": 1411, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2394:11:11", "stateVariable": false, "storageLocation": "default", @@ -4834,7 +4834,7 @@ "typeString": "address" }, "typeName": { - "id": 1384, + "id": 1410, "name": "address", "nodeType": "ElementaryTypeName", "src": "2394:7:11", @@ -4849,10 +4849,10 @@ }, { "constant": false, - "id": 1387, + "id": 1413, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2406:15:11", "stateVariable": false, "storageLocation": "default", @@ -4861,7 +4861,7 @@ "typeString": "address" }, "typeName": { - "id": 1386, + "id": 1412, "name": "address", "nodeType": "ElementaryTypeName", "src": "2406:7:11", @@ -4876,10 +4876,10 @@ }, { "constant": false, - "id": 1389, + "id": 1415, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2422:15:11", "stateVariable": false, "storageLocation": "default", @@ -4888,7 +4888,7 @@ "typeString": "address" }, "typeName": { - "id": 1388, + "id": 1414, "name": "address", "nodeType": "ElementaryTypeName", "src": "2422:7:11", @@ -4903,10 +4903,10 @@ }, { "constant": false, - "id": 1391, + "id": 1417, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2438:11:11", "stateVariable": false, "storageLocation": "default", @@ -4915,7 +4915,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 1390, + "id": 1416, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2438:7:11", @@ -4929,10 +4929,10 @@ }, { "constant": false, - "id": 1393, + "id": 1419, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2450:12:11", "stateVariable": false, "storageLocation": "default", @@ -4941,7 +4941,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1392, + "id": 1418, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2450:7:11", @@ -4955,10 +4955,10 @@ }, { "constant": false, - "id": 1395, + "id": 1421, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2463:12:11", "stateVariable": false, "storageLocation": "default", @@ -4967,7 +4967,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1394, + "id": 1420, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2463:7:11", @@ -4981,10 +4981,10 @@ }, { "constant": false, - "id": 1397, + "id": 1423, "name": "transferFrom", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2476:17:11", "stateVariable": false, "storageLocation": "default", @@ -4993,7 +4993,7 @@ "typeString": "bool" }, "typeName": { - "id": 1396, + "id": 1422, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2476:4:11", @@ -5009,15 +5009,15 @@ "src": "2377:117:11" }, "returnParameters": { - "id": 1401, + "id": 1427, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1400, + "id": 1426, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2513:11:11", "stateVariable": false, "storageLocation": "default", @@ -5026,7 +5026,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1399, + "id": 1425, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2513:7:11", @@ -5041,7 +5041,7 @@ ], "src": "2512:13:11" }, - "scope": 1565, + "scope": 1591, "src": "2350:176:11", "stateMutability": "nonpayable", "superFunction": null, @@ -5050,22 +5050,22 @@ { "body": null, "documentation": null, - "id": 1411, + "id": 1437, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 1409, + "id": 1435, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1404, + "id": 1430, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1411, + "scope": 1437, "src": "2545:15:11", "stateVariable": false, "storageLocation": "default", @@ -5074,7 +5074,7 @@ "typeString": "address" }, "typeName": { - "id": 1403, + "id": 1429, "name": "address", "nodeType": "ElementaryTypeName", "src": "2545:7:11", @@ -5089,10 +5089,10 @@ }, { "constant": false, - "id": 1406, + "id": 1432, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1411, + "scope": 1437, "src": "2561:11:11", "stateVariable": false, "storageLocation": "default", @@ -5101,7 +5101,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1405, + "id": 1431, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2561:7:11", @@ -5115,10 +5115,10 @@ }, { "constant": false, - "id": 1408, + "id": 1434, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1411, + "scope": 1437, "src": "2573:11:11", "stateVariable": false, "storageLocation": "default", @@ -5127,7 +5127,7 @@ "typeString": "address" }, "typeName": { - "id": 1407, + "id": 1433, "name": "address", "nodeType": "ElementaryTypeName", "src": "2573:7:11", @@ -5144,12 +5144,12 @@ "src": "2544:41:11" }, "returnParameters": { - "id": 1410, + "id": 1436, "nodeType": "ParameterList", "parameters": [], "src": "2594:0:11" }, - "scope": 1565, + "scope": 1591, "src": "2531:64:11", "stateMutability": "nonpayable", "superFunction": null, @@ -5158,22 +5158,22 @@ { "body": null, "documentation": null, - "id": 1422, + "id": 1448, "implemented": false, "kind": "function", "modifiers": [], "name": "safeLockETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 1420, + "id": 1446, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1413, + "id": 1439, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1422, + "scope": 1448, "src": "2621:15:11", "stateVariable": false, "storageLocation": "default", @@ -5182,7 +5182,7 @@ "typeString": "address" }, "typeName": { - "id": 1412, + "id": 1438, "name": "address", "nodeType": "ElementaryTypeName", "src": "2621:7:11", @@ -5197,10 +5197,10 @@ }, { "constant": false, - "id": 1415, + "id": 1441, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1422, + "scope": 1448, "src": "2637:15:11", "stateVariable": false, "storageLocation": "default", @@ -5209,7 +5209,7 @@ "typeString": "address" }, "typeName": { - "id": 1414, + "id": 1440, "name": "address", "nodeType": "ElementaryTypeName", "src": "2637:7:11", @@ -5224,10 +5224,10 @@ }, { "constant": false, - "id": 1417, + "id": 1443, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1422, + "scope": 1448, "src": "2653:11:11", "stateVariable": false, "storageLocation": "default", @@ -5236,7 +5236,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1416, + "id": 1442, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2653:7:11", @@ -5250,10 +5250,10 @@ }, { "constant": false, - "id": 1419, + "id": 1445, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 1422, + "scope": 1448, "src": "2665:13:11", "stateVariable": false, "storageLocation": "default", @@ -5262,7 +5262,7 @@ "typeString": "address" }, "typeName": { - "id": 1418, + "id": 1444, "name": "address", "nodeType": "ElementaryTypeName", "src": "2665:7:11", @@ -5279,12 +5279,12 @@ "src": "2620:59:11" }, "returnParameters": { - "id": 1421, + "id": 1447, "nodeType": "ParameterList", "parameters": [], "src": "2688:0:11" }, - "scope": 1565, + "scope": 1591, "src": "2600:89:11", "stateMutability": "nonpayable", "superFunction": null, @@ -5293,22 +5293,22 @@ { "body": null, "documentation": null, - "id": 1437, + "id": 1463, "implemented": false, "kind": "function", "modifiers": [], "name": "safeLockGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 1435, + "id": 1461, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1424, + "id": 1450, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1437, + "scope": 1463, "src": "2715:15:11", "stateVariable": false, "storageLocation": "default", @@ -5317,7 +5317,7 @@ "typeString": "address" }, "typeName": { - "id": 1423, + "id": 1449, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:11", @@ -5332,10 +5332,10 @@ }, { "constant": false, - "id": 1426, + "id": 1452, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1437, + "scope": 1463, "src": "2731:15:11", "stateVariable": false, "storageLocation": "default", @@ -5344,7 +5344,7 @@ "typeString": "address" }, "typeName": { - "id": 1425, + "id": 1451, "name": "address", "nodeType": "ElementaryTypeName", "src": "2731:7:11", @@ -5359,10 +5359,10 @@ }, { "constant": false, - "id": 1428, + "id": 1454, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1437, + "scope": 1463, "src": "2747:11:11", "stateVariable": false, "storageLocation": "default", @@ -5371,7 +5371,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1427, + "id": 1453, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2747:7:11", @@ -5385,10 +5385,10 @@ }, { "constant": false, - "id": 1430, + "id": 1456, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1437, + "scope": 1463, "src": "2759:11:11", "stateVariable": false, "storageLocation": "default", @@ -5397,7 +5397,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1429, + "id": 1455, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2759:7:11", @@ -5411,10 +5411,10 @@ }, { "constant": false, - "id": 1432, + "id": 1458, "name": "transferFrom", "nodeType": "VariableDeclaration", - "scope": 1437, + "scope": 1463, "src": "2771:17:11", "stateVariable": false, "storageLocation": "default", @@ -5423,7 +5423,7 @@ "typeString": "bool" }, "typeName": { - "id": 1431, + "id": 1457, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2771:4:11", @@ -5437,10 +5437,10 @@ }, { "constant": false, - "id": 1434, + "id": 1460, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 1437, + "scope": 1463, "src": "2789:13:11", "stateVariable": false, "storageLocation": "default", @@ -5449,7 +5449,7 @@ "typeString": "address" }, "typeName": { - "id": 1433, + "id": 1459, "name": "address", "nodeType": "ElementaryTypeName", "src": "2789:7:11", @@ -5466,12 +5466,12 @@ "src": "2714:89:11" }, "returnParameters": { - "id": 1436, + "id": 1462, "nodeType": "ParameterList", "parameters": [], "src": "2812:0:11" }, - "scope": 1565, + "scope": 1591, "src": "2694:119:11", "stateMutability": "nonpayable", "superFunction": null, @@ -5480,22 +5480,22 @@ { "body": null, "documentation": null, - "id": 1450, + "id": 1476, "implemented": false, "kind": "function", "modifiers": [], "name": "safeWipe", "nodeType": "FunctionDefinition", "parameters": { - "id": 1448, + "id": 1474, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1439, + "id": 1465, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1450, + "scope": 1476, "src": "2836:15:11", "stateVariable": false, "storageLocation": "default", @@ -5504,7 +5504,7 @@ "typeString": "address" }, "typeName": { - "id": 1438, + "id": 1464, "name": "address", "nodeType": "ElementaryTypeName", "src": "2836:7:11", @@ -5519,10 +5519,10 @@ }, { "constant": false, - "id": 1441, + "id": 1467, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1450, + "scope": 1476, "src": "2852:15:11", "stateVariable": false, "storageLocation": "default", @@ -5531,7 +5531,7 @@ "typeString": "address" }, "typeName": { - "id": 1440, + "id": 1466, "name": "address", "nodeType": "ElementaryTypeName", "src": "2852:7:11", @@ -5546,10 +5546,10 @@ }, { "constant": false, - "id": 1443, + "id": 1469, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1450, + "scope": 1476, "src": "2868:11:11", "stateVariable": false, "storageLocation": "default", @@ -5558,7 +5558,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1442, + "id": 1468, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2868:7:11", @@ -5572,10 +5572,10 @@ }, { "constant": false, - "id": 1445, + "id": 1471, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1450, + "scope": 1476, "src": "2880:11:11", "stateVariable": false, "storageLocation": "default", @@ -5584,7 +5584,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1444, + "id": 1470, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2880:7:11", @@ -5598,10 +5598,10 @@ }, { "constant": false, - "id": 1447, + "id": 1473, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 1450, + "scope": 1476, "src": "2892:13:11", "stateVariable": false, "storageLocation": "default", @@ -5610,7 +5610,7 @@ "typeString": "address" }, "typeName": { - "id": 1446, + "id": 1472, "name": "address", "nodeType": "ElementaryTypeName", "src": "2892:7:11", @@ -5627,12 +5627,12 @@ "src": "2835:71:11" }, "returnParameters": { - "id": 1449, + "id": 1475, "nodeType": "ParameterList", "parameters": [], "src": "2915:0:11" }, - "scope": 1565, + "scope": 1591, "src": "2818:98:11", "stateMutability": "nonpayable", "superFunction": null, @@ -5641,22 +5641,22 @@ { "body": null, "documentation": null, - "id": 1461, + "id": 1487, "implemented": false, "kind": "function", "modifiers": [], "name": "safeWipeAll", "nodeType": "FunctionDefinition", "parameters": { - "id": 1459, + "id": 1485, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1452, + "id": 1478, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1461, + "scope": 1487, "src": "2942:15:11", "stateVariable": false, "storageLocation": "default", @@ -5665,7 +5665,7 @@ "typeString": "address" }, "typeName": { - "id": 1451, + "id": 1477, "name": "address", "nodeType": "ElementaryTypeName", "src": "2942:7:11", @@ -5680,10 +5680,10 @@ }, { "constant": false, - "id": 1454, + "id": 1480, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1461, + "scope": 1487, "src": "2958:15:11", "stateVariable": false, "storageLocation": "default", @@ -5692,7 +5692,7 @@ "typeString": "address" }, "typeName": { - "id": 1453, + "id": 1479, "name": "address", "nodeType": "ElementaryTypeName", "src": "2958:7:11", @@ -5707,10 +5707,10 @@ }, { "constant": false, - "id": 1456, + "id": 1482, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1461, + "scope": 1487, "src": "2974:11:11", "stateVariable": false, "storageLocation": "default", @@ -5719,7 +5719,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1455, + "id": 1481, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2974:7:11", @@ -5733,10 +5733,10 @@ }, { "constant": false, - "id": 1458, + "id": 1484, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 1461, + "scope": 1487, "src": "2986:13:11", "stateVariable": false, "storageLocation": "default", @@ -5745,7 +5745,7 @@ "typeString": "address" }, "typeName": { - "id": 1457, + "id": 1483, "name": "address", "nodeType": "ElementaryTypeName", "src": "2986:7:11", @@ -5762,12 +5762,12 @@ "src": "2941:59:11" }, "returnParameters": { - "id": 1460, + "id": 1486, "nodeType": "ParameterList", "parameters": [], "src": "3009:0:11" }, - "scope": 1565, + "scope": 1591, "src": "2921:89:11", "stateMutability": "nonpayable", "superFunction": null, @@ -5776,22 +5776,22 @@ { "body": null, "documentation": null, - "id": 1470, + "id": 1496, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 1468, + "id": 1494, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1463, + "id": 1489, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1470, + "scope": 1496, "src": "3030:15:11", "stateVariable": false, "storageLocation": "default", @@ -5800,7 +5800,7 @@ "typeString": "address" }, "typeName": { - "id": 1462, + "id": 1488, "name": "address", "nodeType": "ElementaryTypeName", "src": "3030:7:11", @@ -5815,10 +5815,10 @@ }, { "constant": false, - "id": 1465, + "id": 1491, "name": "cdpSrc", "nodeType": "VariableDeclaration", - "scope": 1470, + "scope": 1496, "src": "3046:14:11", "stateVariable": false, "storageLocation": "default", @@ -5827,7 +5827,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1464, + "id": 1490, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3046:7:11", @@ -5841,10 +5841,10 @@ }, { "constant": false, - "id": 1467, + "id": 1493, "name": "cdpOrg", "nodeType": "VariableDeclaration", - "scope": 1470, + "scope": 1496, "src": "3061:14:11", "stateVariable": false, "storageLocation": "default", @@ -5853,7 +5853,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1466, + "id": 1492, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3061:7:11", @@ -5869,12 +5869,12 @@ "src": "3029:47:11" }, "returnParameters": { - "id": 1469, + "id": 1495, "nodeType": "ParameterList", "parameters": [], "src": "3085:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3015:71:11", "stateMutability": "nonpayable", "superFunction": null, @@ -5883,22 +5883,22 @@ { "body": null, "documentation": null, - "id": 1479, + "id": 1505, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 1477, + "id": 1503, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1472, + "id": 1498, "name": "gem", "nodeType": "VariableDeclaration", - "scope": 1479, + "scope": 1505, "src": "3109:11:11", "stateVariable": false, "storageLocation": "default", @@ -5907,7 +5907,7 @@ "typeString": "address" }, "typeName": { - "id": 1471, + "id": 1497, "name": "address", "nodeType": "ElementaryTypeName", "src": "3109:7:11", @@ -5922,10 +5922,10 @@ }, { "constant": false, - "id": 1474, + "id": 1500, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1479, + "scope": 1505, "src": "3121:11:11", "stateVariable": false, "storageLocation": "default", @@ -5934,7 +5934,7 @@ "typeString": "address" }, "typeName": { - "id": 1473, + "id": 1499, "name": "address", "nodeType": "ElementaryTypeName", "src": "3121:7:11", @@ -5949,10 +5949,10 @@ }, { "constant": false, - "id": 1476, + "id": 1502, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1479, + "scope": 1505, "src": "3133:11:11", "stateVariable": false, "storageLocation": "default", @@ -5961,7 +5961,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1475, + "id": 1501, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3133:7:11", @@ -5977,12 +5977,12 @@ "src": "3108:37:11" }, "returnParameters": { - "id": 1478, + "id": 1504, "nodeType": "ParameterList", "parameters": [], "src": "3154:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3091:64:11", "stateMutability": "nonpayable", "superFunction": null, @@ -5991,22 +5991,22 @@ { "body": null, "documentation": null, - "id": 1488, + "id": 1514, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 1486, + "id": 1512, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1481, + "id": 1507, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1488, + "scope": 1514, "src": "3178:15:11", "stateVariable": false, "storageLocation": "default", @@ -6015,7 +6015,7 @@ "typeString": "address" }, "typeName": { - "id": 1480, + "id": 1506, "name": "address", "nodeType": "ElementaryTypeName", "src": "3178:7:11", @@ -6030,10 +6030,10 @@ }, { "constant": false, - "id": 1483, + "id": 1509, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 1488, + "scope": 1514, "src": "3194:11:11", "stateVariable": false, "storageLocation": "default", @@ -6042,7 +6042,7 @@ "typeString": "address" }, "typeName": { - "id": 1482, + "id": 1508, "name": "address", "nodeType": "ElementaryTypeName", "src": "3194:7:11", @@ -6057,10 +6057,10 @@ }, { "constant": false, - "id": 1485, + "id": 1511, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 1488, + "scope": 1514, "src": "3206:10:11", "stateVariable": false, "storageLocation": "default", @@ -6069,7 +6069,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1484, + "id": 1510, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3206:7:11", @@ -6085,12 +6085,12 @@ "src": "3177:40:11" }, "returnParameters": { - "id": 1487, + "id": 1513, "nodeType": "ParameterList", "parameters": [], "src": "3226:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3160:67:11", "stateMutability": "nonpayable", "superFunction": null, @@ -6099,22 +6099,22 @@ { "body": null, "documentation": null, - "id": 1499, + "id": 1525, "implemented": false, "kind": "function", "modifiers": [], "name": "wipe", "nodeType": "FunctionDefinition", "parameters": { - "id": 1497, + "id": 1523, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1490, + "id": 1516, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1499, + "scope": 1525, "src": "3246:15:11", "stateVariable": false, "storageLocation": "default", @@ -6123,7 +6123,7 @@ "typeString": "address" }, "typeName": { - "id": 1489, + "id": 1515, "name": "address", "nodeType": "ElementaryTypeName", "src": "3246:7:11", @@ -6138,10 +6138,10 @@ }, { "constant": false, - "id": 1492, + "id": 1518, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1499, + "scope": 1525, "src": "3262:15:11", "stateVariable": false, "storageLocation": "default", @@ -6150,7 +6150,7 @@ "typeString": "address" }, "typeName": { - "id": 1491, + "id": 1517, "name": "address", "nodeType": "ElementaryTypeName", "src": "3262:7:11", @@ -6165,10 +6165,10 @@ }, { "constant": false, - "id": 1494, + "id": 1520, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1499, + "scope": 1525, "src": "3278:11:11", "stateVariable": false, "storageLocation": "default", @@ -6177,7 +6177,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1493, + "id": 1519, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3278:7:11", @@ -6191,10 +6191,10 @@ }, { "constant": false, - "id": 1496, + "id": 1522, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1499, + "scope": 1525, "src": "3290:11:11", "stateVariable": false, "storageLocation": "default", @@ -6203,7 +6203,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1495, + "id": 1521, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3290:7:11", @@ -6219,12 +6219,12 @@ "src": "3245:57:11" }, "returnParameters": { - "id": 1498, + "id": 1524, "nodeType": "ParameterList", "parameters": [], "src": "3311:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3232:80:11", "stateMutability": "nonpayable", "superFunction": null, @@ -6233,22 +6233,22 @@ { "body": null, "documentation": null, - "id": 1508, + "id": 1534, "implemented": false, "kind": "function", "modifiers": [], "name": "wipeAll", "nodeType": "FunctionDefinition", "parameters": { - "id": 1506, + "id": 1532, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1501, + "id": 1527, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1508, + "scope": 1534, "src": "3334:15:11", "stateVariable": false, "storageLocation": "default", @@ -6257,7 +6257,7 @@ "typeString": "address" }, "typeName": { - "id": 1500, + "id": 1526, "name": "address", "nodeType": "ElementaryTypeName", "src": "3334:7:11", @@ -6272,10 +6272,10 @@ }, { "constant": false, - "id": 1503, + "id": 1529, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1508, + "scope": 1534, "src": "3350:15:11", "stateVariable": false, "storageLocation": "default", @@ -6284,7 +6284,7 @@ "typeString": "address" }, "typeName": { - "id": 1502, + "id": 1528, "name": "address", "nodeType": "ElementaryTypeName", "src": "3350:7:11", @@ -6299,10 +6299,10 @@ }, { "constant": false, - "id": 1505, + "id": 1531, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1508, + "scope": 1534, "src": "3366:11:11", "stateVariable": false, "storageLocation": "default", @@ -6311,7 +6311,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1504, + "id": 1530, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3366:7:11", @@ -6327,12 +6327,12 @@ "src": "3333:45:11" }, "returnParameters": { - "id": 1507, + "id": 1533, "nodeType": "ParameterList", "parameters": [], "src": "3387:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3317:71:11", "stateMutability": "nonpayable", "superFunction": null, @@ -6341,22 +6341,22 @@ { "body": null, "documentation": null, - "id": 1521, + "id": 1547, "implemented": false, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 1519, + "id": 1545, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1510, + "id": 1536, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1521, + "scope": 1547, "src": "3420:15:11", "stateVariable": false, "storageLocation": "default", @@ -6365,7 +6365,7 @@ "typeString": "address" }, "typeName": { - "id": 1509, + "id": 1535, "name": "address", "nodeType": "ElementaryTypeName", "src": "3420:7:11", @@ -6380,10 +6380,10 @@ }, { "constant": false, - "id": 1512, + "id": 1538, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1521, + "scope": 1547, "src": "3436:15:11", "stateVariable": false, "storageLocation": "default", @@ -6392,7 +6392,7 @@ "typeString": "address" }, "typeName": { - "id": 1511, + "id": 1537, "name": "address", "nodeType": "ElementaryTypeName", "src": "3436:7:11", @@ -6407,10 +6407,10 @@ }, { "constant": false, - "id": 1514, + "id": 1540, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1521, + "scope": 1547, "src": "3452:15:11", "stateVariable": false, "storageLocation": "default", @@ -6419,7 +6419,7 @@ "typeString": "address" }, "typeName": { - "id": 1513, + "id": 1539, "name": "address", "nodeType": "ElementaryTypeName", "src": "3452:7:11", @@ -6434,10 +6434,10 @@ }, { "constant": false, - "id": 1516, + "id": 1542, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1521, + "scope": 1547, "src": "3468:11:11", "stateVariable": false, "storageLocation": "default", @@ -6446,7 +6446,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1515, + "id": 1541, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3468:7:11", @@ -6460,10 +6460,10 @@ }, { "constant": false, - "id": 1518, + "id": 1544, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1521, + "scope": 1547, "src": "3480:12:11", "stateVariable": false, "storageLocation": "default", @@ -6472,7 +6472,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1517, + "id": 1543, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3480:7:11", @@ -6488,12 +6488,12 @@ "src": "3419:74:11" }, "returnParameters": { - "id": 1520, + "id": 1546, "nodeType": "ParameterList", "parameters": [], "src": "3502:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3393:110:11", "stateMutability": "nonpayable", "superFunction": null, @@ -6502,22 +6502,22 @@ { "body": null, "documentation": null, - "id": 1534, + "id": 1560, "implemented": false, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 1532, + "id": 1558, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1523, + "id": 1549, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1534, + "scope": 1560, "src": "3535:15:11", "stateVariable": false, "storageLocation": "default", @@ -6526,7 +6526,7 @@ "typeString": "address" }, "typeName": { - "id": 1522, + "id": 1548, "name": "address", "nodeType": "ElementaryTypeName", "src": "3535:7:11", @@ -6541,10 +6541,10 @@ }, { "constant": false, - "id": 1525, + "id": 1551, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1534, + "scope": 1560, "src": "3551:15:11", "stateVariable": false, "storageLocation": "default", @@ -6553,7 +6553,7 @@ "typeString": "address" }, "typeName": { - "id": 1524, + "id": 1550, "name": "address", "nodeType": "ElementaryTypeName", "src": "3551:7:11", @@ -6568,10 +6568,10 @@ }, { "constant": false, - "id": 1527, + "id": 1553, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1534, + "scope": 1560, "src": "3567:15:11", "stateVariable": false, "storageLocation": "default", @@ -6580,7 +6580,7 @@ "typeString": "address" }, "typeName": { - "id": 1526, + "id": 1552, "name": "address", "nodeType": "ElementaryTypeName", "src": "3567:7:11", @@ -6595,10 +6595,10 @@ }, { "constant": false, - "id": 1529, + "id": 1555, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1534, + "scope": 1560, "src": "3583:11:11", "stateVariable": false, "storageLocation": "default", @@ -6607,7 +6607,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1528, + "id": 1554, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3583:7:11", @@ -6621,10 +6621,10 @@ }, { "constant": false, - "id": 1531, + "id": 1557, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1534, + "scope": 1560, "src": "3595:12:11", "stateVariable": false, "storageLocation": "default", @@ -6633,7 +6633,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1530, + "id": 1556, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3595:7:11", @@ -6649,12 +6649,12 @@ "src": "3534:74:11" }, "returnParameters": { - "id": 1533, + "id": 1559, "nodeType": "ParameterList", "parameters": [], "src": "3617:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3508:110:11", "stateMutability": "nonpayable", "superFunction": null, @@ -6663,22 +6663,22 @@ { "body": null, "documentation": null, - "id": 1549, + "id": 1575, "implemented": false, "kind": "function", "modifiers": [], "name": "wipeAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 1547, + "id": 1573, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1536, + "id": 1562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1549, + "scope": 1575, "src": "3647:15:11", "stateVariable": false, "storageLocation": "default", @@ -6687,7 +6687,7 @@ "typeString": "address" }, "typeName": { - "id": 1535, + "id": 1561, "name": "address", "nodeType": "ElementaryTypeName", "src": "3647:7:11", @@ -6702,10 +6702,10 @@ }, { "constant": false, - "id": 1538, + "id": 1564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1549, + "scope": 1575, "src": "3663:15:11", "stateVariable": false, "storageLocation": "default", @@ -6714,7 +6714,7 @@ "typeString": "address" }, "typeName": { - "id": 1537, + "id": 1563, "name": "address", "nodeType": "ElementaryTypeName", "src": "3663:7:11", @@ -6729,10 +6729,10 @@ }, { "constant": false, - "id": 1540, + "id": 1566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1549, + "scope": 1575, "src": "3679:15:11", "stateVariable": false, "storageLocation": "default", @@ -6741,7 +6741,7 @@ "typeString": "address" }, "typeName": { - "id": 1539, + "id": 1565, "name": "address", "nodeType": "ElementaryTypeName", "src": "3679:7:11", @@ -6756,10 +6756,10 @@ }, { "constant": false, - "id": 1542, + "id": 1568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1549, + "scope": 1575, "src": "3695:11:11", "stateVariable": false, "storageLocation": "default", @@ -6768,7 +6768,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1541, + "id": 1567, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3695:7:11", @@ -6782,10 +6782,10 @@ }, { "constant": false, - "id": 1544, + "id": 1570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1549, + "scope": 1575, "src": "3707:12:11", "stateVariable": false, "storageLocation": "default", @@ -6794,7 +6794,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1543, + "id": 1569, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3707:7:11", @@ -6808,10 +6808,10 @@ }, { "constant": false, - "id": 1546, + "id": 1572, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1549, + "scope": 1575, "src": "3720:12:11", "stateVariable": false, "storageLocation": "default", @@ -6820,7 +6820,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1545, + "id": 1571, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3720:7:11", @@ -6836,12 +6836,12 @@ "src": "3646:87:11" }, "returnParameters": { - "id": 1548, + "id": 1574, "nodeType": "ParameterList", "parameters": [], "src": "3742:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3623:120:11", "stateMutability": "nonpayable", "superFunction": null, @@ -6850,22 +6850,22 @@ { "body": null, "documentation": null, - "id": 1564, + "id": 1590, "implemented": false, "kind": "function", "modifiers": [], "name": "wipeAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 1562, + "id": 1588, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1551, + "id": 1577, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1564, + "scope": 1590, "src": "3772:15:11", "stateVariable": false, "storageLocation": "default", @@ -6874,7 +6874,7 @@ "typeString": "address" }, "typeName": { - "id": 1550, + "id": 1576, "name": "address", "nodeType": "ElementaryTypeName", "src": "3772:7:11", @@ -6889,10 +6889,10 @@ }, { "constant": false, - "id": 1553, + "id": 1579, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1564, + "scope": 1590, "src": "3788:15:11", "stateVariable": false, "storageLocation": "default", @@ -6901,7 +6901,7 @@ "typeString": "address" }, "typeName": { - "id": 1552, + "id": 1578, "name": "address", "nodeType": "ElementaryTypeName", "src": "3788:7:11", @@ -6916,10 +6916,10 @@ }, { "constant": false, - "id": 1555, + "id": 1581, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1564, + "scope": 1590, "src": "3804:15:11", "stateVariable": false, "storageLocation": "default", @@ -6928,7 +6928,7 @@ "typeString": "address" }, "typeName": { - "id": 1554, + "id": 1580, "name": "address", "nodeType": "ElementaryTypeName", "src": "3804:7:11", @@ -6943,10 +6943,10 @@ }, { "constant": false, - "id": 1557, + "id": 1583, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1564, + "scope": 1590, "src": "3820:11:11", "stateVariable": false, "storageLocation": "default", @@ -6955,7 +6955,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1556, + "id": 1582, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3820:7:11", @@ -6969,10 +6969,10 @@ }, { "constant": false, - "id": 1559, + "id": 1585, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1564, + "scope": 1590, "src": "3832:12:11", "stateVariable": false, "storageLocation": "default", @@ -6981,7 +6981,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1558, + "id": 1584, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3832:7:11", @@ -6995,10 +6995,10 @@ }, { "constant": false, - "id": 1561, + "id": 1587, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1564, + "scope": 1590, "src": "3845:12:11", "stateVariable": false, "storageLocation": "default", @@ -7007,7 +7007,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1560, + "id": 1586, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3845:7:11", @@ -7023,19 +7023,19 @@ "src": "3771:87:11" }, "returnParameters": { - "id": 1563, + "id": 1589, "nodeType": "ParameterList", "parameters": [], "src": "3867:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3748:120:11", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 1566, + "scope": 1592, "src": "25:3845:11" } ], @@ -7045,14 +7045,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/makerdao/IDssProxyActions.sol", "exportedSymbols": { "IDssProxyActions": [ - 1565 + 1591 ] }, - "id": 1566, + "id": 1592, "nodeType": "SourceUnit", "nodes": [ { - "id": 1098, + "id": 1124, "literals": [ "solidity", "0.5", @@ -7067,9 +7067,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1565, + "id": 1591, "linearizedBaseContracts": [ - 1565 + 1591 ], "name": "IDssProxyActions", "nodeType": "ContractDefinition", @@ -7077,22 +7077,22 @@ { "body": null, "documentation": null, - "id": 1109, + "id": 1135, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 1107, + "id": 1133, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1100, + "id": 1126, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1109, + "scope": 1135, "src": "74:15:11", "stateVariable": false, "storageLocation": "default", @@ -7101,7 +7101,7 @@ "typeString": "address" }, "typeName": { - "id": 1099, + "id": 1125, "name": "address", "nodeType": "ElementaryTypeName", "src": "74:7:11", @@ -7116,10 +7116,10 @@ }, { "constant": false, - "id": 1102, + "id": 1128, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1109, + "scope": 1135, "src": "90:11:11", "stateVariable": false, "storageLocation": "default", @@ -7128,7 +7128,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1101, + "id": 1127, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "90:7:11", @@ -7142,10 +7142,10 @@ }, { "constant": false, - "id": 1104, + "id": 1130, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 1109, + "scope": 1135, "src": "102:11:11", "stateVariable": false, "storageLocation": "default", @@ -7154,7 +7154,7 @@ "typeString": "address" }, "typeName": { - "id": 1103, + "id": 1129, "name": "address", "nodeType": "ElementaryTypeName", "src": "102:7:11", @@ -7169,10 +7169,10 @@ }, { "constant": false, - "id": 1106, + "id": 1132, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 1109, + "scope": 1135, "src": "114:10:11", "stateVariable": false, "storageLocation": "default", @@ -7181,7 +7181,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1105, + "id": 1131, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "114:7:11", @@ -7197,12 +7197,12 @@ "src": "73:52:11" }, "returnParameters": { - "id": 1108, + "id": 1134, "nodeType": "ParameterList", "parameters": [], "src": "134:0:11" }, - "scope": 1565, + "scope": 1591, "src": "56:79:11", "stateMutability": "nonpayable", "superFunction": null, @@ -7211,22 +7211,22 @@ { "body": null, "documentation": null, - "id": 1118, + "id": 1144, "implemented": false, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 1116, + "id": 1142, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1111, + "id": 1137, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 1118, + "scope": 1144, "src": "162:11:11", "stateVariable": false, "storageLocation": "default", @@ -7235,7 +7235,7 @@ "typeString": "address" }, "typeName": { - "id": 1110, + "id": 1136, "name": "address", "nodeType": "ElementaryTypeName", "src": "162:7:11", @@ -7250,10 +7250,10 @@ }, { "constant": false, - "id": 1113, + "id": 1139, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 1118, + "scope": 1144, "src": "174:11:11", "stateVariable": false, "storageLocation": "default", @@ -7262,7 +7262,7 @@ "typeString": "address" }, "typeName": { - "id": 1112, + "id": 1138, "name": "address", "nodeType": "ElementaryTypeName", "src": "174:7:11", @@ -7277,10 +7277,10 @@ }, { "constant": false, - "id": 1115, + "id": 1141, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1118, + "scope": 1144, "src": "186:11:11", "stateVariable": false, "storageLocation": "default", @@ -7289,7 +7289,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1114, + "id": 1140, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "186:7:11", @@ -7305,12 +7305,12 @@ "src": "161:37:11" }, "returnParameters": { - "id": 1117, + "id": 1143, "nodeType": "ParameterList", "parameters": [], "src": "207:0:11" }, - "scope": 1565, + "scope": 1591, "src": "140:68:11", "stateMutability": "nonpayable", "superFunction": null, @@ -7319,22 +7319,22 @@ { "body": null, "documentation": null, - "id": 1131, + "id": 1157, "implemented": false, "kind": "function", "modifiers": [], "name": "draw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1129, + "id": 1155, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1120, + "id": 1146, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1131, + "scope": 1157, "src": "227:15:11", "stateVariable": false, "storageLocation": "default", @@ -7343,7 +7343,7 @@ "typeString": "address" }, "typeName": { - "id": 1119, + "id": 1145, "name": "address", "nodeType": "ElementaryTypeName", "src": "227:7:11", @@ -7358,10 +7358,10 @@ }, { "constant": false, - "id": 1122, + "id": 1148, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 1131, + "scope": 1157, "src": "243:11:11", "stateVariable": false, "storageLocation": "default", @@ -7370,7 +7370,7 @@ "typeString": "address" }, "typeName": { - "id": 1121, + "id": 1147, "name": "address", "nodeType": "ElementaryTypeName", "src": "243:7:11", @@ -7385,10 +7385,10 @@ }, { "constant": false, - "id": 1124, + "id": 1150, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1131, + "scope": 1157, "src": "255:15:11", "stateVariable": false, "storageLocation": "default", @@ -7397,7 +7397,7 @@ "typeString": "address" }, "typeName": { - "id": 1123, + "id": 1149, "name": "address", "nodeType": "ElementaryTypeName", "src": "255:7:11", @@ -7412,10 +7412,10 @@ }, { "constant": false, - "id": 1126, + "id": 1152, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1131, + "scope": 1157, "src": "271:11:11", "stateVariable": false, "storageLocation": "default", @@ -7424,7 +7424,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1125, + "id": 1151, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "271:7:11", @@ -7438,10 +7438,10 @@ }, { "constant": false, - "id": 1128, + "id": 1154, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1131, + "scope": 1157, "src": "283:11:11", "stateVariable": false, "storageLocation": "default", @@ -7450,7 +7450,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1127, + "id": 1153, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "283:7:11", @@ -7466,12 +7466,12 @@ "src": "226:69:11" }, "returnParameters": { - "id": 1130, + "id": 1156, "nodeType": "ParameterList", "parameters": [], "src": "304:0:11" }, - "scope": 1565, + "scope": 1591, "src": "213:92:11", "stateMutability": "nonpayable", "superFunction": null, @@ -7480,22 +7480,22 @@ { "body": null, "documentation": null, - "id": 1140, + "id": 1166, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 1138, + "id": 1164, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1133, + "id": 1159, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1140, + "scope": 1166, "src": "325:15:11", "stateVariable": false, "storageLocation": "default", @@ -7504,7 +7504,7 @@ "typeString": "address" }, "typeName": { - "id": 1132, + "id": 1158, "name": "address", "nodeType": "ElementaryTypeName", "src": "325:7:11", @@ -7519,10 +7519,10 @@ }, { "constant": false, - "id": 1135, + "id": 1161, "name": "src", "nodeType": "VariableDeclaration", - "scope": 1140, + "scope": 1166, "src": "341:11:11", "stateVariable": false, "storageLocation": "default", @@ -7531,7 +7531,7 @@ "typeString": "address" }, "typeName": { - "id": 1134, + "id": 1160, "name": "address", "nodeType": "ElementaryTypeName", "src": "341:7:11", @@ -7546,10 +7546,10 @@ }, { "constant": false, - "id": 1137, + "id": 1163, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1140, + "scope": 1166, "src": "353:11:11", "stateVariable": false, "storageLocation": "default", @@ -7558,7 +7558,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1136, + "id": 1162, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "353:7:11", @@ -7574,12 +7574,12 @@ "src": "324:41:11" }, "returnParameters": { - "id": 1139, + "id": 1165, "nodeType": "ParameterList", "parameters": [], "src": "374:0:11" }, - "scope": 1565, + "scope": 1591, "src": "310:65:11", "stateMutability": "nonpayable", "superFunction": null, @@ -7588,22 +7588,22 @@ { "body": null, "documentation": null, - "id": 1147, + "id": 1173, "implemented": false, "kind": "function", "modifiers": [], "name": "ethJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 1145, + "id": 1171, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1142, + "id": 1168, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 1147, + "scope": 1173, "src": "402:11:11", "stateVariable": false, "storageLocation": "default", @@ -7612,7 +7612,7 @@ "typeString": "address" }, "typeName": { - "id": 1141, + "id": 1167, "name": "address", "nodeType": "ElementaryTypeName", "src": "402:7:11", @@ -7627,10 +7627,10 @@ }, { "constant": false, - "id": 1144, + "id": 1170, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 1147, + "scope": 1173, "src": "414:11:11", "stateVariable": false, "storageLocation": "default", @@ -7639,7 +7639,7 @@ "typeString": "address" }, "typeName": { - "id": 1143, + "id": 1169, "name": "address", "nodeType": "ElementaryTypeName", "src": "414:7:11", @@ -7656,12 +7656,12 @@ "src": "401:25:11" }, "returnParameters": { - "id": 1146, + "id": 1172, "nodeType": "ParameterList", "parameters": [], "src": "435:0:11" }, - "scope": 1565, + "scope": 1591, "src": "380:56:11", "stateMutability": "nonpayable", "superFunction": null, @@ -7670,22 +7670,22 @@ { "body": null, "documentation": null, - "id": 1158, + "id": 1184, "implemented": false, "kind": "function", "modifiers": [], "name": "exitETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 1156, + "id": 1182, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1149, + "id": 1175, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1158, + "scope": 1184, "src": "458:15:11", "stateVariable": false, "storageLocation": "default", @@ -7694,7 +7694,7 @@ "typeString": "address" }, "typeName": { - "id": 1148, + "id": 1174, "name": "address", "nodeType": "ElementaryTypeName", "src": "458:7:11", @@ -7709,10 +7709,10 @@ }, { "constant": false, - "id": 1151, + "id": 1177, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1158, + "scope": 1184, "src": "474:15:11", "stateVariable": false, "storageLocation": "default", @@ -7721,7 +7721,7 @@ "typeString": "address" }, "typeName": { - "id": 1150, + "id": 1176, "name": "address", "nodeType": "ElementaryTypeName", "src": "474:7:11", @@ -7736,10 +7736,10 @@ }, { "constant": false, - "id": 1153, + "id": 1179, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1158, + "scope": 1184, "src": "490:11:11", "stateVariable": false, "storageLocation": "default", @@ -7748,7 +7748,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1152, + "id": 1178, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "490:7:11", @@ -7762,10 +7762,10 @@ }, { "constant": false, - "id": 1155, + "id": 1181, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1158, + "scope": 1184, "src": "502:11:11", "stateVariable": false, "storageLocation": "default", @@ -7774,7 +7774,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1154, + "id": 1180, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "502:7:11", @@ -7790,12 +7790,12 @@ "src": "457:57:11" }, "returnParameters": { - "id": 1157, + "id": 1183, "nodeType": "ParameterList", "parameters": [], "src": "523:0:11" }, - "scope": 1565, + "scope": 1591, "src": "441:83:11", "stateMutability": "nonpayable", "superFunction": null, @@ -7804,22 +7804,22 @@ { "body": null, "documentation": null, - "id": 1169, + "id": 1195, "implemented": false, "kind": "function", "modifiers": [], "name": "exitGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 1167, + "id": 1193, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1160, + "id": 1186, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1169, + "scope": 1195, "src": "546:15:11", "stateVariable": false, "storageLocation": "default", @@ -7828,7 +7828,7 @@ "typeString": "address" }, "typeName": { - "id": 1159, + "id": 1185, "name": "address", "nodeType": "ElementaryTypeName", "src": "546:7:11", @@ -7843,10 +7843,10 @@ }, { "constant": false, - "id": 1162, + "id": 1188, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1169, + "scope": 1195, "src": "562:15:11", "stateVariable": false, "storageLocation": "default", @@ -7855,7 +7855,7 @@ "typeString": "address" }, "typeName": { - "id": 1161, + "id": 1187, "name": "address", "nodeType": "ElementaryTypeName", "src": "562:7:11", @@ -7870,10 +7870,10 @@ }, { "constant": false, - "id": 1164, + "id": 1190, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1169, + "scope": 1195, "src": "578:11:11", "stateVariable": false, "storageLocation": "default", @@ -7882,7 +7882,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1163, + "id": 1189, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "578:7:11", @@ -7896,10 +7896,10 @@ }, { "constant": false, - "id": 1166, + "id": 1192, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1169, + "scope": 1195, "src": "590:11:11", "stateVariable": false, "storageLocation": "default", @@ -7908,7 +7908,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1165, + "id": 1191, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "590:7:11", @@ -7924,12 +7924,12 @@ "src": "545:57:11" }, "returnParameters": { - "id": 1168, + "id": 1194, "nodeType": "ParameterList", "parameters": [], "src": "611:0:11" }, - "scope": 1565, + "scope": 1591, "src": "529:83:11", "stateMutability": "nonpayable", "superFunction": null, @@ -7938,22 +7938,22 @@ { "body": null, "documentation": null, - "id": 1180, + "id": 1206, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 1178, + "id": 1204, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1171, + "id": 1197, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1180, + "scope": 1206, "src": "631:15:11", "stateVariable": false, "storageLocation": "default", @@ -7962,7 +7962,7 @@ "typeString": "address" }, "typeName": { - "id": 1170, + "id": 1196, "name": "address", "nodeType": "ElementaryTypeName", "src": "631:7:11", @@ -7977,10 +7977,10 @@ }, { "constant": false, - "id": 1173, + "id": 1199, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1180, + "scope": 1206, "src": "647:11:11", "stateVariable": false, "storageLocation": "default", @@ -7989,7 +7989,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1172, + "id": 1198, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "647:7:11", @@ -8003,10 +8003,10 @@ }, { "constant": false, - "id": 1175, + "id": 1201, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1180, + "scope": 1206, "src": "659:11:11", "stateVariable": false, "storageLocation": "default", @@ -8015,7 +8015,7 @@ "typeString": "address" }, "typeName": { - "id": 1174, + "id": 1200, "name": "address", "nodeType": "ElementaryTypeName", "src": "659:7:11", @@ -8030,10 +8030,10 @@ }, { "constant": false, - "id": 1177, + "id": 1203, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1180, + "scope": 1206, "src": "671:11:11", "stateVariable": false, "storageLocation": "default", @@ -8042,7 +8042,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1176, + "id": 1202, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "671:7:11", @@ -8058,12 +8058,12 @@ "src": "630:53:11" }, "returnParameters": { - "id": 1179, + "id": 1205, "nodeType": "ParameterList", "parameters": [], "src": "692:0:11" }, - "scope": 1565, + "scope": 1591, "src": "617:76:11", "stateMutability": "nonpayable", "superFunction": null, @@ -8072,22 +8072,22 @@ { "body": null, "documentation": null, - "id": 1191, + "id": 1217, "implemented": false, "kind": "function", "modifiers": [], "name": "freeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 1189, + "id": 1215, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1182, + "id": 1208, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1191, + "scope": 1217, "src": "715:15:11", "stateVariable": false, "storageLocation": "default", @@ -8096,7 +8096,7 @@ "typeString": "address" }, "typeName": { - "id": 1181, + "id": 1207, "name": "address", "nodeType": "ElementaryTypeName", "src": "715:7:11", @@ -8111,10 +8111,10 @@ }, { "constant": false, - "id": 1184, + "id": 1210, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1191, + "scope": 1217, "src": "731:15:11", "stateVariable": false, "storageLocation": "default", @@ -8123,7 +8123,7 @@ "typeString": "address" }, "typeName": { - "id": 1183, + "id": 1209, "name": "address", "nodeType": "ElementaryTypeName", "src": "731:7:11", @@ -8138,10 +8138,10 @@ }, { "constant": false, - "id": 1186, + "id": 1212, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1191, + "scope": 1217, "src": "747:11:11", "stateVariable": false, "storageLocation": "default", @@ -8150,7 +8150,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1185, + "id": 1211, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "747:7:11", @@ -8164,10 +8164,10 @@ }, { "constant": false, - "id": 1188, + "id": 1214, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1191, + "scope": 1217, "src": "759:11:11", "stateVariable": false, "storageLocation": "default", @@ -8176,7 +8176,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1187, + "id": 1213, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "759:7:11", @@ -8192,12 +8192,12 @@ "src": "714:57:11" }, "returnParameters": { - "id": 1190, + "id": 1216, "nodeType": "ParameterList", "parameters": [], "src": "780:0:11" }, - "scope": 1565, + "scope": 1591, "src": "698:83:11", "stateMutability": "nonpayable", "superFunction": null, @@ -8206,22 +8206,22 @@ { "body": null, "documentation": null, - "id": 1202, + "id": 1228, "implemented": false, "kind": "function", "modifiers": [], "name": "freeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 1200, + "id": 1226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1193, + "id": 1219, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1202, + "scope": 1228, "src": "803:15:11", "stateVariable": false, "storageLocation": "default", @@ -8230,7 +8230,7 @@ "typeString": "address" }, "typeName": { - "id": 1192, + "id": 1218, "name": "address", "nodeType": "ElementaryTypeName", "src": "803:7:11", @@ -8245,10 +8245,10 @@ }, { "constant": false, - "id": 1195, + "id": 1221, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1202, + "scope": 1228, "src": "819:15:11", "stateVariable": false, "storageLocation": "default", @@ -8257,7 +8257,7 @@ "typeString": "address" }, "typeName": { - "id": 1194, + "id": 1220, "name": "address", "nodeType": "ElementaryTypeName", "src": "819:7:11", @@ -8272,10 +8272,10 @@ }, { "constant": false, - "id": 1197, + "id": 1223, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1202, + "scope": 1228, "src": "835:11:11", "stateVariable": false, "storageLocation": "default", @@ -8284,7 +8284,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1196, + "id": 1222, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "835:7:11", @@ -8298,10 +8298,10 @@ }, { "constant": false, - "id": 1199, + "id": 1225, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1202, + "scope": 1228, "src": "847:11:11", "stateVariable": false, "storageLocation": "default", @@ -8310,7 +8310,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1198, + "id": 1224, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "847:7:11", @@ -8326,12 +8326,12 @@ "src": "802:57:11" }, "returnParameters": { - "id": 1201, + "id": 1227, "nodeType": "ParameterList", "parameters": [], "src": "868:0:11" }, - "scope": 1565, + "scope": 1591, "src": "786:83:11", "stateMutability": "nonpayable", "superFunction": null, @@ -8340,22 +8340,22 @@ { "body": null, "documentation": null, - "id": 1213, + "id": 1239, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 1211, + "id": 1237, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1204, + "id": 1230, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1213, + "scope": 1239, "src": "888:15:11", "stateVariable": false, "storageLocation": "default", @@ -8364,7 +8364,7 @@ "typeString": "address" }, "typeName": { - "id": 1203, + "id": 1229, "name": "address", "nodeType": "ElementaryTypeName", "src": "888:7:11", @@ -8379,10 +8379,10 @@ }, { "constant": false, - "id": 1206, + "id": 1232, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1213, + "scope": 1239, "src": "904:11:11", "stateVariable": false, "storageLocation": "default", @@ -8391,7 +8391,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1205, + "id": 1231, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "904:7:11", @@ -8405,10 +8405,10 @@ }, { "constant": false, - "id": 1208, + "id": 1234, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 1213, + "scope": 1239, "src": "916:11:11", "stateVariable": false, "storageLocation": "default", @@ -8417,7 +8417,7 @@ "typeString": "int256" }, "typeName": { - "id": 1207, + "id": 1233, "name": "int256", "nodeType": "ElementaryTypeName", "src": "916:6:11", @@ -8431,10 +8431,10 @@ }, { "constant": false, - "id": 1210, + "id": 1236, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 1213, + "scope": 1239, "src": "928:11:11", "stateVariable": false, "storageLocation": "default", @@ -8443,7 +8443,7 @@ "typeString": "int256" }, "typeName": { - "id": 1209, + "id": 1235, "name": "int256", "nodeType": "ElementaryTypeName", "src": "928:6:11", @@ -8459,12 +8459,12 @@ "src": "887:53:11" }, "returnParameters": { - "id": 1212, + "id": 1238, "nodeType": "ParameterList", "parameters": [], "src": "949:0:11" }, - "scope": 1565, + "scope": 1591, "src": "874:76:11", "stateMutability": "nonpayable", "superFunction": null, @@ -8473,22 +8473,22 @@ { "body": null, "documentation": null, - "id": 1224, + "id": 1250, "implemented": false, "kind": "function", "modifiers": [], "name": "gemJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 1222, + "id": 1248, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1215, + "id": 1241, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 1224, + "scope": 1250, "src": "977:11:11", "stateVariable": false, "storageLocation": "default", @@ -8497,7 +8497,7 @@ "typeString": "address" }, "typeName": { - "id": 1214, + "id": 1240, "name": "address", "nodeType": "ElementaryTypeName", "src": "977:7:11", @@ -8512,10 +8512,10 @@ }, { "constant": false, - "id": 1217, + "id": 1243, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 1224, + "scope": 1250, "src": "989:11:11", "stateVariable": false, "storageLocation": "default", @@ -8524,7 +8524,7 @@ "typeString": "address" }, "typeName": { - "id": 1216, + "id": 1242, "name": "address", "nodeType": "ElementaryTypeName", "src": "989:7:11", @@ -8539,10 +8539,10 @@ }, { "constant": false, - "id": 1219, + "id": 1245, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1224, + "scope": 1250, "src": "1001:11:11", "stateVariable": false, "storageLocation": "default", @@ -8551,7 +8551,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1218, + "id": 1244, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1001:7:11", @@ -8565,10 +8565,10 @@ }, { "constant": false, - "id": 1221, + "id": 1247, "name": "transferFrom", "nodeType": "VariableDeclaration", - "scope": 1224, + "scope": 1250, "src": "1013:17:11", "stateVariable": false, "storageLocation": "default", @@ -8577,7 +8577,7 @@ "typeString": "bool" }, "typeName": { - "id": 1220, + "id": 1246, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1013:4:11", @@ -8593,12 +8593,12 @@ "src": "976:55:11" }, "returnParameters": { - "id": 1223, + "id": 1249, "nodeType": "ParameterList", "parameters": [], "src": "1040:0:11" }, - "scope": 1565, + "scope": 1591, "src": "955:86:11", "stateMutability": "nonpayable", "superFunction": null, @@ -8607,22 +8607,22 @@ { "body": null, "documentation": null, - "id": 1233, + "id": 1259, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 1231, + "id": 1257, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1226, + "id": 1252, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1233, + "scope": 1259, "src": "1060:15:11", "stateVariable": false, "storageLocation": "default", @@ -8631,7 +8631,7 @@ "typeString": "address" }, "typeName": { - "id": 1225, + "id": 1251, "name": "address", "nodeType": "ElementaryTypeName", "src": "1060:7:11", @@ -8646,10 +8646,10 @@ }, { "constant": false, - "id": 1228, + "id": 1254, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1233, + "scope": 1259, "src": "1076:11:11", "stateVariable": false, "storageLocation": "default", @@ -8658,7 +8658,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1227, + "id": 1253, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1076:7:11", @@ -8672,10 +8672,10 @@ }, { "constant": false, - "id": 1230, + "id": 1256, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 1233, + "scope": 1259, "src": "1088:11:11", "stateVariable": false, "storageLocation": "default", @@ -8684,7 +8684,7 @@ "typeString": "address" }, "typeName": { - "id": 1229, + "id": 1255, "name": "address", "nodeType": "ElementaryTypeName", "src": "1088:7:11", @@ -8701,12 +8701,12 @@ "src": "1059:41:11" }, "returnParameters": { - "id": 1232, + "id": 1258, "nodeType": "ParameterList", "parameters": [], "src": "1109:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1046:64:11", "stateMutability": "nonpayable", "superFunction": null, @@ -8715,22 +8715,22 @@ { "body": null, "documentation": null, - "id": 1244, + "id": 1270, "implemented": false, "kind": "function", "modifiers": [], "name": "giveToProxy", "nodeType": "FunctionDefinition", "parameters": { - "id": 1242, + "id": 1268, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1235, + "id": 1261, "name": "proxyRegistry", "nodeType": "VariableDeclaration", - "scope": 1244, + "scope": 1270, "src": "1136:21:11", "stateVariable": false, "storageLocation": "default", @@ -8739,7 +8739,7 @@ "typeString": "address" }, "typeName": { - "id": 1234, + "id": 1260, "name": "address", "nodeType": "ElementaryTypeName", "src": "1136:7:11", @@ -8754,10 +8754,10 @@ }, { "constant": false, - "id": 1237, + "id": 1263, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1244, + "scope": 1270, "src": "1158:15:11", "stateVariable": false, "storageLocation": "default", @@ -8766,7 +8766,7 @@ "typeString": "address" }, "typeName": { - "id": 1236, + "id": 1262, "name": "address", "nodeType": "ElementaryTypeName", "src": "1158:7:11", @@ -8781,10 +8781,10 @@ }, { "constant": false, - "id": 1239, + "id": 1265, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1244, + "scope": 1270, "src": "1174:11:11", "stateVariable": false, "storageLocation": "default", @@ -8793,7 +8793,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1238, + "id": 1264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1174:7:11", @@ -8807,10 +8807,10 @@ }, { "constant": false, - "id": 1241, + "id": 1267, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1244, + "scope": 1270, "src": "1186:11:11", "stateVariable": false, "storageLocation": "default", @@ -8819,7 +8819,7 @@ "typeString": "address" }, "typeName": { - "id": 1240, + "id": 1266, "name": "address", "nodeType": "ElementaryTypeName", "src": "1186:7:11", @@ -8836,12 +8836,12 @@ "src": "1135:63:11" }, "returnParameters": { - "id": 1243, + "id": 1269, "nodeType": "ParameterList", "parameters": [], "src": "1207:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1115:93:11", "stateMutability": "nonpayable", "superFunction": null, @@ -8850,22 +8850,22 @@ { "body": null, "documentation": null, - "id": 1251, + "id": 1277, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 1249, + "id": 1275, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1246, + "id": 1272, "name": "obj", "nodeType": "VariableDeclaration", - "scope": 1251, + "scope": 1277, "src": "1227:11:11", "stateVariable": false, "storageLocation": "default", @@ -8874,7 +8874,7 @@ "typeString": "address" }, "typeName": { - "id": 1245, + "id": 1271, "name": "address", "nodeType": "ElementaryTypeName", "src": "1227:7:11", @@ -8889,10 +8889,10 @@ }, { "constant": false, - "id": 1248, + "id": 1274, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 1251, + "scope": 1277, "src": "1239:11:11", "stateVariable": false, "storageLocation": "default", @@ -8901,7 +8901,7 @@ "typeString": "address" }, "typeName": { - "id": 1247, + "id": 1273, "name": "address", "nodeType": "ElementaryTypeName", "src": "1239:7:11", @@ -8918,12 +8918,12 @@ "src": "1226:25:11" }, "returnParameters": { - "id": 1250, + "id": 1276, "nodeType": "ParameterList", "parameters": [], "src": "1260:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1213:48:11", "stateMutability": "nonpayable", "superFunction": null, @@ -8932,22 +8932,22 @@ { "body": null, "documentation": null, - "id": 1260, + "id": 1286, "implemented": false, "kind": "function", "modifiers": [], "name": "lockETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 1258, + "id": 1284, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1253, + "id": 1279, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1260, + "scope": 1286, "src": "1283:15:11", "stateVariable": false, "storageLocation": "default", @@ -8956,7 +8956,7 @@ "typeString": "address" }, "typeName": { - "id": 1252, + "id": 1278, "name": "address", "nodeType": "ElementaryTypeName", "src": "1283:7:11", @@ -8971,10 +8971,10 @@ }, { "constant": false, - "id": 1255, + "id": 1281, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1260, + "scope": 1286, "src": "1299:15:11", "stateVariable": false, "storageLocation": "default", @@ -8983,7 +8983,7 @@ "typeString": "address" }, "typeName": { - "id": 1254, + "id": 1280, "name": "address", "nodeType": "ElementaryTypeName", "src": "1299:7:11", @@ -8998,10 +8998,10 @@ }, { "constant": false, - "id": 1257, + "id": 1283, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1260, + "scope": 1286, "src": "1315:11:11", "stateVariable": false, "storageLocation": "default", @@ -9010,7 +9010,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1256, + "id": 1282, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1315:7:11", @@ -9026,12 +9026,12 @@ "src": "1282:45:11" }, "returnParameters": { - "id": 1259, + "id": 1285, "nodeType": "ParameterList", "parameters": [], "src": "1336:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1266:71:11", "stateMutability": "nonpayable", "superFunction": null, @@ -9040,22 +9040,22 @@ { "body": null, "documentation": null, - "id": 1275, + "id": 1301, "implemented": false, "kind": "function", "modifiers": [], "name": "lockETHAndDraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1273, + "id": 1299, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1262, + "id": 1288, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1275, + "scope": 1301, "src": "1366:15:11", "stateVariable": false, "storageLocation": "default", @@ -9064,7 +9064,7 @@ "typeString": "address" }, "typeName": { - "id": 1261, + "id": 1287, "name": "address", "nodeType": "ElementaryTypeName", "src": "1366:7:11", @@ -9079,10 +9079,10 @@ }, { "constant": false, - "id": 1264, + "id": 1290, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 1275, + "scope": 1301, "src": "1382:11:11", "stateVariable": false, "storageLocation": "default", @@ -9091,7 +9091,7 @@ "typeString": "address" }, "typeName": { - "id": 1263, + "id": 1289, "name": "address", "nodeType": "ElementaryTypeName", "src": "1382:7:11", @@ -9106,10 +9106,10 @@ }, { "constant": false, - "id": 1266, + "id": 1292, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1275, + "scope": 1301, "src": "1394:15:11", "stateVariable": false, "storageLocation": "default", @@ -9118,7 +9118,7 @@ "typeString": "address" }, "typeName": { - "id": 1265, + "id": 1291, "name": "address", "nodeType": "ElementaryTypeName", "src": "1394:7:11", @@ -9133,10 +9133,10 @@ }, { "constant": false, - "id": 1268, + "id": 1294, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1275, + "scope": 1301, "src": "1410:15:11", "stateVariable": false, "storageLocation": "default", @@ -9145,7 +9145,7 @@ "typeString": "address" }, "typeName": { - "id": 1267, + "id": 1293, "name": "address", "nodeType": "ElementaryTypeName", "src": "1410:7:11", @@ -9160,10 +9160,10 @@ }, { "constant": false, - "id": 1270, + "id": 1296, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1275, + "scope": 1301, "src": "1426:11:11", "stateVariable": false, "storageLocation": "default", @@ -9172,7 +9172,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1269, + "id": 1295, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1426:7:11", @@ -9186,10 +9186,10 @@ }, { "constant": false, - "id": 1272, + "id": 1298, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1275, + "scope": 1301, "src": "1438:12:11", "stateVariable": false, "storageLocation": "default", @@ -9198,7 +9198,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1271, + "id": 1297, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1438:7:11", @@ -9214,12 +9214,12 @@ "src": "1365:86:11" }, "returnParameters": { - "id": 1274, + "id": 1300, "nodeType": "ParameterList", "parameters": [], "src": "1460:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1342:119:11", "stateMutability": "nonpayable", "superFunction": null, @@ -9228,22 +9228,22 @@ { "body": null, "documentation": null, - "id": 1288, + "id": 1314, "implemented": false, "kind": "function", "modifiers": [], "name": "lockGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 1286, + "id": 1312, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1277, + "id": 1303, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1288, + "scope": 1314, "src": "1483:15:11", "stateVariable": false, "storageLocation": "default", @@ -9252,7 +9252,7 @@ "typeString": "address" }, "typeName": { - "id": 1276, + "id": 1302, "name": "address", "nodeType": "ElementaryTypeName", "src": "1483:7:11", @@ -9267,10 +9267,10 @@ }, { "constant": false, - "id": 1279, + "id": 1305, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1288, + "scope": 1314, "src": "1499:15:11", "stateVariable": false, "storageLocation": "default", @@ -9279,7 +9279,7 @@ "typeString": "address" }, "typeName": { - "id": 1278, + "id": 1304, "name": "address", "nodeType": "ElementaryTypeName", "src": "1499:7:11", @@ -9294,10 +9294,10 @@ }, { "constant": false, - "id": 1281, + "id": 1307, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1288, + "scope": 1314, "src": "1515:11:11", "stateVariable": false, "storageLocation": "default", @@ -9306,7 +9306,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1280, + "id": 1306, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1515:7:11", @@ -9320,10 +9320,10 @@ }, { "constant": false, - "id": 1283, + "id": 1309, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1288, + "scope": 1314, "src": "1527:11:11", "stateVariable": false, "storageLocation": "default", @@ -9332,7 +9332,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1282, + "id": 1308, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1527:7:11", @@ -9346,10 +9346,10 @@ }, { "constant": false, - "id": 1285, + "id": 1311, "name": "transferFrom", "nodeType": "VariableDeclaration", - "scope": 1288, + "scope": 1314, "src": "1539:17:11", "stateVariable": false, "storageLocation": "default", @@ -9358,7 +9358,7 @@ "typeString": "bool" }, "typeName": { - "id": 1284, + "id": 1310, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1539:4:11", @@ -9374,12 +9374,12 @@ "src": "1482:75:11" }, "returnParameters": { - "id": 1287, + "id": 1313, "nodeType": "ParameterList", "parameters": [], "src": "1566:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1466:101:11", "stateMutability": "nonpayable", "superFunction": null, @@ -9388,22 +9388,22 @@ { "body": null, "documentation": null, - "id": 1307, + "id": 1333, "implemented": false, "kind": "function", "modifiers": [], "name": "lockGemAndDraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1305, + "id": 1331, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1290, + "id": 1316, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1596:15:11", "stateVariable": false, "storageLocation": "default", @@ -9412,7 +9412,7 @@ "typeString": "address" }, "typeName": { - "id": 1289, + "id": 1315, "name": "address", "nodeType": "ElementaryTypeName", "src": "1596:7:11", @@ -9427,10 +9427,10 @@ }, { "constant": false, - "id": 1292, + "id": 1318, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1612:11:11", "stateVariable": false, "storageLocation": "default", @@ -9439,7 +9439,7 @@ "typeString": "address" }, "typeName": { - "id": 1291, + "id": 1317, "name": "address", "nodeType": "ElementaryTypeName", "src": "1612:7:11", @@ -9454,10 +9454,10 @@ }, { "constant": false, - "id": 1294, + "id": 1320, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1624:15:11", "stateVariable": false, "storageLocation": "default", @@ -9466,7 +9466,7 @@ "typeString": "address" }, "typeName": { - "id": 1293, + "id": 1319, "name": "address", "nodeType": "ElementaryTypeName", "src": "1624:7:11", @@ -9481,10 +9481,10 @@ }, { "constant": false, - "id": 1296, + "id": 1322, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1640:15:11", "stateVariable": false, "storageLocation": "default", @@ -9493,7 +9493,7 @@ "typeString": "address" }, "typeName": { - "id": 1295, + "id": 1321, "name": "address", "nodeType": "ElementaryTypeName", "src": "1640:7:11", @@ -9508,10 +9508,10 @@ }, { "constant": false, - "id": 1298, + "id": 1324, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1656:11:11", "stateVariable": false, "storageLocation": "default", @@ -9520,7 +9520,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1297, + "id": 1323, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1656:7:11", @@ -9534,10 +9534,10 @@ }, { "constant": false, - "id": 1300, + "id": 1326, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1668:12:11", "stateVariable": false, "storageLocation": "default", @@ -9546,7 +9546,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1299, + "id": 1325, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1668:7:11", @@ -9560,10 +9560,10 @@ }, { "constant": false, - "id": 1302, + "id": 1328, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1681:12:11", "stateVariable": false, "storageLocation": "default", @@ -9572,7 +9572,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1301, + "id": 1327, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1681:7:11", @@ -9586,10 +9586,10 @@ }, { "constant": false, - "id": 1304, + "id": 1330, "name": "transferFrom", "nodeType": "VariableDeclaration", - "scope": 1307, + "scope": 1333, "src": "1694:17:11", "stateVariable": false, "storageLocation": "default", @@ -9598,7 +9598,7 @@ "typeString": "bool" }, "typeName": { - "id": 1303, + "id": 1329, "name": "bool", "nodeType": "ElementaryTypeName", "src": "1694:4:11", @@ -9614,12 +9614,12 @@ "src": "1595:117:11" }, "returnParameters": { - "id": 1306, + "id": 1332, "nodeType": "ParameterList", "parameters": [], "src": "1721:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1572:150:11", "stateMutability": "nonpayable", "superFunction": null, @@ -9628,22 +9628,22 @@ { "body": null, "documentation": null, - "id": 1314, + "id": 1340, "implemented": false, "kind": "function", "modifiers": [], "name": "makeGemBag", "nodeType": "FunctionDefinition", "parameters": { - "id": 1310, + "id": 1336, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1309, + "id": 1335, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1314, + "scope": 1340, "src": "1747:15:11", "stateVariable": false, "storageLocation": "default", @@ -9652,7 +9652,7 @@ "typeString": "address" }, "typeName": { - "id": 1308, + "id": 1334, "name": "address", "nodeType": "ElementaryTypeName", "src": "1747:7:11", @@ -9669,15 +9669,15 @@ "src": "1746:17:11" }, "returnParameters": { - "id": 1313, + "id": 1339, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1312, + "id": 1338, "name": "bag", "nodeType": "VariableDeclaration", - "scope": 1314, + "scope": 1340, "src": "1782:11:11", "stateVariable": false, "storageLocation": "default", @@ -9686,7 +9686,7 @@ "typeString": "address" }, "typeName": { - "id": 1311, + "id": 1337, "name": "address", "nodeType": "ElementaryTypeName", "src": "1782:7:11", @@ -9702,7 +9702,7 @@ ], "src": "1781:13:11" }, - "scope": 1565, + "scope": 1591, "src": "1727:68:11", "stateMutability": "nonpayable", "superFunction": null, @@ -9711,22 +9711,22 @@ { "body": null, "documentation": null, - "id": 1325, + "id": 1351, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 1323, + "id": 1349, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1316, + "id": 1342, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1325, + "scope": 1351, "src": "1814:15:11", "stateVariable": false, "storageLocation": "default", @@ -9735,7 +9735,7 @@ "typeString": "address" }, "typeName": { - "id": 1315, + "id": 1341, "name": "address", "nodeType": "ElementaryTypeName", "src": "1814:7:11", @@ -9750,10 +9750,10 @@ }, { "constant": false, - "id": 1318, + "id": 1344, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1325, + "scope": 1351, "src": "1830:11:11", "stateVariable": false, "storageLocation": "default", @@ -9762,7 +9762,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1317, + "id": 1343, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1830:7:11", @@ -9776,10 +9776,10 @@ }, { "constant": false, - "id": 1320, + "id": 1346, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1325, + "scope": 1351, "src": "1842:11:11", "stateVariable": false, "storageLocation": "default", @@ -9788,7 +9788,7 @@ "typeString": "address" }, "typeName": { - "id": 1319, + "id": 1345, "name": "address", "nodeType": "ElementaryTypeName", "src": "1842:7:11", @@ -9803,10 +9803,10 @@ }, { "constant": false, - "id": 1322, + "id": 1348, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 1325, + "scope": 1351, "src": "1854:11:11", "stateVariable": false, "storageLocation": "default", @@ -9815,7 +9815,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1321, + "id": 1347, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1854:7:11", @@ -9831,12 +9831,12 @@ "src": "1813:53:11" }, "returnParameters": { - "id": 1324, + "id": 1350, "nodeType": "ParameterList", "parameters": [], "src": "1875:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1800:76:11", "stateMutability": "nonpayable", "superFunction": null, @@ -9845,22 +9845,22 @@ { "body": null, "documentation": null, - "id": 1332, + "id": 1358, "implemented": false, "kind": "function", "modifiers": [], "name": "nope", "nodeType": "FunctionDefinition", "parameters": { - "id": 1330, + "id": 1356, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1327, + "id": 1353, "name": "obj", "nodeType": "VariableDeclaration", - "scope": 1332, + "scope": 1358, "src": "1895:11:11", "stateVariable": false, "storageLocation": "default", @@ -9869,7 +9869,7 @@ "typeString": "address" }, "typeName": { - "id": 1326, + "id": 1352, "name": "address", "nodeType": "ElementaryTypeName", "src": "1895:7:11", @@ -9884,10 +9884,10 @@ }, { "constant": false, - "id": 1329, + "id": 1355, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 1332, + "scope": 1358, "src": "1907:11:11", "stateVariable": false, "storageLocation": "default", @@ -9896,7 +9896,7 @@ "typeString": "address" }, "typeName": { - "id": 1328, + "id": 1354, "name": "address", "nodeType": "ElementaryTypeName", "src": "1907:7:11", @@ -9913,12 +9913,12 @@ "src": "1894:25:11" }, "returnParameters": { - "id": 1331, + "id": 1357, "nodeType": "ParameterList", "parameters": [], "src": "1928:0:11" }, - "scope": 1565, + "scope": 1591, "src": "1881:48:11", "stateMutability": "nonpayable", "superFunction": null, @@ -9927,22 +9927,22 @@ { "body": null, "documentation": null, - "id": 1343, + "id": 1369, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 1339, + "id": 1365, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1334, + "id": 1360, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1343, + "scope": 1369, "src": "1948:15:11", "stateVariable": false, "storageLocation": "default", @@ -9951,7 +9951,7 @@ "typeString": "address" }, "typeName": { - "id": 1333, + "id": 1359, "name": "address", "nodeType": "ElementaryTypeName", "src": "1948:7:11", @@ -9966,10 +9966,10 @@ }, { "constant": false, - "id": 1336, + "id": 1362, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 1343, + "scope": 1369, "src": "1964:11:11", "stateVariable": false, "storageLocation": "default", @@ -9978,7 +9978,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 1335, + "id": 1361, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1964:7:11", @@ -9992,10 +9992,10 @@ }, { "constant": false, - "id": 1338, + "id": 1364, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 1343, + "scope": 1369, "src": "1976:11:11", "stateVariable": false, "storageLocation": "default", @@ -10004,7 +10004,7 @@ "typeString": "address" }, "typeName": { - "id": 1337, + "id": 1363, "name": "address", "nodeType": "ElementaryTypeName", "src": "1976:7:11", @@ -10021,15 +10021,15 @@ "src": "1947:41:11" }, "returnParameters": { - "id": 1342, + "id": 1368, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1341, + "id": 1367, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1343, + "scope": 1369, "src": "2007:11:11", "stateVariable": false, "storageLocation": "default", @@ -10038,7 +10038,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1340, + "id": 1366, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2007:7:11", @@ -10053,7 +10053,7 @@ ], "src": "2006:13:11" }, - "scope": 1565, + "scope": 1591, "src": "1934:86:11", "stateMutability": "nonpayable", "superFunction": null, @@ -10062,22 +10062,22 @@ { "body": null, "documentation": null, - "id": 1360, + "id": 1386, "implemented": false, "kind": "function", "modifiers": [], "name": "openLockETHAndDraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1356, + "id": 1382, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1345, + "id": 1371, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2053:15:11", "stateVariable": false, "storageLocation": "default", @@ -10086,7 +10086,7 @@ "typeString": "address" }, "typeName": { - "id": 1344, + "id": 1370, "name": "address", "nodeType": "ElementaryTypeName", "src": "2053:7:11", @@ -10101,10 +10101,10 @@ }, { "constant": false, - "id": 1347, + "id": 1373, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2069:11:11", "stateVariable": false, "storageLocation": "default", @@ -10113,7 +10113,7 @@ "typeString": "address" }, "typeName": { - "id": 1346, + "id": 1372, "name": "address", "nodeType": "ElementaryTypeName", "src": "2069:7:11", @@ -10128,10 +10128,10 @@ }, { "constant": false, - "id": 1349, + "id": 1375, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2081:15:11", "stateVariable": false, "storageLocation": "default", @@ -10140,7 +10140,7 @@ "typeString": "address" }, "typeName": { - "id": 1348, + "id": 1374, "name": "address", "nodeType": "ElementaryTypeName", "src": "2081:7:11", @@ -10155,10 +10155,10 @@ }, { "constant": false, - "id": 1351, + "id": 1377, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2097:15:11", "stateVariable": false, "storageLocation": "default", @@ -10167,7 +10167,7 @@ "typeString": "address" }, "typeName": { - "id": 1350, + "id": 1376, "name": "address", "nodeType": "ElementaryTypeName", "src": "2097:7:11", @@ -10182,10 +10182,10 @@ }, { "constant": false, - "id": 1353, + "id": 1379, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2113:11:11", "stateVariable": false, "storageLocation": "default", @@ -10194,7 +10194,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 1352, + "id": 1378, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2113:7:11", @@ -10208,10 +10208,10 @@ }, { "constant": false, - "id": 1355, + "id": 1381, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2125:12:11", "stateVariable": false, "storageLocation": "default", @@ -10220,7 +10220,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1354, + "id": 1380, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2125:7:11", @@ -10236,15 +10236,15 @@ "src": "2052:86:11" }, "returnParameters": { - "id": 1359, + "id": 1385, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1358, + "id": 1384, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1360, + "scope": 1386, "src": "2157:11:11", "stateVariable": false, "storageLocation": "default", @@ -10253,7 +10253,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1357, + "id": 1383, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2157:7:11", @@ -10268,7 +10268,7 @@ ], "src": "2156:13:11" }, - "scope": 1565, + "scope": 1591, "src": "2025:145:11", "stateMutability": "nonpayable", "superFunction": null, @@ -10277,22 +10277,22 @@ { "body": null, "documentation": null, - "id": 1381, + "id": 1407, "implemented": false, "kind": "function", "modifiers": [], "name": "openLockGNTAndDraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1375, + "id": 1401, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1362, + "id": 1388, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2203:15:11", "stateVariable": false, "storageLocation": "default", @@ -10301,7 +10301,7 @@ "typeString": "address" }, "typeName": { - "id": 1361, + "id": 1387, "name": "address", "nodeType": "ElementaryTypeName", "src": "2203:7:11", @@ -10316,10 +10316,10 @@ }, { "constant": false, - "id": 1364, + "id": 1390, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2219:11:11", "stateVariable": false, "storageLocation": "default", @@ -10328,7 +10328,7 @@ "typeString": "address" }, "typeName": { - "id": 1363, + "id": 1389, "name": "address", "nodeType": "ElementaryTypeName", "src": "2219:7:11", @@ -10343,10 +10343,10 @@ }, { "constant": false, - "id": 1366, + "id": 1392, "name": "gntJoin", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2231:15:11", "stateVariable": false, "storageLocation": "default", @@ -10355,7 +10355,7 @@ "typeString": "address" }, "typeName": { - "id": 1365, + "id": 1391, "name": "address", "nodeType": "ElementaryTypeName", "src": "2231:7:11", @@ -10370,10 +10370,10 @@ }, { "constant": false, - "id": 1368, + "id": 1394, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2247:15:11", "stateVariable": false, "storageLocation": "default", @@ -10382,7 +10382,7 @@ "typeString": "address" }, "typeName": { - "id": 1367, + "id": 1393, "name": "address", "nodeType": "ElementaryTypeName", "src": "2247:7:11", @@ -10397,10 +10397,10 @@ }, { "constant": false, - "id": 1370, + "id": 1396, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2263:11:11", "stateVariable": false, "storageLocation": "default", @@ -10409,7 +10409,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 1369, + "id": 1395, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2263:7:11", @@ -10423,10 +10423,10 @@ }, { "constant": false, - "id": 1372, + "id": 1398, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2275:12:11", "stateVariable": false, "storageLocation": "default", @@ -10435,7 +10435,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1371, + "id": 1397, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2275:7:11", @@ -10449,10 +10449,10 @@ }, { "constant": false, - "id": 1374, + "id": 1400, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2288:12:11", "stateVariable": false, "storageLocation": "default", @@ -10461,7 +10461,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1373, + "id": 1399, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2288:7:11", @@ -10477,15 +10477,15 @@ "src": "2202:99:11" }, "returnParameters": { - "id": 1380, + "id": 1406, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1377, + "id": 1403, "name": "bag", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2320:11:11", "stateVariable": false, "storageLocation": "default", @@ -10494,7 +10494,7 @@ "typeString": "address" }, "typeName": { - "id": 1376, + "id": 1402, "name": "address", "nodeType": "ElementaryTypeName", "src": "2320:7:11", @@ -10509,10 +10509,10 @@ }, { "constant": false, - "id": 1379, + "id": 1405, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1381, + "scope": 1407, "src": "2332:11:11", "stateVariable": false, "storageLocation": "default", @@ -10521,7 +10521,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1378, + "id": 1404, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2332:7:11", @@ -10536,7 +10536,7 @@ ], "src": "2319:25:11" }, - "scope": 1565, + "scope": 1591, "src": "2175:170:11", "stateMutability": "nonpayable", "superFunction": null, @@ -10545,22 +10545,22 @@ { "body": null, "documentation": null, - "id": 1402, + "id": 1428, "implemented": false, "kind": "function", "modifiers": [], "name": "openLockGemAndDraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1398, + "id": 1424, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1383, + "id": 1409, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2378:15:11", "stateVariable": false, "storageLocation": "default", @@ -10569,7 +10569,7 @@ "typeString": "address" }, "typeName": { - "id": 1382, + "id": 1408, "name": "address", "nodeType": "ElementaryTypeName", "src": "2378:7:11", @@ -10584,10 +10584,10 @@ }, { "constant": false, - "id": 1385, + "id": 1411, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2394:11:11", "stateVariable": false, "storageLocation": "default", @@ -10596,7 +10596,7 @@ "typeString": "address" }, "typeName": { - "id": 1384, + "id": 1410, "name": "address", "nodeType": "ElementaryTypeName", "src": "2394:7:11", @@ -10611,10 +10611,10 @@ }, { "constant": false, - "id": 1387, + "id": 1413, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2406:15:11", "stateVariable": false, "storageLocation": "default", @@ -10623,7 +10623,7 @@ "typeString": "address" }, "typeName": { - "id": 1386, + "id": 1412, "name": "address", "nodeType": "ElementaryTypeName", "src": "2406:7:11", @@ -10638,10 +10638,10 @@ }, { "constant": false, - "id": 1389, + "id": 1415, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2422:15:11", "stateVariable": false, "storageLocation": "default", @@ -10650,7 +10650,7 @@ "typeString": "address" }, "typeName": { - "id": 1388, + "id": 1414, "name": "address", "nodeType": "ElementaryTypeName", "src": "2422:7:11", @@ -10665,10 +10665,10 @@ }, { "constant": false, - "id": 1391, + "id": 1417, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2438:11:11", "stateVariable": false, "storageLocation": "default", @@ -10677,7 +10677,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 1390, + "id": 1416, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2438:7:11", @@ -10691,10 +10691,10 @@ }, { "constant": false, - "id": 1393, + "id": 1419, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2450:12:11", "stateVariable": false, "storageLocation": "default", @@ -10703,7 +10703,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1392, + "id": 1418, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2450:7:11", @@ -10717,10 +10717,10 @@ }, { "constant": false, - "id": 1395, + "id": 1421, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2463:12:11", "stateVariable": false, "storageLocation": "default", @@ -10729,7 +10729,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1394, + "id": 1420, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2463:7:11", @@ -10743,10 +10743,10 @@ }, { "constant": false, - "id": 1397, + "id": 1423, "name": "transferFrom", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2476:17:11", "stateVariable": false, "storageLocation": "default", @@ -10755,7 +10755,7 @@ "typeString": "bool" }, "typeName": { - "id": 1396, + "id": 1422, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2476:4:11", @@ -10771,15 +10771,15 @@ "src": "2377:117:11" }, "returnParameters": { - "id": 1401, + "id": 1427, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1400, + "id": 1426, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1402, + "scope": 1428, "src": "2513:11:11", "stateVariable": false, "storageLocation": "default", @@ -10788,7 +10788,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1399, + "id": 1425, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2513:7:11", @@ -10803,7 +10803,7 @@ ], "src": "2512:13:11" }, - "scope": 1565, + "scope": 1591, "src": "2350:176:11", "stateMutability": "nonpayable", "superFunction": null, @@ -10812,22 +10812,22 @@ { "body": null, "documentation": null, - "id": 1411, + "id": 1437, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 1409, + "id": 1435, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1404, + "id": 1430, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1411, + "scope": 1437, "src": "2545:15:11", "stateVariable": false, "storageLocation": "default", @@ -10836,7 +10836,7 @@ "typeString": "address" }, "typeName": { - "id": 1403, + "id": 1429, "name": "address", "nodeType": "ElementaryTypeName", "src": "2545:7:11", @@ -10851,10 +10851,10 @@ }, { "constant": false, - "id": 1406, + "id": 1432, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1411, + "scope": 1437, "src": "2561:11:11", "stateVariable": false, "storageLocation": "default", @@ -10863,7 +10863,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1405, + "id": 1431, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2561:7:11", @@ -10877,10 +10877,10 @@ }, { "constant": false, - "id": 1408, + "id": 1434, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1411, + "scope": 1437, "src": "2573:11:11", "stateVariable": false, "storageLocation": "default", @@ -10889,7 +10889,7 @@ "typeString": "address" }, "typeName": { - "id": 1407, + "id": 1433, "name": "address", "nodeType": "ElementaryTypeName", "src": "2573:7:11", @@ -10906,12 +10906,12 @@ "src": "2544:41:11" }, "returnParameters": { - "id": 1410, + "id": 1436, "nodeType": "ParameterList", "parameters": [], "src": "2594:0:11" }, - "scope": 1565, + "scope": 1591, "src": "2531:64:11", "stateMutability": "nonpayable", "superFunction": null, @@ -10920,22 +10920,22 @@ { "body": null, "documentation": null, - "id": 1422, + "id": 1448, "implemented": false, "kind": "function", "modifiers": [], "name": "safeLockETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 1420, + "id": 1446, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1413, + "id": 1439, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1422, + "scope": 1448, "src": "2621:15:11", "stateVariable": false, "storageLocation": "default", @@ -10944,7 +10944,7 @@ "typeString": "address" }, "typeName": { - "id": 1412, + "id": 1438, "name": "address", "nodeType": "ElementaryTypeName", "src": "2621:7:11", @@ -10959,10 +10959,10 @@ }, { "constant": false, - "id": 1415, + "id": 1441, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1422, + "scope": 1448, "src": "2637:15:11", "stateVariable": false, "storageLocation": "default", @@ -10971,7 +10971,7 @@ "typeString": "address" }, "typeName": { - "id": 1414, + "id": 1440, "name": "address", "nodeType": "ElementaryTypeName", "src": "2637:7:11", @@ -10986,10 +10986,10 @@ }, { "constant": false, - "id": 1417, + "id": 1443, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1422, + "scope": 1448, "src": "2653:11:11", "stateVariable": false, "storageLocation": "default", @@ -10998,7 +10998,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1416, + "id": 1442, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2653:7:11", @@ -11012,10 +11012,10 @@ }, { "constant": false, - "id": 1419, + "id": 1445, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 1422, + "scope": 1448, "src": "2665:13:11", "stateVariable": false, "storageLocation": "default", @@ -11024,7 +11024,7 @@ "typeString": "address" }, "typeName": { - "id": 1418, + "id": 1444, "name": "address", "nodeType": "ElementaryTypeName", "src": "2665:7:11", @@ -11041,12 +11041,12 @@ "src": "2620:59:11" }, "returnParameters": { - "id": 1421, + "id": 1447, "nodeType": "ParameterList", "parameters": [], "src": "2688:0:11" }, - "scope": 1565, + "scope": 1591, "src": "2600:89:11", "stateMutability": "nonpayable", "superFunction": null, @@ -11055,22 +11055,22 @@ { "body": null, "documentation": null, - "id": 1437, + "id": 1463, "implemented": false, "kind": "function", "modifiers": [], "name": "safeLockGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 1435, + "id": 1461, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1424, + "id": 1450, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1437, + "scope": 1463, "src": "2715:15:11", "stateVariable": false, "storageLocation": "default", @@ -11079,7 +11079,7 @@ "typeString": "address" }, "typeName": { - "id": 1423, + "id": 1449, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:11", @@ -11094,10 +11094,10 @@ }, { "constant": false, - "id": 1426, + "id": 1452, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1437, + "scope": 1463, "src": "2731:15:11", "stateVariable": false, "storageLocation": "default", @@ -11106,7 +11106,7 @@ "typeString": "address" }, "typeName": { - "id": 1425, + "id": 1451, "name": "address", "nodeType": "ElementaryTypeName", "src": "2731:7:11", @@ -11121,10 +11121,10 @@ }, { "constant": false, - "id": 1428, + "id": 1454, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1437, + "scope": 1463, "src": "2747:11:11", "stateVariable": false, "storageLocation": "default", @@ -11133,7 +11133,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1427, + "id": 1453, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2747:7:11", @@ -11147,10 +11147,10 @@ }, { "constant": false, - "id": 1430, + "id": 1456, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1437, + "scope": 1463, "src": "2759:11:11", "stateVariable": false, "storageLocation": "default", @@ -11159,7 +11159,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1429, + "id": 1455, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2759:7:11", @@ -11173,10 +11173,10 @@ }, { "constant": false, - "id": 1432, + "id": 1458, "name": "transferFrom", "nodeType": "VariableDeclaration", - "scope": 1437, + "scope": 1463, "src": "2771:17:11", "stateVariable": false, "storageLocation": "default", @@ -11185,7 +11185,7 @@ "typeString": "bool" }, "typeName": { - "id": 1431, + "id": 1457, "name": "bool", "nodeType": "ElementaryTypeName", "src": "2771:4:11", @@ -11199,10 +11199,10 @@ }, { "constant": false, - "id": 1434, + "id": 1460, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 1437, + "scope": 1463, "src": "2789:13:11", "stateVariable": false, "storageLocation": "default", @@ -11211,7 +11211,7 @@ "typeString": "address" }, "typeName": { - "id": 1433, + "id": 1459, "name": "address", "nodeType": "ElementaryTypeName", "src": "2789:7:11", @@ -11228,12 +11228,12 @@ "src": "2714:89:11" }, "returnParameters": { - "id": 1436, + "id": 1462, "nodeType": "ParameterList", "parameters": [], "src": "2812:0:11" }, - "scope": 1565, + "scope": 1591, "src": "2694:119:11", "stateMutability": "nonpayable", "superFunction": null, @@ -11242,22 +11242,22 @@ { "body": null, "documentation": null, - "id": 1450, + "id": 1476, "implemented": false, "kind": "function", "modifiers": [], "name": "safeWipe", "nodeType": "FunctionDefinition", "parameters": { - "id": 1448, + "id": 1474, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1439, + "id": 1465, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1450, + "scope": 1476, "src": "2836:15:11", "stateVariable": false, "storageLocation": "default", @@ -11266,7 +11266,7 @@ "typeString": "address" }, "typeName": { - "id": 1438, + "id": 1464, "name": "address", "nodeType": "ElementaryTypeName", "src": "2836:7:11", @@ -11281,10 +11281,10 @@ }, { "constant": false, - "id": 1441, + "id": 1467, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1450, + "scope": 1476, "src": "2852:15:11", "stateVariable": false, "storageLocation": "default", @@ -11293,7 +11293,7 @@ "typeString": "address" }, "typeName": { - "id": 1440, + "id": 1466, "name": "address", "nodeType": "ElementaryTypeName", "src": "2852:7:11", @@ -11308,10 +11308,10 @@ }, { "constant": false, - "id": 1443, + "id": 1469, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1450, + "scope": 1476, "src": "2868:11:11", "stateVariable": false, "storageLocation": "default", @@ -11320,7 +11320,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1442, + "id": 1468, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2868:7:11", @@ -11334,10 +11334,10 @@ }, { "constant": false, - "id": 1445, + "id": 1471, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1450, + "scope": 1476, "src": "2880:11:11", "stateVariable": false, "storageLocation": "default", @@ -11346,7 +11346,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1444, + "id": 1470, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2880:7:11", @@ -11360,10 +11360,10 @@ }, { "constant": false, - "id": 1447, + "id": 1473, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 1450, + "scope": 1476, "src": "2892:13:11", "stateVariable": false, "storageLocation": "default", @@ -11372,7 +11372,7 @@ "typeString": "address" }, "typeName": { - "id": 1446, + "id": 1472, "name": "address", "nodeType": "ElementaryTypeName", "src": "2892:7:11", @@ -11389,12 +11389,12 @@ "src": "2835:71:11" }, "returnParameters": { - "id": 1449, + "id": 1475, "nodeType": "ParameterList", "parameters": [], "src": "2915:0:11" }, - "scope": 1565, + "scope": 1591, "src": "2818:98:11", "stateMutability": "nonpayable", "superFunction": null, @@ -11403,22 +11403,22 @@ { "body": null, "documentation": null, - "id": 1461, + "id": 1487, "implemented": false, "kind": "function", "modifiers": [], "name": "safeWipeAll", "nodeType": "FunctionDefinition", "parameters": { - "id": 1459, + "id": 1485, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1452, + "id": 1478, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1461, + "scope": 1487, "src": "2942:15:11", "stateVariable": false, "storageLocation": "default", @@ -11427,7 +11427,7 @@ "typeString": "address" }, "typeName": { - "id": 1451, + "id": 1477, "name": "address", "nodeType": "ElementaryTypeName", "src": "2942:7:11", @@ -11442,10 +11442,10 @@ }, { "constant": false, - "id": 1454, + "id": 1480, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1461, + "scope": 1487, "src": "2958:15:11", "stateVariable": false, "storageLocation": "default", @@ -11454,7 +11454,7 @@ "typeString": "address" }, "typeName": { - "id": 1453, + "id": 1479, "name": "address", "nodeType": "ElementaryTypeName", "src": "2958:7:11", @@ -11469,10 +11469,10 @@ }, { "constant": false, - "id": 1456, + "id": 1482, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1461, + "scope": 1487, "src": "2974:11:11", "stateVariable": false, "storageLocation": "default", @@ -11481,7 +11481,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1455, + "id": 1481, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2974:7:11", @@ -11495,10 +11495,10 @@ }, { "constant": false, - "id": 1458, + "id": 1484, "name": "owner", "nodeType": "VariableDeclaration", - "scope": 1461, + "scope": 1487, "src": "2986:13:11", "stateVariable": false, "storageLocation": "default", @@ -11507,7 +11507,7 @@ "typeString": "address" }, "typeName": { - "id": 1457, + "id": 1483, "name": "address", "nodeType": "ElementaryTypeName", "src": "2986:7:11", @@ -11524,12 +11524,12 @@ "src": "2941:59:11" }, "returnParameters": { - "id": 1460, + "id": 1486, "nodeType": "ParameterList", "parameters": [], "src": "3009:0:11" }, - "scope": 1565, + "scope": 1591, "src": "2921:89:11", "stateMutability": "nonpayable", "superFunction": null, @@ -11538,22 +11538,22 @@ { "body": null, "documentation": null, - "id": 1470, + "id": 1496, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 1468, + "id": 1494, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1463, + "id": 1489, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1470, + "scope": 1496, "src": "3030:15:11", "stateVariable": false, "storageLocation": "default", @@ -11562,7 +11562,7 @@ "typeString": "address" }, "typeName": { - "id": 1462, + "id": 1488, "name": "address", "nodeType": "ElementaryTypeName", "src": "3030:7:11", @@ -11577,10 +11577,10 @@ }, { "constant": false, - "id": 1465, + "id": 1491, "name": "cdpSrc", "nodeType": "VariableDeclaration", - "scope": 1470, + "scope": 1496, "src": "3046:14:11", "stateVariable": false, "storageLocation": "default", @@ -11589,7 +11589,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1464, + "id": 1490, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3046:7:11", @@ -11603,10 +11603,10 @@ }, { "constant": false, - "id": 1467, + "id": 1493, "name": "cdpOrg", "nodeType": "VariableDeclaration", - "scope": 1470, + "scope": 1496, "src": "3061:14:11", "stateVariable": false, "storageLocation": "default", @@ -11615,7 +11615,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1466, + "id": 1492, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3061:7:11", @@ -11631,12 +11631,12 @@ "src": "3029:47:11" }, "returnParameters": { - "id": 1469, + "id": 1495, "nodeType": "ParameterList", "parameters": [], "src": "3085:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3015:71:11", "stateMutability": "nonpayable", "superFunction": null, @@ -11645,22 +11645,22 @@ { "body": null, "documentation": null, - "id": 1479, + "id": 1505, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 1477, + "id": 1503, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1472, + "id": 1498, "name": "gem", "nodeType": "VariableDeclaration", - "scope": 1479, + "scope": 1505, "src": "3109:11:11", "stateVariable": false, "storageLocation": "default", @@ -11669,7 +11669,7 @@ "typeString": "address" }, "typeName": { - "id": 1471, + "id": 1497, "name": "address", "nodeType": "ElementaryTypeName", "src": "3109:7:11", @@ -11684,10 +11684,10 @@ }, { "constant": false, - "id": 1474, + "id": 1500, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 1479, + "scope": 1505, "src": "3121:11:11", "stateVariable": false, "storageLocation": "default", @@ -11696,7 +11696,7 @@ "typeString": "address" }, "typeName": { - "id": 1473, + "id": 1499, "name": "address", "nodeType": "ElementaryTypeName", "src": "3121:7:11", @@ -11711,10 +11711,10 @@ }, { "constant": false, - "id": 1476, + "id": 1502, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1479, + "scope": 1505, "src": "3133:11:11", "stateVariable": false, "storageLocation": "default", @@ -11723,7 +11723,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1475, + "id": 1501, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3133:7:11", @@ -11739,12 +11739,12 @@ "src": "3108:37:11" }, "returnParameters": { - "id": 1478, + "id": 1504, "nodeType": "ParameterList", "parameters": [], "src": "3154:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3091:64:11", "stateMutability": "nonpayable", "superFunction": null, @@ -11753,22 +11753,22 @@ { "body": null, "documentation": null, - "id": 1488, + "id": 1514, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 1486, + "id": 1512, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1481, + "id": 1507, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1488, + "scope": 1514, "src": "3178:15:11", "stateVariable": false, "storageLocation": "default", @@ -11777,7 +11777,7 @@ "typeString": "address" }, "typeName": { - "id": 1480, + "id": 1506, "name": "address", "nodeType": "ElementaryTypeName", "src": "3178:7:11", @@ -11792,10 +11792,10 @@ }, { "constant": false, - "id": 1483, + "id": 1509, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 1488, + "scope": 1514, "src": "3194:11:11", "stateVariable": false, "storageLocation": "default", @@ -11804,7 +11804,7 @@ "typeString": "address" }, "typeName": { - "id": 1482, + "id": 1508, "name": "address", "nodeType": "ElementaryTypeName", "src": "3194:7:11", @@ -11819,10 +11819,10 @@ }, { "constant": false, - "id": 1485, + "id": 1511, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 1488, + "scope": 1514, "src": "3206:10:11", "stateVariable": false, "storageLocation": "default", @@ -11831,7 +11831,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1484, + "id": 1510, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3206:7:11", @@ -11847,12 +11847,12 @@ "src": "3177:40:11" }, "returnParameters": { - "id": 1487, + "id": 1513, "nodeType": "ParameterList", "parameters": [], "src": "3226:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3160:67:11", "stateMutability": "nonpayable", "superFunction": null, @@ -11861,22 +11861,22 @@ { "body": null, "documentation": null, - "id": 1499, + "id": 1525, "implemented": false, "kind": "function", "modifiers": [], "name": "wipe", "nodeType": "FunctionDefinition", "parameters": { - "id": 1497, + "id": 1523, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1490, + "id": 1516, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1499, + "scope": 1525, "src": "3246:15:11", "stateVariable": false, "storageLocation": "default", @@ -11885,7 +11885,7 @@ "typeString": "address" }, "typeName": { - "id": 1489, + "id": 1515, "name": "address", "nodeType": "ElementaryTypeName", "src": "3246:7:11", @@ -11900,10 +11900,10 @@ }, { "constant": false, - "id": 1492, + "id": 1518, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1499, + "scope": 1525, "src": "3262:15:11", "stateVariable": false, "storageLocation": "default", @@ -11912,7 +11912,7 @@ "typeString": "address" }, "typeName": { - "id": 1491, + "id": 1517, "name": "address", "nodeType": "ElementaryTypeName", "src": "3262:7:11", @@ -11927,10 +11927,10 @@ }, { "constant": false, - "id": 1494, + "id": 1520, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1499, + "scope": 1525, "src": "3278:11:11", "stateVariable": false, "storageLocation": "default", @@ -11939,7 +11939,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1493, + "id": 1519, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3278:7:11", @@ -11953,10 +11953,10 @@ }, { "constant": false, - "id": 1496, + "id": 1522, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 1499, + "scope": 1525, "src": "3290:11:11", "stateVariable": false, "storageLocation": "default", @@ -11965,7 +11965,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1495, + "id": 1521, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3290:7:11", @@ -11981,12 +11981,12 @@ "src": "3245:57:11" }, "returnParameters": { - "id": 1498, + "id": 1524, "nodeType": "ParameterList", "parameters": [], "src": "3311:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3232:80:11", "stateMutability": "nonpayable", "superFunction": null, @@ -11995,22 +11995,22 @@ { "body": null, "documentation": null, - "id": 1508, + "id": 1534, "implemented": false, "kind": "function", "modifiers": [], "name": "wipeAll", "nodeType": "FunctionDefinition", "parameters": { - "id": 1506, + "id": 1532, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1501, + "id": 1527, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1508, + "scope": 1534, "src": "3334:15:11", "stateVariable": false, "storageLocation": "default", @@ -12019,7 +12019,7 @@ "typeString": "address" }, "typeName": { - "id": 1500, + "id": 1526, "name": "address", "nodeType": "ElementaryTypeName", "src": "3334:7:11", @@ -12034,10 +12034,10 @@ }, { "constant": false, - "id": 1503, + "id": 1529, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1508, + "scope": 1534, "src": "3350:15:11", "stateVariable": false, "storageLocation": "default", @@ -12046,7 +12046,7 @@ "typeString": "address" }, "typeName": { - "id": 1502, + "id": 1528, "name": "address", "nodeType": "ElementaryTypeName", "src": "3350:7:11", @@ -12061,10 +12061,10 @@ }, { "constant": false, - "id": 1505, + "id": 1531, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1508, + "scope": 1534, "src": "3366:11:11", "stateVariable": false, "storageLocation": "default", @@ -12073,7 +12073,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1504, + "id": 1530, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3366:7:11", @@ -12089,12 +12089,12 @@ "src": "3333:45:11" }, "returnParameters": { - "id": 1507, + "id": 1533, "nodeType": "ParameterList", "parameters": [], "src": "3387:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3317:71:11", "stateMutability": "nonpayable", "superFunction": null, @@ -12103,22 +12103,22 @@ { "body": null, "documentation": null, - "id": 1521, + "id": 1547, "implemented": false, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 1519, + "id": 1545, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1510, + "id": 1536, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1521, + "scope": 1547, "src": "3420:15:11", "stateVariable": false, "storageLocation": "default", @@ -12127,7 +12127,7 @@ "typeString": "address" }, "typeName": { - "id": 1509, + "id": 1535, "name": "address", "nodeType": "ElementaryTypeName", "src": "3420:7:11", @@ -12142,10 +12142,10 @@ }, { "constant": false, - "id": 1512, + "id": 1538, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1521, + "scope": 1547, "src": "3436:15:11", "stateVariable": false, "storageLocation": "default", @@ -12154,7 +12154,7 @@ "typeString": "address" }, "typeName": { - "id": 1511, + "id": 1537, "name": "address", "nodeType": "ElementaryTypeName", "src": "3436:7:11", @@ -12169,10 +12169,10 @@ }, { "constant": false, - "id": 1514, + "id": 1540, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1521, + "scope": 1547, "src": "3452:15:11", "stateVariable": false, "storageLocation": "default", @@ -12181,7 +12181,7 @@ "typeString": "address" }, "typeName": { - "id": 1513, + "id": 1539, "name": "address", "nodeType": "ElementaryTypeName", "src": "3452:7:11", @@ -12196,10 +12196,10 @@ }, { "constant": false, - "id": 1516, + "id": 1542, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1521, + "scope": 1547, "src": "3468:11:11", "stateVariable": false, "storageLocation": "default", @@ -12208,7 +12208,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1515, + "id": 1541, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3468:7:11", @@ -12222,10 +12222,10 @@ }, { "constant": false, - "id": 1518, + "id": 1544, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1521, + "scope": 1547, "src": "3480:12:11", "stateVariable": false, "storageLocation": "default", @@ -12234,7 +12234,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1517, + "id": 1543, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3480:7:11", @@ -12250,12 +12250,12 @@ "src": "3419:74:11" }, "returnParameters": { - "id": 1520, + "id": 1546, "nodeType": "ParameterList", "parameters": [], "src": "3502:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3393:110:11", "stateMutability": "nonpayable", "superFunction": null, @@ -12264,22 +12264,22 @@ { "body": null, "documentation": null, - "id": 1534, + "id": 1560, "implemented": false, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 1532, + "id": 1558, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1523, + "id": 1549, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1534, + "scope": 1560, "src": "3535:15:11", "stateVariable": false, "storageLocation": "default", @@ -12288,7 +12288,7 @@ "typeString": "address" }, "typeName": { - "id": 1522, + "id": 1548, "name": "address", "nodeType": "ElementaryTypeName", "src": "3535:7:11", @@ -12303,10 +12303,10 @@ }, { "constant": false, - "id": 1525, + "id": 1551, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1534, + "scope": 1560, "src": "3551:15:11", "stateVariable": false, "storageLocation": "default", @@ -12315,7 +12315,7 @@ "typeString": "address" }, "typeName": { - "id": 1524, + "id": 1550, "name": "address", "nodeType": "ElementaryTypeName", "src": "3551:7:11", @@ -12330,10 +12330,10 @@ }, { "constant": false, - "id": 1527, + "id": 1553, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1534, + "scope": 1560, "src": "3567:15:11", "stateVariable": false, "storageLocation": "default", @@ -12342,7 +12342,7 @@ "typeString": "address" }, "typeName": { - "id": 1526, + "id": 1552, "name": "address", "nodeType": "ElementaryTypeName", "src": "3567:7:11", @@ -12357,10 +12357,10 @@ }, { "constant": false, - "id": 1529, + "id": 1555, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1534, + "scope": 1560, "src": "3583:11:11", "stateVariable": false, "storageLocation": "default", @@ -12369,7 +12369,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1528, + "id": 1554, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3583:7:11", @@ -12383,10 +12383,10 @@ }, { "constant": false, - "id": 1531, + "id": 1557, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1534, + "scope": 1560, "src": "3595:12:11", "stateVariable": false, "storageLocation": "default", @@ -12395,7 +12395,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1530, + "id": 1556, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3595:7:11", @@ -12411,12 +12411,12 @@ "src": "3534:74:11" }, "returnParameters": { - "id": 1533, + "id": 1559, "nodeType": "ParameterList", "parameters": [], "src": "3617:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3508:110:11", "stateMutability": "nonpayable", "superFunction": null, @@ -12425,22 +12425,22 @@ { "body": null, "documentation": null, - "id": 1549, + "id": 1575, "implemented": false, "kind": "function", "modifiers": [], "name": "wipeAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 1547, + "id": 1573, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1536, + "id": 1562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1549, + "scope": 1575, "src": "3647:15:11", "stateVariable": false, "storageLocation": "default", @@ -12449,7 +12449,7 @@ "typeString": "address" }, "typeName": { - "id": 1535, + "id": 1561, "name": "address", "nodeType": "ElementaryTypeName", "src": "3647:7:11", @@ -12464,10 +12464,10 @@ }, { "constant": false, - "id": 1538, + "id": 1564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 1549, + "scope": 1575, "src": "3663:15:11", "stateVariable": false, "storageLocation": "default", @@ -12476,7 +12476,7 @@ "typeString": "address" }, "typeName": { - "id": 1537, + "id": 1563, "name": "address", "nodeType": "ElementaryTypeName", "src": "3663:7:11", @@ -12491,10 +12491,10 @@ }, { "constant": false, - "id": 1540, + "id": 1566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1549, + "scope": 1575, "src": "3679:15:11", "stateVariable": false, "storageLocation": "default", @@ -12503,7 +12503,7 @@ "typeString": "address" }, "typeName": { - "id": 1539, + "id": 1565, "name": "address", "nodeType": "ElementaryTypeName", "src": "3679:7:11", @@ -12518,10 +12518,10 @@ }, { "constant": false, - "id": 1542, + "id": 1568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1549, + "scope": 1575, "src": "3695:11:11", "stateVariable": false, "storageLocation": "default", @@ -12530,7 +12530,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1541, + "id": 1567, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3695:7:11", @@ -12544,10 +12544,10 @@ }, { "constant": false, - "id": 1544, + "id": 1570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1549, + "scope": 1575, "src": "3707:12:11", "stateVariable": false, "storageLocation": "default", @@ -12556,7 +12556,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1543, + "id": 1569, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3707:7:11", @@ -12570,10 +12570,10 @@ }, { "constant": false, - "id": 1546, + "id": 1572, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1549, + "scope": 1575, "src": "3720:12:11", "stateVariable": false, "storageLocation": "default", @@ -12582,7 +12582,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1545, + "id": 1571, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3720:7:11", @@ -12598,12 +12598,12 @@ "src": "3646:87:11" }, "returnParameters": { - "id": 1548, + "id": 1574, "nodeType": "ParameterList", "parameters": [], "src": "3742:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3623:120:11", "stateMutability": "nonpayable", "superFunction": null, @@ -12612,22 +12612,22 @@ { "body": null, "documentation": null, - "id": 1564, + "id": 1590, "implemented": false, "kind": "function", "modifiers": [], "name": "wipeAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 1562, + "id": 1588, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1551, + "id": 1577, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 1564, + "scope": 1590, "src": "3772:15:11", "stateVariable": false, "storageLocation": "default", @@ -12636,7 +12636,7 @@ "typeString": "address" }, "typeName": { - "id": 1550, + "id": 1576, "name": "address", "nodeType": "ElementaryTypeName", "src": "3772:7:11", @@ -12651,10 +12651,10 @@ }, { "constant": false, - "id": 1553, + "id": 1579, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 1564, + "scope": 1590, "src": "3788:15:11", "stateVariable": false, "storageLocation": "default", @@ -12663,7 +12663,7 @@ "typeString": "address" }, "typeName": { - "id": 1552, + "id": 1578, "name": "address", "nodeType": "ElementaryTypeName", "src": "3788:7:11", @@ -12678,10 +12678,10 @@ }, { "constant": false, - "id": 1555, + "id": 1581, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 1564, + "scope": 1590, "src": "3804:15:11", "stateVariable": false, "storageLocation": "default", @@ -12690,7 +12690,7 @@ "typeString": "address" }, "typeName": { - "id": 1554, + "id": 1580, "name": "address", "nodeType": "ElementaryTypeName", "src": "3804:7:11", @@ -12705,10 +12705,10 @@ }, { "constant": false, - "id": 1557, + "id": 1583, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 1564, + "scope": 1590, "src": "3820:11:11", "stateVariable": false, "storageLocation": "default", @@ -12717,7 +12717,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1556, + "id": 1582, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3820:7:11", @@ -12731,10 +12731,10 @@ }, { "constant": false, - "id": 1559, + "id": 1585, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 1564, + "scope": 1590, "src": "3832:12:11", "stateVariable": false, "storageLocation": "default", @@ -12743,7 +12743,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1558, + "id": 1584, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3832:7:11", @@ -12757,10 +12757,10 @@ }, { "constant": false, - "id": 1561, + "id": 1587, "name": "wadD", "nodeType": "VariableDeclaration", - "scope": 1564, + "scope": 1590, "src": "3845:12:11", "stateVariable": false, "storageLocation": "default", @@ -12769,7 +12769,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1560, + "id": 1586, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3845:7:11", @@ -12785,19 +12785,19 @@ "src": "3771:87:11" }, "returnParameters": { - "id": 1563, + "id": 1589, "nodeType": "ParameterList", "parameters": [], "src": "3867:0:11" }, - "scope": 1565, + "scope": 1591, "src": "3748:120:11", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 1566, + "scope": 1592, "src": "25:3845:11" } ], @@ -12809,7 +12809,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.471Z", + "updatedAt": "2020-04-08T12:21:13.687Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/IERC20.json b/packages/smart-contracts/artifacts/IERC20.json index 82b95ce..72dbfa4 100644 --- a/packages/smart-contracts/artifacts/IERC20.json +++ b/packages/smart-contracts/artifacts/IERC20.json @@ -2243,7 +2243,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.455Z", + "updatedAt": "2020-04-08T12:21:13.659Z", "devdoc": { "methods": { "allowance(address,address)": { diff --git a/packages/smart-contracts/artifacts/IFlashLoanReceiver.json b/packages/smart-contracts/artifacts/IFlashLoanReceiver.json index 570219c..0d14c55 100644 --- a/packages/smart-contracts/artifacts/IFlashLoanReceiver.json +++ b/packages/smart-contracts/artifacts/IFlashLoanReceiver.json @@ -391,7 +391,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.460Z", + "updatedAt": "2020-04-08T12:21:13.667Z", "devdoc": { "author": "Aave", "details": "implement this interface to develop a flashloan-compatible flashLoanReceiver contract*", diff --git a/packages/smart-contracts/artifacts/ILendingPool.json b/packages/smart-contracts/artifacts/ILendingPool.json index 5dbdccd..2ed6399 100644 --- a/packages/smart-contracts/artifacts/ILendingPool.json +++ b/packages/smart-contracts/artifacts/ILendingPool.json @@ -5244,7 +5244,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.460Z", + "updatedAt": "2020-04-08T12:21:13.670Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/ILendingPoolAddressesProvider.json b/packages/smart-contracts/artifacts/ILendingPoolAddressesProvider.json index aaa8539..0001148 100644 --- a/packages/smart-contracts/artifacts/ILendingPoolAddressesProvider.json +++ b/packages/smart-contracts/artifacts/ILendingPoolAddressesProvider.json @@ -2845,7 +2845,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.464Z", + "updatedAt": "2020-04-08T12:21:13.674Z", "devdoc": { "methods": {}, "title": "ILendingPoolAddressesProvider interface" diff --git a/packages/smart-contracts/artifacts/ILendingPoolParametersProvider.json b/packages/smart-contracts/artifacts/ILendingPoolParametersProvider.json index 4552122..fbb9144 100644 --- a/packages/smart-contracts/artifacts/ILendingPoolParametersProvider.json +++ b/packages/smart-contracts/artifacts/ILendingPoolParametersProvider.json @@ -275,7 +275,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.465Z", + "updatedAt": "2020-04-08T12:21:13.676Z", "devdoc": { "methods": {}, "title": "ILendingPoolAddressesProvider interface" diff --git a/packages/smart-contracts/artifacts/IUniswapExchange.json b/packages/smart-contracts/artifacts/IUniswapExchange.json index dbfda46..92cf927 100644 --- a/packages/smart-contracts/artifacts/IUniswapExchange.json +++ b/packages/smart-contracts/artifacts/IUniswapExchange.json @@ -1000,14 +1000,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol", "exportedSymbols": { "IUniswapExchange": [ - 1909 + 1935 ] }, - "id": 1910, + "id": 1936, "nodeType": "SourceUnit", "nodes": [ { - "id": 1567, + "id": 1593, "literals": [ "solidity", "0.5", @@ -1022,9 +1022,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1909, + "id": 1935, "linearizedBaseContracts": [ - 1909 + 1935 ], "name": "IUniswapExchange", "nodeType": "ContractDefinition", @@ -1032,28 +1032,28 @@ { "body": null, "documentation": null, - "id": 1572, + "id": 1598, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenAddress", "nodeType": "FunctionDefinition", "parameters": { - "id": 1568, + "id": 1594, "nodeType": "ParameterList", "parameters": [], "src": "130:2:12" }, "returnParameters": { - "id": 1571, + "id": 1597, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1570, + "id": 1596, "name": "token", "nodeType": "VariableDeclaration", - "scope": 1572, + "scope": 1598, "src": "156:13:12", "stateVariable": false, "storageLocation": "default", @@ -1062,7 +1062,7 @@ "typeString": "address" }, "typeName": { - "id": 1569, + "id": 1595, "name": "address", "nodeType": "ElementaryTypeName", "src": "156:7:12", @@ -1078,7 +1078,7 @@ ], "src": "155:15:12" }, - "scope": 1909, + "scope": 1935, "src": "109:62:12", "stateMutability": "view", "superFunction": null, @@ -1087,28 +1087,28 @@ { "body": null, "documentation": null, - "id": 1577, + "id": 1603, "implemented": false, "kind": "function", "modifiers": [], "name": "factoryAddress", "nodeType": "FunctionDefinition", "parameters": { - "id": 1573, + "id": 1599, "nodeType": "ParameterList", "parameters": [], "src": "233:2:12" }, "returnParameters": { - "id": 1576, + "id": 1602, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1575, + "id": 1601, "name": "factory", "nodeType": "VariableDeclaration", - "scope": 1577, + "scope": 1603, "src": "259:15:12", "stateVariable": false, "storageLocation": "default", @@ -1117,7 +1117,7 @@ "typeString": "address" }, "typeName": { - "id": 1574, + "id": 1600, "name": "address", "nodeType": "ElementaryTypeName", "src": "259:7:12", @@ -1133,7 +1133,7 @@ ], "src": "258:17:12" }, - "scope": 1909, + "scope": 1935, "src": "210:66:12", "stateMutability": "view", "superFunction": null, @@ -1142,22 +1142,22 @@ { "body": null, "documentation": null, - "id": 1588, + "id": 1614, "implemented": false, "kind": "function", "modifiers": [], "name": "addLiquidity", "nodeType": "FunctionDefinition", "parameters": { - "id": 1584, + "id": 1610, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1579, + "id": 1605, "name": "min_liquidity", "nodeType": "VariableDeclaration", - "scope": 1588, + "scope": 1614, "src": "328:21:12", "stateVariable": false, "storageLocation": "default", @@ -1166,7 +1166,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1578, + "id": 1604, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "328:7:12", @@ -1180,10 +1180,10 @@ }, { "constant": false, - "id": 1581, + "id": 1607, "name": "max_tokens", "nodeType": "VariableDeclaration", - "scope": 1588, + "scope": 1614, "src": "351:18:12", "stateVariable": false, "storageLocation": "default", @@ -1192,7 +1192,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1580, + "id": 1606, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "351:7:12", @@ -1206,10 +1206,10 @@ }, { "constant": false, - "id": 1583, + "id": 1609, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1588, + "scope": 1614, "src": "371:16:12", "stateVariable": false, "storageLocation": "default", @@ -1218,7 +1218,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1582, + "id": 1608, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "371:7:12", @@ -1234,15 +1234,15 @@ "src": "327:61:12" }, "returnParameters": { - "id": 1587, + "id": 1613, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1586, + "id": 1612, "name": "", "nodeType": "VariableDeclaration", - "scope": 1588, + "scope": 1614, "src": "415:7:12", "stateVariable": false, "storageLocation": "default", @@ -1251,7 +1251,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1585, + "id": 1611, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "415:7:12", @@ -1266,7 +1266,7 @@ ], "src": "414:9:12" }, - "scope": 1909, + "scope": 1935, "src": "306:118:12", "stateMutability": "payable", "superFunction": null, @@ -1275,22 +1275,22 @@ { "body": null, "documentation": null, - "id": 1603, + "id": 1629, "implemented": false, "kind": "function", "modifiers": [], "name": "removeLiquidity", "nodeType": "FunctionDefinition", "parameters": { - "id": 1597, + "id": 1623, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1590, + "id": 1616, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 1603, + "scope": 1629, "src": "454:14:12", "stateVariable": false, "storageLocation": "default", @@ -1299,7 +1299,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1589, + "id": 1615, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "454:7:12", @@ -1313,10 +1313,10 @@ }, { "constant": false, - "id": 1592, + "id": 1618, "name": "min_eth", "nodeType": "VariableDeclaration", - "scope": 1603, + "scope": 1629, "src": "470:15:12", "stateVariable": false, "storageLocation": "default", @@ -1325,7 +1325,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1591, + "id": 1617, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "470:7:12", @@ -1339,10 +1339,10 @@ }, { "constant": false, - "id": 1594, + "id": 1620, "name": "min_tokens", "nodeType": "VariableDeclaration", - "scope": 1603, + "scope": 1629, "src": "487:18:12", "stateVariable": false, "storageLocation": "default", @@ -1351,7 +1351,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1593, + "id": 1619, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "487:7:12", @@ -1365,10 +1365,10 @@ }, { "constant": false, - "id": 1596, + "id": 1622, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1603, + "scope": 1629, "src": "507:16:12", "stateVariable": false, "storageLocation": "default", @@ -1377,7 +1377,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1595, + "id": 1621, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "507:7:12", @@ -1393,15 +1393,15 @@ "src": "453:71:12" }, "returnParameters": { - "id": 1602, + "id": 1628, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1599, + "id": 1625, "name": "", "nodeType": "VariableDeclaration", - "scope": 1603, + "scope": 1629, "src": "543:7:12", "stateVariable": false, "storageLocation": "default", @@ -1410,7 +1410,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1598, + "id": 1624, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "543:7:12", @@ -1424,10 +1424,10 @@ }, { "constant": false, - "id": 1601, + "id": 1627, "name": "", "nodeType": "VariableDeclaration", - "scope": 1603, + "scope": 1629, "src": "552:7:12", "stateVariable": false, "storageLocation": "default", @@ -1436,7 +1436,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1600, + "id": 1626, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "552:7:12", @@ -1451,7 +1451,7 @@ ], "src": "542:18:12" }, - "scope": 1909, + "scope": 1935, "src": "429:132:12", "stateMutability": "nonpayable", "superFunction": null, @@ -1460,22 +1460,22 @@ { "body": null, "documentation": null, - "id": 1610, + "id": 1636, "implemented": false, "kind": "function", "modifiers": [], "name": "getEthToTokenInputPrice", "nodeType": "FunctionDefinition", "parameters": { - "id": 1606, + "id": 1632, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1605, + "id": 1631, "name": "eth_sold", "nodeType": "VariableDeclaration", - "scope": 1610, + "scope": 1636, "src": "617:16:12", "stateVariable": false, "storageLocation": "default", @@ -1484,7 +1484,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1604, + "id": 1630, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "617:7:12", @@ -1500,15 +1500,15 @@ "src": "616:18:12" }, "returnParameters": { - "id": 1609, + "id": 1635, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1608, + "id": 1634, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1610, + "scope": 1636, "src": "658:21:12", "stateVariable": false, "storageLocation": "default", @@ -1517,7 +1517,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1607, + "id": 1633, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "658:7:12", @@ -1532,7 +1532,7 @@ ], "src": "657:23:12" }, - "scope": 1909, + "scope": 1935, "src": "584:97:12", "stateMutability": "view", "superFunction": null, @@ -1541,22 +1541,22 @@ { "body": null, "documentation": null, - "id": 1617, + "id": 1643, "implemented": false, "kind": "function", "modifiers": [], "name": "getEthToTokenOutputPrice", "nodeType": "FunctionDefinition", "parameters": { - "id": 1613, + "id": 1639, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1612, + "id": 1638, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1617, + "scope": 1643, "src": "720:21:12", "stateVariable": false, "storageLocation": "default", @@ -1565,7 +1565,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1611, + "id": 1637, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "720:7:12", @@ -1581,15 +1581,15 @@ "src": "719:23:12" }, "returnParameters": { - "id": 1616, + "id": 1642, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1615, + "id": 1641, "name": "eth_sold", "nodeType": "VariableDeclaration", - "scope": 1617, + "scope": 1643, "src": "766:16:12", "stateVariable": false, "storageLocation": "default", @@ -1598,7 +1598,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1614, + "id": 1640, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "766:7:12", @@ -1613,7 +1613,7 @@ ], "src": "765:18:12" }, - "scope": 1909, + "scope": 1935, "src": "686:98:12", "stateMutability": "view", "superFunction": null, @@ -1622,22 +1622,22 @@ { "body": null, "documentation": null, - "id": 1624, + "id": 1650, "implemented": false, "kind": "function", "modifiers": [], "name": "getTokenToEthInputPrice", "nodeType": "FunctionDefinition", "parameters": { - "id": 1620, + "id": 1646, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1619, + "id": 1645, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1624, + "scope": 1650, "src": "822:19:12", "stateVariable": false, "storageLocation": "default", @@ -1646,7 +1646,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1618, + "id": 1644, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "822:7:12", @@ -1662,15 +1662,15 @@ "src": "821:21:12" }, "returnParameters": { - "id": 1623, + "id": 1649, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1622, + "id": 1648, "name": "eth_bought", "nodeType": "VariableDeclaration", - "scope": 1624, + "scope": 1650, "src": "866:18:12", "stateVariable": false, "storageLocation": "default", @@ -1679,7 +1679,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1621, + "id": 1647, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "866:7:12", @@ -1694,7 +1694,7 @@ ], "src": "865:20:12" }, - "scope": 1909, + "scope": 1935, "src": "789:97:12", "stateMutability": "view", "superFunction": null, @@ -1703,22 +1703,22 @@ { "body": null, "documentation": null, - "id": 1631, + "id": 1657, "implemented": false, "kind": "function", "modifiers": [], "name": "getTokenToEthOutputPrice", "nodeType": "FunctionDefinition", "parameters": { - "id": 1627, + "id": 1653, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1626, + "id": 1652, "name": "eth_bought", "nodeType": "VariableDeclaration", - "scope": 1631, + "scope": 1657, "src": "925:18:12", "stateVariable": false, "storageLocation": "default", @@ -1727,7 +1727,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1625, + "id": 1651, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "925:7:12", @@ -1743,15 +1743,15 @@ "src": "924:20:12" }, "returnParameters": { - "id": 1630, + "id": 1656, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1629, + "id": 1655, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1631, + "scope": 1657, "src": "968:19:12", "stateVariable": false, "storageLocation": "default", @@ -1760,7 +1760,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1628, + "id": 1654, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "968:7:12", @@ -1775,7 +1775,7 @@ ], "src": "967:21:12" }, - "scope": 1909, + "scope": 1935, "src": "891:98:12", "stateMutability": "view", "superFunction": null, @@ -1784,22 +1784,22 @@ { "body": null, "documentation": null, - "id": 1640, + "id": 1666, "implemented": false, "kind": "function", "modifiers": [], "name": "ethToTokenSwapInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1636, + "id": 1662, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1633, + "id": 1659, "name": "min_tokens", "nodeType": "VariableDeclaration", - "scope": 1640, + "scope": 1666, "src": "1049:18:12", "stateVariable": false, "storageLocation": "default", @@ -1808,7 +1808,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1632, + "id": 1658, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1049:7:12", @@ -1822,10 +1822,10 @@ }, { "constant": false, - "id": 1635, + "id": 1661, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1640, + "scope": 1666, "src": "1069:16:12", "stateVariable": false, "storageLocation": "default", @@ -1834,7 +1834,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1634, + "id": 1660, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1069:7:12", @@ -1850,15 +1850,15 @@ "src": "1048:38:12" }, "returnParameters": { - "id": 1639, + "id": 1665, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1638, + "id": 1664, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1640, + "scope": 1666, "src": "1113:22:12", "stateVariable": false, "storageLocation": "default", @@ -1867,7 +1867,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1637, + "id": 1663, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1113:7:12", @@ -1882,7 +1882,7 @@ ], "src": "1112:24:12" }, - "scope": 1909, + "scope": 1935, "src": "1020:117:12", "stateMutability": "payable", "superFunction": null, @@ -1891,22 +1891,22 @@ { "body": null, "documentation": null, - "id": 1651, + "id": 1677, "implemented": false, "kind": "function", "modifiers": [], "name": "ethToTokenTransferInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1647, + "id": 1673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1642, + "id": 1668, "name": "min_tokens", "nodeType": "VariableDeclaration", - "scope": 1651, + "scope": 1677, "src": "1175:18:12", "stateVariable": false, "storageLocation": "default", @@ -1915,7 +1915,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1641, + "id": 1667, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1175:7:12", @@ -1929,10 +1929,10 @@ }, { "constant": false, - "id": 1644, + "id": 1670, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1651, + "scope": 1677, "src": "1195:16:12", "stateVariable": false, "storageLocation": "default", @@ -1941,7 +1941,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1643, + "id": 1669, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1195:7:12", @@ -1955,10 +1955,10 @@ }, { "constant": false, - "id": 1646, + "id": 1672, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1651, + "scope": 1677, "src": "1213:17:12", "stateVariable": false, "storageLocation": "default", @@ -1967,7 +1967,7 @@ "typeString": "address" }, "typeName": { - "id": 1645, + "id": 1671, "name": "address", "nodeType": "ElementaryTypeName", "src": "1213:7:12", @@ -1984,15 +1984,15 @@ "src": "1174:57:12" }, "returnParameters": { - "id": 1650, + "id": 1676, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1649, + "id": 1675, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1651, + "scope": 1677, "src": "1258:22:12", "stateVariable": false, "storageLocation": "default", @@ -2001,7 +2001,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1648, + "id": 1674, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1258:7:12", @@ -2016,7 +2016,7 @@ ], "src": "1257:24:12" }, - "scope": 1909, + "scope": 1935, "src": "1142:140:12", "stateMutability": "payable", "superFunction": null, @@ -2025,22 +2025,22 @@ { "body": null, "documentation": null, - "id": 1660, + "id": 1686, "implemented": false, "kind": "function", "modifiers": [], "name": "ethToTokenSwapOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1656, + "id": 1682, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1653, + "id": 1679, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1660, + "scope": 1686, "src": "1317:21:12", "stateVariable": false, "storageLocation": "default", @@ -2049,7 +2049,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1652, + "id": 1678, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1317:7:12", @@ -2063,10 +2063,10 @@ }, { "constant": false, - "id": 1655, + "id": 1681, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1660, + "scope": 1686, "src": "1340:16:12", "stateVariable": false, "storageLocation": "default", @@ -2075,7 +2075,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1654, + "id": 1680, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1340:7:12", @@ -2091,15 +2091,15 @@ "src": "1316:41:12" }, "returnParameters": { - "id": 1659, + "id": 1685, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1658, + "id": 1684, "name": "eth_sold", "nodeType": "VariableDeclaration", - "scope": 1660, + "scope": 1686, "src": "1384:17:12", "stateVariable": false, "storageLocation": "default", @@ -2108,7 +2108,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1657, + "id": 1683, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1384:7:12", @@ -2123,7 +2123,7 @@ ], "src": "1383:19:12" }, - "scope": 1909, + "scope": 1935, "src": "1287:116:12", "stateMutability": "payable", "superFunction": null, @@ -2132,22 +2132,22 @@ { "body": null, "documentation": null, - "id": 1671, + "id": 1697, "implemented": false, "kind": "function", "modifiers": [], "name": "ethToTokenTransferOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1667, + "id": 1693, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1662, + "id": 1688, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1671, + "scope": 1697, "src": "1442:21:12", "stateVariable": false, "storageLocation": "default", @@ -2156,7 +2156,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1661, + "id": 1687, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1442:7:12", @@ -2170,10 +2170,10 @@ }, { "constant": false, - "id": 1664, + "id": 1690, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1671, + "scope": 1697, "src": "1465:16:12", "stateVariable": false, "storageLocation": "default", @@ -2182,7 +2182,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1663, + "id": 1689, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1465:7:12", @@ -2196,10 +2196,10 @@ }, { "constant": false, - "id": 1666, + "id": 1692, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1671, + "scope": 1697, "src": "1483:17:12", "stateVariable": false, "storageLocation": "default", @@ -2208,7 +2208,7 @@ "typeString": "address" }, "typeName": { - "id": 1665, + "id": 1691, "name": "address", "nodeType": "ElementaryTypeName", "src": "1483:7:12", @@ -2225,15 +2225,15 @@ "src": "1441:60:12" }, "returnParameters": { - "id": 1670, + "id": 1696, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1669, + "id": 1695, "name": "eth_sold", "nodeType": "VariableDeclaration", - "scope": 1671, + "scope": 1697, "src": "1528:17:12", "stateVariable": false, "storageLocation": "default", @@ -2242,7 +2242,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1668, + "id": 1694, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1528:7:12", @@ -2257,7 +2257,7 @@ ], "src": "1527:19:12" }, - "scope": 1909, + "scope": 1935, "src": "1408:139:12", "stateMutability": "payable", "superFunction": null, @@ -2266,22 +2266,22 @@ { "body": null, "documentation": null, - "id": 1682, + "id": 1708, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToEthSwapInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1678, + "id": 1704, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1673, + "id": 1699, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1682, + "scope": 1708, "src": "1607:19:12", "stateVariable": false, "storageLocation": "default", @@ -2290,7 +2290,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1672, + "id": 1698, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1607:7:12", @@ -2304,10 +2304,10 @@ }, { "constant": false, - "id": 1675, + "id": 1701, "name": "min_eth", "nodeType": "VariableDeclaration", - "scope": 1682, + "scope": 1708, "src": "1628:15:12", "stateVariable": false, "storageLocation": "default", @@ -2316,7 +2316,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1674, + "id": 1700, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1628:7:12", @@ -2330,10 +2330,10 @@ }, { "constant": false, - "id": 1677, + "id": 1703, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1682, + "scope": 1708, "src": "1645:16:12", "stateVariable": false, "storageLocation": "default", @@ -2342,7 +2342,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1676, + "id": 1702, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1645:7:12", @@ -2358,15 +2358,15 @@ "src": "1606:56:12" }, "returnParameters": { - "id": 1681, + "id": 1707, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1680, + "id": 1706, "name": "eth_bought", "nodeType": "VariableDeclaration", - "scope": 1682, + "scope": 1708, "src": "1681:19:12", "stateVariable": false, "storageLocation": "default", @@ -2375,7 +2375,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1679, + "id": 1705, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1681:7:12", @@ -2390,7 +2390,7 @@ ], "src": "1680:21:12" }, - "scope": 1909, + "scope": 1935, "src": "1578:124:12", "stateMutability": "nonpayable", "superFunction": null, @@ -2399,22 +2399,22 @@ { "body": null, "documentation": null, - "id": 1695, + "id": 1721, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToEthTransferInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1691, + "id": 1717, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1684, + "id": 1710, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1695, + "scope": 1721, "src": "1740:19:12", "stateVariable": false, "storageLocation": "default", @@ -2423,7 +2423,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1683, + "id": 1709, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1740:7:12", @@ -2437,10 +2437,10 @@ }, { "constant": false, - "id": 1686, + "id": 1712, "name": "min_eth", "nodeType": "VariableDeclaration", - "scope": 1695, + "scope": 1721, "src": "1761:15:12", "stateVariable": false, "storageLocation": "default", @@ -2449,7 +2449,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1685, + "id": 1711, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1761:7:12", @@ -2463,10 +2463,10 @@ }, { "constant": false, - "id": 1688, + "id": 1714, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1695, + "scope": 1721, "src": "1778:16:12", "stateVariable": false, "storageLocation": "default", @@ -2475,7 +2475,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1687, + "id": 1713, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1778:7:12", @@ -2489,10 +2489,10 @@ }, { "constant": false, - "id": 1690, + "id": 1716, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1695, + "scope": 1721, "src": "1796:17:12", "stateVariable": false, "storageLocation": "default", @@ -2501,7 +2501,7 @@ "typeString": "address" }, "typeName": { - "id": 1689, + "id": 1715, "name": "address", "nodeType": "ElementaryTypeName", "src": "1796:7:12", @@ -2518,15 +2518,15 @@ "src": "1739:75:12" }, "returnParameters": { - "id": 1694, + "id": 1720, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1693, + "id": 1719, "name": "eth_bought", "nodeType": "VariableDeclaration", - "scope": 1695, + "scope": 1721, "src": "1833:19:12", "stateVariable": false, "storageLocation": "default", @@ -2535,7 +2535,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1692, + "id": 1718, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1833:7:12", @@ -2550,7 +2550,7 @@ ], "src": "1832:21:12" }, - "scope": 1909, + "scope": 1935, "src": "1707:147:12", "stateMutability": "nonpayable", "superFunction": null, @@ -2559,22 +2559,22 @@ { "body": null, "documentation": null, - "id": 1706, + "id": 1732, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToEthSwapOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1702, + "id": 1728, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1697, + "id": 1723, "name": "eth_bought", "nodeType": "VariableDeclaration", - "scope": 1706, + "scope": 1732, "src": "1889:18:12", "stateVariable": false, "storageLocation": "default", @@ -2583,7 +2583,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1696, + "id": 1722, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1889:7:12", @@ -2597,10 +2597,10 @@ }, { "constant": false, - "id": 1699, + "id": 1725, "name": "max_tokens", "nodeType": "VariableDeclaration", - "scope": 1706, + "scope": 1732, "src": "1909:18:12", "stateVariable": false, "storageLocation": "default", @@ -2609,7 +2609,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1698, + "id": 1724, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1909:7:12", @@ -2623,10 +2623,10 @@ }, { "constant": false, - "id": 1701, + "id": 1727, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1706, + "scope": 1732, "src": "1929:16:12", "stateVariable": false, "storageLocation": "default", @@ -2635,7 +2635,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1700, + "id": 1726, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1929:7:12", @@ -2651,15 +2651,15 @@ "src": "1888:58:12" }, "returnParameters": { - "id": 1705, + "id": 1731, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1704, + "id": 1730, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1706, + "scope": 1732, "src": "1965:20:12", "stateVariable": false, "storageLocation": "default", @@ -2668,7 +2668,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1703, + "id": 1729, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1965:7:12", @@ -2683,7 +2683,7 @@ ], "src": "1964:22:12" }, - "scope": 1909, + "scope": 1935, "src": "1859:128:12", "stateMutability": "nonpayable", "superFunction": null, @@ -2692,22 +2692,22 @@ { "body": null, "documentation": null, - "id": 1719, + "id": 1745, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToEthTransferOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1715, + "id": 1741, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1708, + "id": 1734, "name": "eth_bought", "nodeType": "VariableDeclaration", - "scope": 1719, + "scope": 1745, "src": "2026:18:12", "stateVariable": false, "storageLocation": "default", @@ -2716,7 +2716,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1707, + "id": 1733, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2026:7:12", @@ -2730,10 +2730,10 @@ }, { "constant": false, - "id": 1710, + "id": 1736, "name": "max_tokens", "nodeType": "VariableDeclaration", - "scope": 1719, + "scope": 1745, "src": "2046:18:12", "stateVariable": false, "storageLocation": "default", @@ -2742,7 +2742,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1709, + "id": 1735, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2046:7:12", @@ -2756,10 +2756,10 @@ }, { "constant": false, - "id": 1712, + "id": 1738, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1719, + "scope": 1745, "src": "2066:16:12", "stateVariable": false, "storageLocation": "default", @@ -2768,7 +2768,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1711, + "id": 1737, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2066:7:12", @@ -2782,10 +2782,10 @@ }, { "constant": false, - "id": 1714, + "id": 1740, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1719, + "scope": 1745, "src": "2084:17:12", "stateVariable": false, "storageLocation": "default", @@ -2794,7 +2794,7 @@ "typeString": "address" }, "typeName": { - "id": 1713, + "id": 1739, "name": "address", "nodeType": "ElementaryTypeName", "src": "2084:7:12", @@ -2811,15 +2811,15 @@ "src": "2025:77:12" }, "returnParameters": { - "id": 1718, + "id": 1744, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1717, + "id": 1743, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1719, + "scope": 1745, "src": "2121:20:12", "stateVariable": false, "storageLocation": "default", @@ -2828,7 +2828,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1716, + "id": 1742, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2121:7:12", @@ -2843,7 +2843,7 @@ ], "src": "2120:22:12" }, - "scope": 1909, + "scope": 1935, "src": "1992:151:12", "stateMutability": "nonpayable", "superFunction": null, @@ -2852,22 +2852,22 @@ { "body": null, "documentation": null, - "id": 1734, + "id": 1760, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToTokenSwapInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1730, + "id": 1756, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1721, + "id": 1747, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1734, + "scope": 1760, "src": "2207:19:12", "stateVariable": false, "storageLocation": "default", @@ -2876,7 +2876,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1720, + "id": 1746, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2207:7:12", @@ -2890,10 +2890,10 @@ }, { "constant": false, - "id": 1723, + "id": 1749, "name": "min_tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1734, + "scope": 1760, "src": "2228:25:12", "stateVariable": false, "storageLocation": "default", @@ -2902,7 +2902,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1722, + "id": 1748, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2228:7:12", @@ -2916,10 +2916,10 @@ }, { "constant": false, - "id": 1725, + "id": 1751, "name": "min_eth_bought", "nodeType": "VariableDeclaration", - "scope": 1734, + "scope": 1760, "src": "2255:22:12", "stateVariable": false, "storageLocation": "default", @@ -2928,7 +2928,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1724, + "id": 1750, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2255:7:12", @@ -2942,10 +2942,10 @@ }, { "constant": false, - "id": 1727, + "id": 1753, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1734, + "scope": 1760, "src": "2279:16:12", "stateVariable": false, "storageLocation": "default", @@ -2954,7 +2954,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1726, + "id": 1752, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2279:7:12", @@ -2968,10 +2968,10 @@ }, { "constant": false, - "id": 1729, + "id": 1755, "name": "token_addr", "nodeType": "VariableDeclaration", - "scope": 1734, + "scope": 1760, "src": "2297:18:12", "stateVariable": false, "storageLocation": "default", @@ -2980,7 +2980,7 @@ "typeString": "address" }, "typeName": { - "id": 1728, + "id": 1754, "name": "address", "nodeType": "ElementaryTypeName", "src": "2297:7:12", @@ -2997,15 +2997,15 @@ "src": "2206:110:12" }, "returnParameters": { - "id": 1733, + "id": 1759, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1732, + "id": 1758, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1734, + "scope": 1760, "src": "2335:22:12", "stateVariable": false, "storageLocation": "default", @@ -3014,7 +3014,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1731, + "id": 1757, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2335:7:12", @@ -3029,7 +3029,7 @@ ], "src": "2334:24:12" }, - "scope": 1909, + "scope": 1935, "src": "2176:183:12", "stateMutability": "nonpayable", "superFunction": null, @@ -3038,22 +3038,22 @@ { "body": null, "documentation": null, - "id": 1751, + "id": 1777, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToTokenTransferInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1747, + "id": 1773, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1736, + "id": 1762, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2399:19:12", "stateVariable": false, "storageLocation": "default", @@ -3062,7 +3062,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1735, + "id": 1761, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2399:7:12", @@ -3076,10 +3076,10 @@ }, { "constant": false, - "id": 1738, + "id": 1764, "name": "min_tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2420:25:12", "stateVariable": false, "storageLocation": "default", @@ -3088,7 +3088,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1737, + "id": 1763, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2420:7:12", @@ -3102,10 +3102,10 @@ }, { "constant": false, - "id": 1740, + "id": 1766, "name": "min_eth_bought", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2447:22:12", "stateVariable": false, "storageLocation": "default", @@ -3114,7 +3114,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1739, + "id": 1765, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2447:7:12", @@ -3128,10 +3128,10 @@ }, { "constant": false, - "id": 1742, + "id": 1768, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2471:16:12", "stateVariable": false, "storageLocation": "default", @@ -3140,7 +3140,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1741, + "id": 1767, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2471:7:12", @@ -3154,10 +3154,10 @@ }, { "constant": false, - "id": 1744, + "id": 1770, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2489:17:12", "stateVariable": false, "storageLocation": "default", @@ -3166,7 +3166,7 @@ "typeString": "address" }, "typeName": { - "id": 1743, + "id": 1769, "name": "address", "nodeType": "ElementaryTypeName", "src": "2489:7:12", @@ -3181,10 +3181,10 @@ }, { "constant": false, - "id": 1746, + "id": 1772, "name": "token_addr", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2508:18:12", "stateVariable": false, "storageLocation": "default", @@ -3193,7 +3193,7 @@ "typeString": "address" }, "typeName": { - "id": 1745, + "id": 1771, "name": "address", "nodeType": "ElementaryTypeName", "src": "2508:7:12", @@ -3210,15 +3210,15 @@ "src": "2398:129:12" }, "returnParameters": { - "id": 1750, + "id": 1776, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1749, + "id": 1775, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2546:22:12", "stateVariable": false, "storageLocation": "default", @@ -3227,7 +3227,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1748, + "id": 1774, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2546:7:12", @@ -3242,7 +3242,7 @@ ], "src": "2545:24:12" }, - "scope": 1909, + "scope": 1935, "src": "2364:206:12", "stateMutability": "nonpayable", "superFunction": null, @@ -3251,22 +3251,22 @@ { "body": null, "documentation": null, - "id": 1766, + "id": 1792, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToTokenSwapOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1762, + "id": 1788, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1753, + "id": 1779, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1766, + "scope": 1792, "src": "2607:21:12", "stateVariable": false, "storageLocation": "default", @@ -3275,7 +3275,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1752, + "id": 1778, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2607:7:12", @@ -3289,10 +3289,10 @@ }, { "constant": false, - "id": 1755, + "id": 1781, "name": "max_tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1766, + "scope": 1792, "src": "2630:23:12", "stateVariable": false, "storageLocation": "default", @@ -3301,7 +3301,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1754, + "id": 1780, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2630:7:12", @@ -3315,10 +3315,10 @@ }, { "constant": false, - "id": 1757, + "id": 1783, "name": "max_eth_sold", "nodeType": "VariableDeclaration", - "scope": 1766, + "scope": 1792, "src": "2655:20:12", "stateVariable": false, "storageLocation": "default", @@ -3327,7 +3327,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1756, + "id": 1782, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2655:7:12", @@ -3341,10 +3341,10 @@ }, { "constant": false, - "id": 1759, + "id": 1785, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1766, + "scope": 1792, "src": "2677:16:12", "stateVariable": false, "storageLocation": "default", @@ -3353,7 +3353,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1758, + "id": 1784, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2677:7:12", @@ -3367,10 +3367,10 @@ }, { "constant": false, - "id": 1761, + "id": 1787, "name": "token_addr", "nodeType": "VariableDeclaration", - "scope": 1766, + "scope": 1792, "src": "2695:18:12", "stateVariable": false, "storageLocation": "default", @@ -3379,7 +3379,7 @@ "typeString": "address" }, "typeName": { - "id": 1760, + "id": 1786, "name": "address", "nodeType": "ElementaryTypeName", "src": "2695:7:12", @@ -3396,15 +3396,15 @@ "src": "2606:108:12" }, "returnParameters": { - "id": 1765, + "id": 1791, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1764, + "id": 1790, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1766, + "scope": 1792, "src": "2733:20:12", "stateVariable": false, "storageLocation": "default", @@ -3413,7 +3413,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1763, + "id": 1789, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2733:7:12", @@ -3428,7 +3428,7 @@ ], "src": "2732:22:12" }, - "scope": 1909, + "scope": 1935, "src": "2575:180:12", "stateMutability": "nonpayable", "superFunction": null, @@ -3437,22 +3437,22 @@ { "body": null, "documentation": null, - "id": 1783, + "id": 1809, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToTokenTransferOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1779, + "id": 1805, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1768, + "id": 1794, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2796:21:12", "stateVariable": false, "storageLocation": "default", @@ -3461,7 +3461,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1767, + "id": 1793, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2796:7:12", @@ -3475,10 +3475,10 @@ }, { "constant": false, - "id": 1770, + "id": 1796, "name": "max_tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2819:23:12", "stateVariable": false, "storageLocation": "default", @@ -3487,7 +3487,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1769, + "id": 1795, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2819:7:12", @@ -3501,10 +3501,10 @@ }, { "constant": false, - "id": 1772, + "id": 1798, "name": "max_eth_sold", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2844:20:12", "stateVariable": false, "storageLocation": "default", @@ -3513,7 +3513,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1771, + "id": 1797, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2844:7:12", @@ -3527,10 +3527,10 @@ }, { "constant": false, - "id": 1774, + "id": 1800, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2866:16:12", "stateVariable": false, "storageLocation": "default", @@ -3539,7 +3539,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1773, + "id": 1799, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2866:7:12", @@ -3553,10 +3553,10 @@ }, { "constant": false, - "id": 1776, + "id": 1802, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2884:17:12", "stateVariable": false, "storageLocation": "default", @@ -3565,7 +3565,7 @@ "typeString": "address" }, "typeName": { - "id": 1775, + "id": 1801, "name": "address", "nodeType": "ElementaryTypeName", "src": "2884:7:12", @@ -3580,10 +3580,10 @@ }, { "constant": false, - "id": 1778, + "id": 1804, "name": "token_addr", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2903:18:12", "stateVariable": false, "storageLocation": "default", @@ -3592,7 +3592,7 @@ "typeString": "address" }, "typeName": { - "id": 1777, + "id": 1803, "name": "address", "nodeType": "ElementaryTypeName", "src": "2903:7:12", @@ -3609,15 +3609,15 @@ "src": "2795:127:12" }, "returnParameters": { - "id": 1782, + "id": 1808, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1781, + "id": 1807, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2941:20:12", "stateVariable": false, "storageLocation": "default", @@ -3626,7 +3626,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1780, + "id": 1806, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2941:7:12", @@ -3641,7 +3641,7 @@ ], "src": "2940:22:12" }, - "scope": 1909, + "scope": 1935, "src": "2760:203:12", "stateMutability": "nonpayable", "superFunction": null, @@ -3650,22 +3650,22 @@ { "body": null, "documentation": null, - "id": 1798, + "id": 1824, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToExchangeSwapInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1794, + "id": 1820, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1785, + "id": 1811, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1798, + "scope": 1824, "src": "3036:19:12", "stateVariable": false, "storageLocation": "default", @@ -3674,7 +3674,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1784, + "id": 1810, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3036:7:12", @@ -3688,10 +3688,10 @@ }, { "constant": false, - "id": 1787, + "id": 1813, "name": "min_tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1798, + "scope": 1824, "src": "3057:25:12", "stateVariable": false, "storageLocation": "default", @@ -3700,7 +3700,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1786, + "id": 1812, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3057:7:12", @@ -3714,10 +3714,10 @@ }, { "constant": false, - "id": 1789, + "id": 1815, "name": "min_eth_bought", "nodeType": "VariableDeclaration", - "scope": 1798, + "scope": 1824, "src": "3084:22:12", "stateVariable": false, "storageLocation": "default", @@ -3726,7 +3726,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1788, + "id": 1814, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3084:7:12", @@ -3740,10 +3740,10 @@ }, { "constant": false, - "id": 1791, + "id": 1817, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1798, + "scope": 1824, "src": "3108:16:12", "stateVariable": false, "storageLocation": "default", @@ -3752,7 +3752,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1790, + "id": 1816, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3108:7:12", @@ -3766,10 +3766,10 @@ }, { "constant": false, - "id": 1793, + "id": 1819, "name": "exchange_addr", "nodeType": "VariableDeclaration", - "scope": 1798, + "scope": 1824, "src": "3126:21:12", "stateVariable": false, "storageLocation": "default", @@ -3778,7 +3778,7 @@ "typeString": "address" }, "typeName": { - "id": 1792, + "id": 1818, "name": "address", "nodeType": "ElementaryTypeName", "src": "3126:7:12", @@ -3795,15 +3795,15 @@ "src": "3035:113:12" }, "returnParameters": { - "id": 1797, + "id": 1823, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1796, + "id": 1822, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1798, + "scope": 1824, "src": "3167:22:12", "stateVariable": false, "storageLocation": "default", @@ -3812,7 +3812,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1795, + "id": 1821, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3167:7:12", @@ -3827,7 +3827,7 @@ ], "src": "3166:24:12" }, - "scope": 1909, + "scope": 1935, "src": "3002:189:12", "stateMutability": "nonpayable", "superFunction": null, @@ -3836,22 +3836,22 @@ { "body": null, "documentation": null, - "id": 1815, + "id": 1841, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToExchangeTransferInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1811, + "id": 1837, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1800, + "id": 1826, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3234:19:12", "stateVariable": false, "storageLocation": "default", @@ -3860,7 +3860,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1799, + "id": 1825, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3234:7:12", @@ -3874,10 +3874,10 @@ }, { "constant": false, - "id": 1802, + "id": 1828, "name": "min_tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3255:25:12", "stateVariable": false, "storageLocation": "default", @@ -3886,7 +3886,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1801, + "id": 1827, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3255:7:12", @@ -3900,10 +3900,10 @@ }, { "constant": false, - "id": 1804, + "id": 1830, "name": "min_eth_bought", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3282:22:12", "stateVariable": false, "storageLocation": "default", @@ -3912,7 +3912,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1803, + "id": 1829, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3282:7:12", @@ -3926,10 +3926,10 @@ }, { "constant": false, - "id": 1806, + "id": 1832, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3306:16:12", "stateVariable": false, "storageLocation": "default", @@ -3938,7 +3938,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1805, + "id": 1831, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3306:7:12", @@ -3952,10 +3952,10 @@ }, { "constant": false, - "id": 1808, + "id": 1834, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3324:17:12", "stateVariable": false, "storageLocation": "default", @@ -3964,7 +3964,7 @@ "typeString": "address" }, "typeName": { - "id": 1807, + "id": 1833, "name": "address", "nodeType": "ElementaryTypeName", "src": "3324:7:12", @@ -3979,10 +3979,10 @@ }, { "constant": false, - "id": 1810, + "id": 1836, "name": "exchange_addr", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3343:21:12", "stateVariable": false, "storageLocation": "default", @@ -3991,7 +3991,7 @@ "typeString": "address" }, "typeName": { - "id": 1809, + "id": 1835, "name": "address", "nodeType": "ElementaryTypeName", "src": "3343:7:12", @@ -4008,15 +4008,15 @@ "src": "3233:132:12" }, "returnParameters": { - "id": 1814, + "id": 1840, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1813, + "id": 1839, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3384:22:12", "stateVariable": false, "storageLocation": "default", @@ -4025,7 +4025,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1812, + "id": 1838, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3384:7:12", @@ -4040,7 +4040,7 @@ ], "src": "3383:24:12" }, - "scope": 1909, + "scope": 1935, "src": "3196:212:12", "stateMutability": "nonpayable", "superFunction": null, @@ -4049,22 +4049,22 @@ { "body": null, "documentation": null, - "id": 1830, + "id": 1856, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToExchangeSwapOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1826, + "id": 1852, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1817, + "id": 1843, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1830, + "scope": 1856, "src": "3448:21:12", "stateVariable": false, "storageLocation": "default", @@ -4073,7 +4073,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1816, + "id": 1842, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3448:7:12", @@ -4087,10 +4087,10 @@ }, { "constant": false, - "id": 1819, + "id": 1845, "name": "max_tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1830, + "scope": 1856, "src": "3471:23:12", "stateVariable": false, "storageLocation": "default", @@ -4099,7 +4099,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1818, + "id": 1844, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3471:7:12", @@ -4113,10 +4113,10 @@ }, { "constant": false, - "id": 1821, + "id": 1847, "name": "max_eth_sold", "nodeType": "VariableDeclaration", - "scope": 1830, + "scope": 1856, "src": "3496:20:12", "stateVariable": false, "storageLocation": "default", @@ -4125,7 +4125,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1820, + "id": 1846, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3496:7:12", @@ -4139,10 +4139,10 @@ }, { "constant": false, - "id": 1823, + "id": 1849, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1830, + "scope": 1856, "src": "3518:16:12", "stateVariable": false, "storageLocation": "default", @@ -4151,7 +4151,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1822, + "id": 1848, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3518:7:12", @@ -4165,10 +4165,10 @@ }, { "constant": false, - "id": 1825, + "id": 1851, "name": "exchange_addr", "nodeType": "VariableDeclaration", - "scope": 1830, + "scope": 1856, "src": "3536:21:12", "stateVariable": false, "storageLocation": "default", @@ -4177,7 +4177,7 @@ "typeString": "address" }, "typeName": { - "id": 1824, + "id": 1850, "name": "address", "nodeType": "ElementaryTypeName", "src": "3536:7:12", @@ -4194,15 +4194,15 @@ "src": "3447:111:12" }, "returnParameters": { - "id": 1829, + "id": 1855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1828, + "id": 1854, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1830, + "scope": 1856, "src": "3577:20:12", "stateVariable": false, "storageLocation": "default", @@ -4211,7 +4211,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1827, + "id": 1853, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3577:7:12", @@ -4226,7 +4226,7 @@ ], "src": "3576:22:12" }, - "scope": 1909, + "scope": 1935, "src": "3413:186:12", "stateMutability": "nonpayable", "superFunction": null, @@ -4235,22 +4235,22 @@ { "body": null, "documentation": null, - "id": 1847, + "id": 1873, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToExchangeTransferOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1843, + "id": 1869, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1832, + "id": 1858, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3643:21:12", "stateVariable": false, "storageLocation": "default", @@ -4259,7 +4259,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1831, + "id": 1857, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3643:7:12", @@ -4273,10 +4273,10 @@ }, { "constant": false, - "id": 1834, + "id": 1860, "name": "max_tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3666:23:12", "stateVariable": false, "storageLocation": "default", @@ -4285,7 +4285,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1833, + "id": 1859, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3666:7:12", @@ -4299,10 +4299,10 @@ }, { "constant": false, - "id": 1836, + "id": 1862, "name": "max_eth_sold", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3691:20:12", "stateVariable": false, "storageLocation": "default", @@ -4311,7 +4311,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1835, + "id": 1861, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3691:7:12", @@ -4325,10 +4325,10 @@ }, { "constant": false, - "id": 1838, + "id": 1864, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3713:16:12", "stateVariable": false, "storageLocation": "default", @@ -4337,7 +4337,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1837, + "id": 1863, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3713:7:12", @@ -4351,10 +4351,10 @@ }, { "constant": false, - "id": 1840, + "id": 1866, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3731:17:12", "stateVariable": false, "storageLocation": "default", @@ -4363,7 +4363,7 @@ "typeString": "address" }, "typeName": { - "id": 1839, + "id": 1865, "name": "address", "nodeType": "ElementaryTypeName", "src": "3731:7:12", @@ -4378,10 +4378,10 @@ }, { "constant": false, - "id": 1842, + "id": 1868, "name": "exchange_addr", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3750:21:12", "stateVariable": false, "storageLocation": "default", @@ -4390,7 +4390,7 @@ "typeString": "address" }, "typeName": { - "id": 1841, + "id": 1867, "name": "address", "nodeType": "ElementaryTypeName", "src": "3750:7:12", @@ -4407,15 +4407,15 @@ "src": "3642:130:12" }, "returnParameters": { - "id": 1846, + "id": 1872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1845, + "id": 1871, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3791:20:12", "stateVariable": false, "storageLocation": "default", @@ -4424,7 +4424,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1844, + "id": 1870, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3791:7:12", @@ -4439,7 +4439,7 @@ ], "src": "3790:22:12" }, - "scope": 1909, + "scope": 1935, "src": "3604:209:12", "stateMutability": "nonpayable", "superFunction": null, @@ -4447,10 +4447,10 @@ }, { "constant": false, - "id": 1849, + "id": 1875, "name": "name", "nodeType": "VariableDeclaration", - "scope": 1909, + "scope": 1935, "src": "3866:19:12", "stateVariable": true, "storageLocation": "default", @@ -4459,7 +4459,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 1848, + "id": 1874, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "3866:7:12", @@ -4473,10 +4473,10 @@ }, { "constant": false, - "id": 1851, + "id": 1877, "name": "symbol", "nodeType": "VariableDeclaration", - "scope": 1909, + "scope": 1935, "src": "3891:21:12", "stateVariable": true, "storageLocation": "default", @@ -4485,7 +4485,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 1850, + "id": 1876, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "3891:7:12", @@ -4499,10 +4499,10 @@ }, { "constant": false, - "id": 1853, + "id": 1879, "name": "decimals", "nodeType": "VariableDeclaration", - "scope": 1909, + "scope": 1935, "src": "3918:23:12", "stateVariable": true, "storageLocation": "default", @@ -4511,7 +4511,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1852, + "id": 1878, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3918:7:12", @@ -4526,22 +4526,22 @@ { "body": null, "documentation": null, - "id": 1862, + "id": 1888, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 1858, + "id": 1884, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1855, + "id": 1881, "name": "_to", "nodeType": "VariableDeclaration", - "scope": 1862, + "scope": 1888, "src": "3965:11:12", "stateVariable": false, "storageLocation": "default", @@ -4550,7 +4550,7 @@ "typeString": "address" }, "typeName": { - "id": 1854, + "id": 1880, "name": "address", "nodeType": "ElementaryTypeName", "src": "3965:7:12", @@ -4565,10 +4565,10 @@ }, { "constant": false, - "id": 1857, + "id": 1883, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 1862, + "scope": 1888, "src": "3978:14:12", "stateVariable": false, "storageLocation": "default", @@ -4577,7 +4577,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1856, + "id": 1882, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3978:7:12", @@ -4593,15 +4593,15 @@ "src": "3964:29:12" }, "returnParameters": { - "id": 1861, + "id": 1887, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1860, + "id": 1886, "name": "", "nodeType": "VariableDeclaration", - "scope": 1862, + "scope": 1888, "src": "4012:4:12", "stateVariable": false, "storageLocation": "default", @@ -4610,7 +4610,7 @@ "typeString": "bool" }, "typeName": { - "id": 1859, + "id": 1885, "name": "bool", "nodeType": "ElementaryTypeName", "src": "4012:4:12", @@ -4625,7 +4625,7 @@ ], "src": "4011:6:12" }, - "scope": 1909, + "scope": 1935, "src": "3947:71:12", "stateMutability": "nonpayable", "superFunction": null, @@ -4634,22 +4634,22 @@ { "body": null, "documentation": null, - "id": 1873, + "id": 1899, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 1869, + "id": 1895, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1864, + "id": 1890, "name": "_from", "nodeType": "VariableDeclaration", - "scope": 1873, + "scope": 1899, "src": "4045:13:12", "stateVariable": false, "storageLocation": "default", @@ -4658,7 +4658,7 @@ "typeString": "address" }, "typeName": { - "id": 1863, + "id": 1889, "name": "address", "nodeType": "ElementaryTypeName", "src": "4045:7:12", @@ -4673,10 +4673,10 @@ }, { "constant": false, - "id": 1866, + "id": 1892, "name": "_to", "nodeType": "VariableDeclaration", - "scope": 1873, + "scope": 1899, "src": "4060:11:12", "stateVariable": false, "storageLocation": "default", @@ -4685,7 +4685,7 @@ "typeString": "address" }, "typeName": { - "id": 1865, + "id": 1891, "name": "address", "nodeType": "ElementaryTypeName", "src": "4060:7:12", @@ -4700,10 +4700,10 @@ }, { "constant": false, - "id": 1868, + "id": 1894, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1873, + "scope": 1899, "src": "4073:13:12", "stateVariable": false, "storageLocation": "default", @@ -4712,7 +4712,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1867, + "id": 1893, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4073:7:12", @@ -4728,15 +4728,15 @@ "src": "4044:43:12" }, "returnParameters": { - "id": 1872, + "id": 1898, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1871, + "id": 1897, "name": "", "nodeType": "VariableDeclaration", - "scope": 1873, + "scope": 1899, "src": "4106:4:12", "stateVariable": false, "storageLocation": "default", @@ -4745,7 +4745,7 @@ "typeString": "bool" }, "typeName": { - "id": 1870, + "id": 1896, "name": "bool", "nodeType": "ElementaryTypeName", "src": "4106:4:12", @@ -4760,7 +4760,7 @@ ], "src": "4105:6:12" }, - "scope": 1909, + "scope": 1935, "src": "4023:89:12", "stateMutability": "nonpayable", "superFunction": null, @@ -4769,22 +4769,22 @@ { "body": null, "documentation": null, - "id": 1882, + "id": 1908, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 1878, + "id": 1904, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1875, + "id": 1901, "name": "_spender", "nodeType": "VariableDeclaration", - "scope": 1882, + "scope": 1908, "src": "4134:16:12", "stateVariable": false, "storageLocation": "default", @@ -4793,7 +4793,7 @@ "typeString": "address" }, "typeName": { - "id": 1874, + "id": 1900, "name": "address", "nodeType": "ElementaryTypeName", "src": "4134:7:12", @@ -4808,10 +4808,10 @@ }, { "constant": false, - "id": 1877, + "id": 1903, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 1882, + "scope": 1908, "src": "4152:14:12", "stateVariable": false, "storageLocation": "default", @@ -4820,7 +4820,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1876, + "id": 1902, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4152:7:12", @@ -4836,15 +4836,15 @@ "src": "4133:34:12" }, "returnParameters": { - "id": 1881, + "id": 1907, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1880, + "id": 1906, "name": "", "nodeType": "VariableDeclaration", - "scope": 1882, + "scope": 1908, "src": "4186:4:12", "stateVariable": false, "storageLocation": "default", @@ -4853,7 +4853,7 @@ "typeString": "bool" }, "typeName": { - "id": 1879, + "id": 1905, "name": "bool", "nodeType": "ElementaryTypeName", "src": "4186:4:12", @@ -4868,7 +4868,7 @@ ], "src": "4185:6:12" }, - "scope": 1909, + "scope": 1935, "src": "4117:75:12", "stateMutability": "nonpayable", "superFunction": null, @@ -4877,22 +4877,22 @@ { "body": null, "documentation": null, - "id": 1891, + "id": 1917, "implemented": false, "kind": "function", "modifiers": [], "name": "allowance", "nodeType": "FunctionDefinition", "parameters": { - "id": 1887, + "id": 1913, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1884, + "id": 1910, "name": "_owner", "nodeType": "VariableDeclaration", - "scope": 1891, + "scope": 1917, "src": "4216:14:12", "stateVariable": false, "storageLocation": "default", @@ -4901,7 +4901,7 @@ "typeString": "address" }, "typeName": { - "id": 1883, + "id": 1909, "name": "address", "nodeType": "ElementaryTypeName", "src": "4216:7:12", @@ -4916,10 +4916,10 @@ }, { "constant": false, - "id": 1886, + "id": 1912, "name": "_spender", "nodeType": "VariableDeclaration", - "scope": 1891, + "scope": 1917, "src": "4232:16:12", "stateVariable": false, "storageLocation": "default", @@ -4928,7 +4928,7 @@ "typeString": "address" }, "typeName": { - "id": 1885, + "id": 1911, "name": "address", "nodeType": "ElementaryTypeName", "src": "4232:7:12", @@ -4945,15 +4945,15 @@ "src": "4215:34:12" }, "returnParameters": { - "id": 1890, + "id": 1916, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1889, + "id": 1915, "name": "", "nodeType": "VariableDeclaration", - "scope": 1891, + "scope": 1917, "src": "4273:7:12", "stateVariable": false, "storageLocation": "default", @@ -4962,7 +4962,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1888, + "id": 1914, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4273:7:12", @@ -4977,7 +4977,7 @@ ], "src": "4272:9:12" }, - "scope": 1909, + "scope": 1935, "src": "4197:85:12", "stateMutability": "view", "superFunction": null, @@ -4986,22 +4986,22 @@ { "body": null, "documentation": null, - "id": 1898, + "id": 1924, "implemented": false, "kind": "function", "modifiers": [], "name": "balanceOf", "nodeType": "FunctionDefinition", "parameters": { - "id": 1894, + "id": 1920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1893, + "id": 1919, "name": "_owner", "nodeType": "VariableDeclaration", - "scope": 1898, + "scope": 1924, "src": "4306:14:12", "stateVariable": false, "storageLocation": "default", @@ -5010,7 +5010,7 @@ "typeString": "address" }, "typeName": { - "id": 1892, + "id": 1918, "name": "address", "nodeType": "ElementaryTypeName", "src": "4306:7:12", @@ -5027,15 +5027,15 @@ "src": "4305:16:12" }, "returnParameters": { - "id": 1897, + "id": 1923, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1896, + "id": 1922, "name": "", "nodeType": "VariableDeclaration", - "scope": 1898, + "scope": 1924, "src": "4345:7:12", "stateVariable": false, "storageLocation": "default", @@ -5044,7 +5044,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1895, + "id": 1921, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4345:7:12", @@ -5059,7 +5059,7 @@ ], "src": "4344:9:12" }, - "scope": 1909, + "scope": 1935, "src": "4287:67:12", "stateMutability": "view", "superFunction": null, @@ -5068,28 +5068,28 @@ { "body": null, "documentation": null, - "id": 1903, + "id": 1929, "implemented": false, "kind": "function", "modifiers": [], "name": "totalSupply", "nodeType": "FunctionDefinition", "parameters": { - "id": 1899, + "id": 1925, "nodeType": "ParameterList", "parameters": [], "src": "4379:2:12" }, "returnParameters": { - "id": 1902, + "id": 1928, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1901, + "id": 1927, "name": "", "nodeType": "VariableDeclaration", - "scope": 1903, + "scope": 1929, "src": "4405:7:12", "stateVariable": false, "storageLocation": "default", @@ -5098,7 +5098,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1900, + "id": 1926, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4405:7:12", @@ -5113,7 +5113,7 @@ ], "src": "4404:9:12" }, - "scope": 1909, + "scope": 1935, "src": "4359:55:12", "stateMutability": "view", "superFunction": null, @@ -5122,22 +5122,22 @@ { "body": null, "documentation": null, - "id": 1908, + "id": 1934, "implemented": false, "kind": "function", "modifiers": [], "name": "setup", "nodeType": "FunctionDefinition", "parameters": { - "id": 1906, + "id": 1932, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1905, + "id": 1931, "name": "token_addr", "nodeType": "VariableDeclaration", - "scope": 1908, + "scope": 1934, "src": "4451:18:12", "stateVariable": false, "storageLocation": "default", @@ -5146,7 +5146,7 @@ "typeString": "address" }, "typeName": { - "id": 1904, + "id": 1930, "name": "address", "nodeType": "ElementaryTypeName", "src": "4451:7:12", @@ -5163,19 +5163,19 @@ "src": "4450:20:12" }, "returnParameters": { - "id": 1907, + "id": 1933, "nodeType": "ParameterList", "parameters": [], "src": "4479:0:12" }, - "scope": 1909, + "scope": 1935, "src": "4436:44:12", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 1910, + "scope": 1936, "src": "25:4457:12" } ], @@ -5185,14 +5185,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol", "exportedSymbols": { "IUniswapExchange": [ - 1909 + 1935 ] }, - "id": 1910, + "id": 1936, "nodeType": "SourceUnit", "nodes": [ { - "id": 1567, + "id": 1593, "literals": [ "solidity", "0.5", @@ -5207,9 +5207,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1909, + "id": 1935, "linearizedBaseContracts": [ - 1909 + 1935 ], "name": "IUniswapExchange", "nodeType": "ContractDefinition", @@ -5217,28 +5217,28 @@ { "body": null, "documentation": null, - "id": 1572, + "id": 1598, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenAddress", "nodeType": "FunctionDefinition", "parameters": { - "id": 1568, + "id": 1594, "nodeType": "ParameterList", "parameters": [], "src": "130:2:12" }, "returnParameters": { - "id": 1571, + "id": 1597, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1570, + "id": 1596, "name": "token", "nodeType": "VariableDeclaration", - "scope": 1572, + "scope": 1598, "src": "156:13:12", "stateVariable": false, "storageLocation": "default", @@ -5247,7 +5247,7 @@ "typeString": "address" }, "typeName": { - "id": 1569, + "id": 1595, "name": "address", "nodeType": "ElementaryTypeName", "src": "156:7:12", @@ -5263,7 +5263,7 @@ ], "src": "155:15:12" }, - "scope": 1909, + "scope": 1935, "src": "109:62:12", "stateMutability": "view", "superFunction": null, @@ -5272,28 +5272,28 @@ { "body": null, "documentation": null, - "id": 1577, + "id": 1603, "implemented": false, "kind": "function", "modifiers": [], "name": "factoryAddress", "nodeType": "FunctionDefinition", "parameters": { - "id": 1573, + "id": 1599, "nodeType": "ParameterList", "parameters": [], "src": "233:2:12" }, "returnParameters": { - "id": 1576, + "id": 1602, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1575, + "id": 1601, "name": "factory", "nodeType": "VariableDeclaration", - "scope": 1577, + "scope": 1603, "src": "259:15:12", "stateVariable": false, "storageLocation": "default", @@ -5302,7 +5302,7 @@ "typeString": "address" }, "typeName": { - "id": 1574, + "id": 1600, "name": "address", "nodeType": "ElementaryTypeName", "src": "259:7:12", @@ -5318,7 +5318,7 @@ ], "src": "258:17:12" }, - "scope": 1909, + "scope": 1935, "src": "210:66:12", "stateMutability": "view", "superFunction": null, @@ -5327,22 +5327,22 @@ { "body": null, "documentation": null, - "id": 1588, + "id": 1614, "implemented": false, "kind": "function", "modifiers": [], "name": "addLiquidity", "nodeType": "FunctionDefinition", "parameters": { - "id": 1584, + "id": 1610, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1579, + "id": 1605, "name": "min_liquidity", "nodeType": "VariableDeclaration", - "scope": 1588, + "scope": 1614, "src": "328:21:12", "stateVariable": false, "storageLocation": "default", @@ -5351,7 +5351,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1578, + "id": 1604, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "328:7:12", @@ -5365,10 +5365,10 @@ }, { "constant": false, - "id": 1581, + "id": 1607, "name": "max_tokens", "nodeType": "VariableDeclaration", - "scope": 1588, + "scope": 1614, "src": "351:18:12", "stateVariable": false, "storageLocation": "default", @@ -5377,7 +5377,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1580, + "id": 1606, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "351:7:12", @@ -5391,10 +5391,10 @@ }, { "constant": false, - "id": 1583, + "id": 1609, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1588, + "scope": 1614, "src": "371:16:12", "stateVariable": false, "storageLocation": "default", @@ -5403,7 +5403,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1582, + "id": 1608, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "371:7:12", @@ -5419,15 +5419,15 @@ "src": "327:61:12" }, "returnParameters": { - "id": 1587, + "id": 1613, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1586, + "id": 1612, "name": "", "nodeType": "VariableDeclaration", - "scope": 1588, + "scope": 1614, "src": "415:7:12", "stateVariable": false, "storageLocation": "default", @@ -5436,7 +5436,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1585, + "id": 1611, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "415:7:12", @@ -5451,7 +5451,7 @@ ], "src": "414:9:12" }, - "scope": 1909, + "scope": 1935, "src": "306:118:12", "stateMutability": "payable", "superFunction": null, @@ -5460,22 +5460,22 @@ { "body": null, "documentation": null, - "id": 1603, + "id": 1629, "implemented": false, "kind": "function", "modifiers": [], "name": "removeLiquidity", "nodeType": "FunctionDefinition", "parameters": { - "id": 1597, + "id": 1623, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1590, + "id": 1616, "name": "amount", "nodeType": "VariableDeclaration", - "scope": 1603, + "scope": 1629, "src": "454:14:12", "stateVariable": false, "storageLocation": "default", @@ -5484,7 +5484,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1589, + "id": 1615, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "454:7:12", @@ -5498,10 +5498,10 @@ }, { "constant": false, - "id": 1592, + "id": 1618, "name": "min_eth", "nodeType": "VariableDeclaration", - "scope": 1603, + "scope": 1629, "src": "470:15:12", "stateVariable": false, "storageLocation": "default", @@ -5510,7 +5510,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1591, + "id": 1617, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "470:7:12", @@ -5524,10 +5524,10 @@ }, { "constant": false, - "id": 1594, + "id": 1620, "name": "min_tokens", "nodeType": "VariableDeclaration", - "scope": 1603, + "scope": 1629, "src": "487:18:12", "stateVariable": false, "storageLocation": "default", @@ -5536,7 +5536,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1593, + "id": 1619, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "487:7:12", @@ -5550,10 +5550,10 @@ }, { "constant": false, - "id": 1596, + "id": 1622, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1603, + "scope": 1629, "src": "507:16:12", "stateVariable": false, "storageLocation": "default", @@ -5562,7 +5562,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1595, + "id": 1621, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "507:7:12", @@ -5578,15 +5578,15 @@ "src": "453:71:12" }, "returnParameters": { - "id": 1602, + "id": 1628, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1599, + "id": 1625, "name": "", "nodeType": "VariableDeclaration", - "scope": 1603, + "scope": 1629, "src": "543:7:12", "stateVariable": false, "storageLocation": "default", @@ -5595,7 +5595,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1598, + "id": 1624, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "543:7:12", @@ -5609,10 +5609,10 @@ }, { "constant": false, - "id": 1601, + "id": 1627, "name": "", "nodeType": "VariableDeclaration", - "scope": 1603, + "scope": 1629, "src": "552:7:12", "stateVariable": false, "storageLocation": "default", @@ -5621,7 +5621,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1600, + "id": 1626, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "552:7:12", @@ -5636,7 +5636,7 @@ ], "src": "542:18:12" }, - "scope": 1909, + "scope": 1935, "src": "429:132:12", "stateMutability": "nonpayable", "superFunction": null, @@ -5645,22 +5645,22 @@ { "body": null, "documentation": null, - "id": 1610, + "id": 1636, "implemented": false, "kind": "function", "modifiers": [], "name": "getEthToTokenInputPrice", "nodeType": "FunctionDefinition", "parameters": { - "id": 1606, + "id": 1632, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1605, + "id": 1631, "name": "eth_sold", "nodeType": "VariableDeclaration", - "scope": 1610, + "scope": 1636, "src": "617:16:12", "stateVariable": false, "storageLocation": "default", @@ -5669,7 +5669,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1604, + "id": 1630, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "617:7:12", @@ -5685,15 +5685,15 @@ "src": "616:18:12" }, "returnParameters": { - "id": 1609, + "id": 1635, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1608, + "id": 1634, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1610, + "scope": 1636, "src": "658:21:12", "stateVariable": false, "storageLocation": "default", @@ -5702,7 +5702,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1607, + "id": 1633, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "658:7:12", @@ -5717,7 +5717,7 @@ ], "src": "657:23:12" }, - "scope": 1909, + "scope": 1935, "src": "584:97:12", "stateMutability": "view", "superFunction": null, @@ -5726,22 +5726,22 @@ { "body": null, "documentation": null, - "id": 1617, + "id": 1643, "implemented": false, "kind": "function", "modifiers": [], "name": "getEthToTokenOutputPrice", "nodeType": "FunctionDefinition", "parameters": { - "id": 1613, + "id": 1639, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1612, + "id": 1638, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1617, + "scope": 1643, "src": "720:21:12", "stateVariable": false, "storageLocation": "default", @@ -5750,7 +5750,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1611, + "id": 1637, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "720:7:12", @@ -5766,15 +5766,15 @@ "src": "719:23:12" }, "returnParameters": { - "id": 1616, + "id": 1642, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1615, + "id": 1641, "name": "eth_sold", "nodeType": "VariableDeclaration", - "scope": 1617, + "scope": 1643, "src": "766:16:12", "stateVariable": false, "storageLocation": "default", @@ -5783,7 +5783,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1614, + "id": 1640, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "766:7:12", @@ -5798,7 +5798,7 @@ ], "src": "765:18:12" }, - "scope": 1909, + "scope": 1935, "src": "686:98:12", "stateMutability": "view", "superFunction": null, @@ -5807,22 +5807,22 @@ { "body": null, "documentation": null, - "id": 1624, + "id": 1650, "implemented": false, "kind": "function", "modifiers": [], "name": "getTokenToEthInputPrice", "nodeType": "FunctionDefinition", "parameters": { - "id": 1620, + "id": 1646, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1619, + "id": 1645, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1624, + "scope": 1650, "src": "822:19:12", "stateVariable": false, "storageLocation": "default", @@ -5831,7 +5831,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1618, + "id": 1644, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "822:7:12", @@ -5847,15 +5847,15 @@ "src": "821:21:12" }, "returnParameters": { - "id": 1623, + "id": 1649, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1622, + "id": 1648, "name": "eth_bought", "nodeType": "VariableDeclaration", - "scope": 1624, + "scope": 1650, "src": "866:18:12", "stateVariable": false, "storageLocation": "default", @@ -5864,7 +5864,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1621, + "id": 1647, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "866:7:12", @@ -5879,7 +5879,7 @@ ], "src": "865:20:12" }, - "scope": 1909, + "scope": 1935, "src": "789:97:12", "stateMutability": "view", "superFunction": null, @@ -5888,22 +5888,22 @@ { "body": null, "documentation": null, - "id": 1631, + "id": 1657, "implemented": false, "kind": "function", "modifiers": [], "name": "getTokenToEthOutputPrice", "nodeType": "FunctionDefinition", "parameters": { - "id": 1627, + "id": 1653, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1626, + "id": 1652, "name": "eth_bought", "nodeType": "VariableDeclaration", - "scope": 1631, + "scope": 1657, "src": "925:18:12", "stateVariable": false, "storageLocation": "default", @@ -5912,7 +5912,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1625, + "id": 1651, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "925:7:12", @@ -5928,15 +5928,15 @@ "src": "924:20:12" }, "returnParameters": { - "id": 1630, + "id": 1656, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1629, + "id": 1655, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1631, + "scope": 1657, "src": "968:19:12", "stateVariable": false, "storageLocation": "default", @@ -5945,7 +5945,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1628, + "id": 1654, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "968:7:12", @@ -5960,7 +5960,7 @@ ], "src": "967:21:12" }, - "scope": 1909, + "scope": 1935, "src": "891:98:12", "stateMutability": "view", "superFunction": null, @@ -5969,22 +5969,22 @@ { "body": null, "documentation": null, - "id": 1640, + "id": 1666, "implemented": false, "kind": "function", "modifiers": [], "name": "ethToTokenSwapInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1636, + "id": 1662, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1633, + "id": 1659, "name": "min_tokens", "nodeType": "VariableDeclaration", - "scope": 1640, + "scope": 1666, "src": "1049:18:12", "stateVariable": false, "storageLocation": "default", @@ -5993,7 +5993,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1632, + "id": 1658, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1049:7:12", @@ -6007,10 +6007,10 @@ }, { "constant": false, - "id": 1635, + "id": 1661, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1640, + "scope": 1666, "src": "1069:16:12", "stateVariable": false, "storageLocation": "default", @@ -6019,7 +6019,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1634, + "id": 1660, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1069:7:12", @@ -6035,15 +6035,15 @@ "src": "1048:38:12" }, "returnParameters": { - "id": 1639, + "id": 1665, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1638, + "id": 1664, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1640, + "scope": 1666, "src": "1113:22:12", "stateVariable": false, "storageLocation": "default", @@ -6052,7 +6052,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1637, + "id": 1663, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1113:7:12", @@ -6067,7 +6067,7 @@ ], "src": "1112:24:12" }, - "scope": 1909, + "scope": 1935, "src": "1020:117:12", "stateMutability": "payable", "superFunction": null, @@ -6076,22 +6076,22 @@ { "body": null, "documentation": null, - "id": 1651, + "id": 1677, "implemented": false, "kind": "function", "modifiers": [], "name": "ethToTokenTransferInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1647, + "id": 1673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1642, + "id": 1668, "name": "min_tokens", "nodeType": "VariableDeclaration", - "scope": 1651, + "scope": 1677, "src": "1175:18:12", "stateVariable": false, "storageLocation": "default", @@ -6100,7 +6100,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1641, + "id": 1667, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1175:7:12", @@ -6114,10 +6114,10 @@ }, { "constant": false, - "id": 1644, + "id": 1670, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1651, + "scope": 1677, "src": "1195:16:12", "stateVariable": false, "storageLocation": "default", @@ -6126,7 +6126,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1643, + "id": 1669, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1195:7:12", @@ -6140,10 +6140,10 @@ }, { "constant": false, - "id": 1646, + "id": 1672, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1651, + "scope": 1677, "src": "1213:17:12", "stateVariable": false, "storageLocation": "default", @@ -6152,7 +6152,7 @@ "typeString": "address" }, "typeName": { - "id": 1645, + "id": 1671, "name": "address", "nodeType": "ElementaryTypeName", "src": "1213:7:12", @@ -6169,15 +6169,15 @@ "src": "1174:57:12" }, "returnParameters": { - "id": 1650, + "id": 1676, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1649, + "id": 1675, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1651, + "scope": 1677, "src": "1258:22:12", "stateVariable": false, "storageLocation": "default", @@ -6186,7 +6186,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1648, + "id": 1674, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1258:7:12", @@ -6201,7 +6201,7 @@ ], "src": "1257:24:12" }, - "scope": 1909, + "scope": 1935, "src": "1142:140:12", "stateMutability": "payable", "superFunction": null, @@ -6210,22 +6210,22 @@ { "body": null, "documentation": null, - "id": 1660, + "id": 1686, "implemented": false, "kind": "function", "modifiers": [], "name": "ethToTokenSwapOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1656, + "id": 1682, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1653, + "id": 1679, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1660, + "scope": 1686, "src": "1317:21:12", "stateVariable": false, "storageLocation": "default", @@ -6234,7 +6234,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1652, + "id": 1678, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1317:7:12", @@ -6248,10 +6248,10 @@ }, { "constant": false, - "id": 1655, + "id": 1681, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1660, + "scope": 1686, "src": "1340:16:12", "stateVariable": false, "storageLocation": "default", @@ -6260,7 +6260,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1654, + "id": 1680, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1340:7:12", @@ -6276,15 +6276,15 @@ "src": "1316:41:12" }, "returnParameters": { - "id": 1659, + "id": 1685, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1658, + "id": 1684, "name": "eth_sold", "nodeType": "VariableDeclaration", - "scope": 1660, + "scope": 1686, "src": "1384:17:12", "stateVariable": false, "storageLocation": "default", @@ -6293,7 +6293,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1657, + "id": 1683, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1384:7:12", @@ -6308,7 +6308,7 @@ ], "src": "1383:19:12" }, - "scope": 1909, + "scope": 1935, "src": "1287:116:12", "stateMutability": "payable", "superFunction": null, @@ -6317,22 +6317,22 @@ { "body": null, "documentation": null, - "id": 1671, + "id": 1697, "implemented": false, "kind": "function", "modifiers": [], "name": "ethToTokenTransferOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1667, + "id": 1693, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1662, + "id": 1688, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1671, + "scope": 1697, "src": "1442:21:12", "stateVariable": false, "storageLocation": "default", @@ -6341,7 +6341,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1661, + "id": 1687, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1442:7:12", @@ -6355,10 +6355,10 @@ }, { "constant": false, - "id": 1664, + "id": 1690, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1671, + "scope": 1697, "src": "1465:16:12", "stateVariable": false, "storageLocation": "default", @@ -6367,7 +6367,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1663, + "id": 1689, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1465:7:12", @@ -6381,10 +6381,10 @@ }, { "constant": false, - "id": 1666, + "id": 1692, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1671, + "scope": 1697, "src": "1483:17:12", "stateVariable": false, "storageLocation": "default", @@ -6393,7 +6393,7 @@ "typeString": "address" }, "typeName": { - "id": 1665, + "id": 1691, "name": "address", "nodeType": "ElementaryTypeName", "src": "1483:7:12", @@ -6410,15 +6410,15 @@ "src": "1441:60:12" }, "returnParameters": { - "id": 1670, + "id": 1696, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1669, + "id": 1695, "name": "eth_sold", "nodeType": "VariableDeclaration", - "scope": 1671, + "scope": 1697, "src": "1528:17:12", "stateVariable": false, "storageLocation": "default", @@ -6427,7 +6427,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1668, + "id": 1694, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1528:7:12", @@ -6442,7 +6442,7 @@ ], "src": "1527:19:12" }, - "scope": 1909, + "scope": 1935, "src": "1408:139:12", "stateMutability": "payable", "superFunction": null, @@ -6451,22 +6451,22 @@ { "body": null, "documentation": null, - "id": 1682, + "id": 1708, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToEthSwapInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1678, + "id": 1704, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1673, + "id": 1699, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1682, + "scope": 1708, "src": "1607:19:12", "stateVariable": false, "storageLocation": "default", @@ -6475,7 +6475,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1672, + "id": 1698, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1607:7:12", @@ -6489,10 +6489,10 @@ }, { "constant": false, - "id": 1675, + "id": 1701, "name": "min_eth", "nodeType": "VariableDeclaration", - "scope": 1682, + "scope": 1708, "src": "1628:15:12", "stateVariable": false, "storageLocation": "default", @@ -6501,7 +6501,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1674, + "id": 1700, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1628:7:12", @@ -6515,10 +6515,10 @@ }, { "constant": false, - "id": 1677, + "id": 1703, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1682, + "scope": 1708, "src": "1645:16:12", "stateVariable": false, "storageLocation": "default", @@ -6527,7 +6527,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1676, + "id": 1702, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1645:7:12", @@ -6543,15 +6543,15 @@ "src": "1606:56:12" }, "returnParameters": { - "id": 1681, + "id": 1707, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1680, + "id": 1706, "name": "eth_bought", "nodeType": "VariableDeclaration", - "scope": 1682, + "scope": 1708, "src": "1681:19:12", "stateVariable": false, "storageLocation": "default", @@ -6560,7 +6560,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1679, + "id": 1705, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1681:7:12", @@ -6575,7 +6575,7 @@ ], "src": "1680:21:12" }, - "scope": 1909, + "scope": 1935, "src": "1578:124:12", "stateMutability": "nonpayable", "superFunction": null, @@ -6584,22 +6584,22 @@ { "body": null, "documentation": null, - "id": 1695, + "id": 1721, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToEthTransferInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1691, + "id": 1717, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1684, + "id": 1710, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1695, + "scope": 1721, "src": "1740:19:12", "stateVariable": false, "storageLocation": "default", @@ -6608,7 +6608,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1683, + "id": 1709, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1740:7:12", @@ -6622,10 +6622,10 @@ }, { "constant": false, - "id": 1686, + "id": 1712, "name": "min_eth", "nodeType": "VariableDeclaration", - "scope": 1695, + "scope": 1721, "src": "1761:15:12", "stateVariable": false, "storageLocation": "default", @@ -6634,7 +6634,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1685, + "id": 1711, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1761:7:12", @@ -6648,10 +6648,10 @@ }, { "constant": false, - "id": 1688, + "id": 1714, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1695, + "scope": 1721, "src": "1778:16:12", "stateVariable": false, "storageLocation": "default", @@ -6660,7 +6660,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1687, + "id": 1713, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1778:7:12", @@ -6674,10 +6674,10 @@ }, { "constant": false, - "id": 1690, + "id": 1716, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1695, + "scope": 1721, "src": "1796:17:12", "stateVariable": false, "storageLocation": "default", @@ -6686,7 +6686,7 @@ "typeString": "address" }, "typeName": { - "id": 1689, + "id": 1715, "name": "address", "nodeType": "ElementaryTypeName", "src": "1796:7:12", @@ -6703,15 +6703,15 @@ "src": "1739:75:12" }, "returnParameters": { - "id": 1694, + "id": 1720, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1693, + "id": 1719, "name": "eth_bought", "nodeType": "VariableDeclaration", - "scope": 1695, + "scope": 1721, "src": "1833:19:12", "stateVariable": false, "storageLocation": "default", @@ -6720,7 +6720,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1692, + "id": 1718, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1833:7:12", @@ -6735,7 +6735,7 @@ ], "src": "1832:21:12" }, - "scope": 1909, + "scope": 1935, "src": "1707:147:12", "stateMutability": "nonpayable", "superFunction": null, @@ -6744,22 +6744,22 @@ { "body": null, "documentation": null, - "id": 1706, + "id": 1732, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToEthSwapOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1702, + "id": 1728, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1697, + "id": 1723, "name": "eth_bought", "nodeType": "VariableDeclaration", - "scope": 1706, + "scope": 1732, "src": "1889:18:12", "stateVariable": false, "storageLocation": "default", @@ -6768,7 +6768,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1696, + "id": 1722, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1889:7:12", @@ -6782,10 +6782,10 @@ }, { "constant": false, - "id": 1699, + "id": 1725, "name": "max_tokens", "nodeType": "VariableDeclaration", - "scope": 1706, + "scope": 1732, "src": "1909:18:12", "stateVariable": false, "storageLocation": "default", @@ -6794,7 +6794,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1698, + "id": 1724, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1909:7:12", @@ -6808,10 +6808,10 @@ }, { "constant": false, - "id": 1701, + "id": 1727, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1706, + "scope": 1732, "src": "1929:16:12", "stateVariable": false, "storageLocation": "default", @@ -6820,7 +6820,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1700, + "id": 1726, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1929:7:12", @@ -6836,15 +6836,15 @@ "src": "1888:58:12" }, "returnParameters": { - "id": 1705, + "id": 1731, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1704, + "id": 1730, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1706, + "scope": 1732, "src": "1965:20:12", "stateVariable": false, "storageLocation": "default", @@ -6853,7 +6853,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1703, + "id": 1729, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1965:7:12", @@ -6868,7 +6868,7 @@ ], "src": "1964:22:12" }, - "scope": 1909, + "scope": 1935, "src": "1859:128:12", "stateMutability": "nonpayable", "superFunction": null, @@ -6877,22 +6877,22 @@ { "body": null, "documentation": null, - "id": 1719, + "id": 1745, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToEthTransferOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1715, + "id": 1741, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1708, + "id": 1734, "name": "eth_bought", "nodeType": "VariableDeclaration", - "scope": 1719, + "scope": 1745, "src": "2026:18:12", "stateVariable": false, "storageLocation": "default", @@ -6901,7 +6901,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1707, + "id": 1733, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2026:7:12", @@ -6915,10 +6915,10 @@ }, { "constant": false, - "id": 1710, + "id": 1736, "name": "max_tokens", "nodeType": "VariableDeclaration", - "scope": 1719, + "scope": 1745, "src": "2046:18:12", "stateVariable": false, "storageLocation": "default", @@ -6927,7 +6927,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1709, + "id": 1735, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2046:7:12", @@ -6941,10 +6941,10 @@ }, { "constant": false, - "id": 1712, + "id": 1738, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1719, + "scope": 1745, "src": "2066:16:12", "stateVariable": false, "storageLocation": "default", @@ -6953,7 +6953,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1711, + "id": 1737, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2066:7:12", @@ -6967,10 +6967,10 @@ }, { "constant": false, - "id": 1714, + "id": 1740, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1719, + "scope": 1745, "src": "2084:17:12", "stateVariable": false, "storageLocation": "default", @@ -6979,7 +6979,7 @@ "typeString": "address" }, "typeName": { - "id": 1713, + "id": 1739, "name": "address", "nodeType": "ElementaryTypeName", "src": "2084:7:12", @@ -6996,15 +6996,15 @@ "src": "2025:77:12" }, "returnParameters": { - "id": 1718, + "id": 1744, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1717, + "id": 1743, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1719, + "scope": 1745, "src": "2121:20:12", "stateVariable": false, "storageLocation": "default", @@ -7013,7 +7013,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1716, + "id": 1742, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2121:7:12", @@ -7028,7 +7028,7 @@ ], "src": "2120:22:12" }, - "scope": 1909, + "scope": 1935, "src": "1992:151:12", "stateMutability": "nonpayable", "superFunction": null, @@ -7037,22 +7037,22 @@ { "body": null, "documentation": null, - "id": 1734, + "id": 1760, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToTokenSwapInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1730, + "id": 1756, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1721, + "id": 1747, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1734, + "scope": 1760, "src": "2207:19:12", "stateVariable": false, "storageLocation": "default", @@ -7061,7 +7061,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1720, + "id": 1746, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2207:7:12", @@ -7075,10 +7075,10 @@ }, { "constant": false, - "id": 1723, + "id": 1749, "name": "min_tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1734, + "scope": 1760, "src": "2228:25:12", "stateVariable": false, "storageLocation": "default", @@ -7087,7 +7087,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1722, + "id": 1748, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2228:7:12", @@ -7101,10 +7101,10 @@ }, { "constant": false, - "id": 1725, + "id": 1751, "name": "min_eth_bought", "nodeType": "VariableDeclaration", - "scope": 1734, + "scope": 1760, "src": "2255:22:12", "stateVariable": false, "storageLocation": "default", @@ -7113,7 +7113,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1724, + "id": 1750, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2255:7:12", @@ -7127,10 +7127,10 @@ }, { "constant": false, - "id": 1727, + "id": 1753, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1734, + "scope": 1760, "src": "2279:16:12", "stateVariable": false, "storageLocation": "default", @@ -7139,7 +7139,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1726, + "id": 1752, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2279:7:12", @@ -7153,10 +7153,10 @@ }, { "constant": false, - "id": 1729, + "id": 1755, "name": "token_addr", "nodeType": "VariableDeclaration", - "scope": 1734, + "scope": 1760, "src": "2297:18:12", "stateVariable": false, "storageLocation": "default", @@ -7165,7 +7165,7 @@ "typeString": "address" }, "typeName": { - "id": 1728, + "id": 1754, "name": "address", "nodeType": "ElementaryTypeName", "src": "2297:7:12", @@ -7182,15 +7182,15 @@ "src": "2206:110:12" }, "returnParameters": { - "id": 1733, + "id": 1759, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1732, + "id": 1758, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1734, + "scope": 1760, "src": "2335:22:12", "stateVariable": false, "storageLocation": "default", @@ -7199,7 +7199,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1731, + "id": 1757, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2335:7:12", @@ -7214,7 +7214,7 @@ ], "src": "2334:24:12" }, - "scope": 1909, + "scope": 1935, "src": "2176:183:12", "stateMutability": "nonpayable", "superFunction": null, @@ -7223,22 +7223,22 @@ { "body": null, "documentation": null, - "id": 1751, + "id": 1777, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToTokenTransferInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1747, + "id": 1773, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1736, + "id": 1762, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2399:19:12", "stateVariable": false, "storageLocation": "default", @@ -7247,7 +7247,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1735, + "id": 1761, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2399:7:12", @@ -7261,10 +7261,10 @@ }, { "constant": false, - "id": 1738, + "id": 1764, "name": "min_tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2420:25:12", "stateVariable": false, "storageLocation": "default", @@ -7273,7 +7273,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1737, + "id": 1763, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2420:7:12", @@ -7287,10 +7287,10 @@ }, { "constant": false, - "id": 1740, + "id": 1766, "name": "min_eth_bought", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2447:22:12", "stateVariable": false, "storageLocation": "default", @@ -7299,7 +7299,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1739, + "id": 1765, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2447:7:12", @@ -7313,10 +7313,10 @@ }, { "constant": false, - "id": 1742, + "id": 1768, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2471:16:12", "stateVariable": false, "storageLocation": "default", @@ -7325,7 +7325,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1741, + "id": 1767, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2471:7:12", @@ -7339,10 +7339,10 @@ }, { "constant": false, - "id": 1744, + "id": 1770, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2489:17:12", "stateVariable": false, "storageLocation": "default", @@ -7351,7 +7351,7 @@ "typeString": "address" }, "typeName": { - "id": 1743, + "id": 1769, "name": "address", "nodeType": "ElementaryTypeName", "src": "2489:7:12", @@ -7366,10 +7366,10 @@ }, { "constant": false, - "id": 1746, + "id": 1772, "name": "token_addr", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2508:18:12", "stateVariable": false, "storageLocation": "default", @@ -7378,7 +7378,7 @@ "typeString": "address" }, "typeName": { - "id": 1745, + "id": 1771, "name": "address", "nodeType": "ElementaryTypeName", "src": "2508:7:12", @@ -7395,15 +7395,15 @@ "src": "2398:129:12" }, "returnParameters": { - "id": 1750, + "id": 1776, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1749, + "id": 1775, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1751, + "scope": 1777, "src": "2546:22:12", "stateVariable": false, "storageLocation": "default", @@ -7412,7 +7412,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1748, + "id": 1774, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2546:7:12", @@ -7427,7 +7427,7 @@ ], "src": "2545:24:12" }, - "scope": 1909, + "scope": 1935, "src": "2364:206:12", "stateMutability": "nonpayable", "superFunction": null, @@ -7436,22 +7436,22 @@ { "body": null, "documentation": null, - "id": 1766, + "id": 1792, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToTokenSwapOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1762, + "id": 1788, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1753, + "id": 1779, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1766, + "scope": 1792, "src": "2607:21:12", "stateVariable": false, "storageLocation": "default", @@ -7460,7 +7460,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1752, + "id": 1778, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2607:7:12", @@ -7474,10 +7474,10 @@ }, { "constant": false, - "id": 1755, + "id": 1781, "name": "max_tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1766, + "scope": 1792, "src": "2630:23:12", "stateVariable": false, "storageLocation": "default", @@ -7486,7 +7486,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1754, + "id": 1780, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2630:7:12", @@ -7500,10 +7500,10 @@ }, { "constant": false, - "id": 1757, + "id": 1783, "name": "max_eth_sold", "nodeType": "VariableDeclaration", - "scope": 1766, + "scope": 1792, "src": "2655:20:12", "stateVariable": false, "storageLocation": "default", @@ -7512,7 +7512,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1756, + "id": 1782, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2655:7:12", @@ -7526,10 +7526,10 @@ }, { "constant": false, - "id": 1759, + "id": 1785, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1766, + "scope": 1792, "src": "2677:16:12", "stateVariable": false, "storageLocation": "default", @@ -7538,7 +7538,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1758, + "id": 1784, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2677:7:12", @@ -7552,10 +7552,10 @@ }, { "constant": false, - "id": 1761, + "id": 1787, "name": "token_addr", "nodeType": "VariableDeclaration", - "scope": 1766, + "scope": 1792, "src": "2695:18:12", "stateVariable": false, "storageLocation": "default", @@ -7564,7 +7564,7 @@ "typeString": "address" }, "typeName": { - "id": 1760, + "id": 1786, "name": "address", "nodeType": "ElementaryTypeName", "src": "2695:7:12", @@ -7581,15 +7581,15 @@ "src": "2606:108:12" }, "returnParameters": { - "id": 1765, + "id": 1791, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1764, + "id": 1790, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1766, + "scope": 1792, "src": "2733:20:12", "stateVariable": false, "storageLocation": "default", @@ -7598,7 +7598,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1763, + "id": 1789, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2733:7:12", @@ -7613,7 +7613,7 @@ ], "src": "2732:22:12" }, - "scope": 1909, + "scope": 1935, "src": "2575:180:12", "stateMutability": "nonpayable", "superFunction": null, @@ -7622,22 +7622,22 @@ { "body": null, "documentation": null, - "id": 1783, + "id": 1809, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToTokenTransferOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1779, + "id": 1805, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1768, + "id": 1794, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2796:21:12", "stateVariable": false, "storageLocation": "default", @@ -7646,7 +7646,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1767, + "id": 1793, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2796:7:12", @@ -7660,10 +7660,10 @@ }, { "constant": false, - "id": 1770, + "id": 1796, "name": "max_tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2819:23:12", "stateVariable": false, "storageLocation": "default", @@ -7672,7 +7672,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1769, + "id": 1795, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2819:7:12", @@ -7686,10 +7686,10 @@ }, { "constant": false, - "id": 1772, + "id": 1798, "name": "max_eth_sold", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2844:20:12", "stateVariable": false, "storageLocation": "default", @@ -7698,7 +7698,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1771, + "id": 1797, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2844:7:12", @@ -7712,10 +7712,10 @@ }, { "constant": false, - "id": 1774, + "id": 1800, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2866:16:12", "stateVariable": false, "storageLocation": "default", @@ -7724,7 +7724,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1773, + "id": 1799, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2866:7:12", @@ -7738,10 +7738,10 @@ }, { "constant": false, - "id": 1776, + "id": 1802, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2884:17:12", "stateVariable": false, "storageLocation": "default", @@ -7750,7 +7750,7 @@ "typeString": "address" }, "typeName": { - "id": 1775, + "id": 1801, "name": "address", "nodeType": "ElementaryTypeName", "src": "2884:7:12", @@ -7765,10 +7765,10 @@ }, { "constant": false, - "id": 1778, + "id": 1804, "name": "token_addr", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2903:18:12", "stateVariable": false, "storageLocation": "default", @@ -7777,7 +7777,7 @@ "typeString": "address" }, "typeName": { - "id": 1777, + "id": 1803, "name": "address", "nodeType": "ElementaryTypeName", "src": "2903:7:12", @@ -7794,15 +7794,15 @@ "src": "2795:127:12" }, "returnParameters": { - "id": 1782, + "id": 1808, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1781, + "id": 1807, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1783, + "scope": 1809, "src": "2941:20:12", "stateVariable": false, "storageLocation": "default", @@ -7811,7 +7811,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1780, + "id": 1806, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2941:7:12", @@ -7826,7 +7826,7 @@ ], "src": "2940:22:12" }, - "scope": 1909, + "scope": 1935, "src": "2760:203:12", "stateMutability": "nonpayable", "superFunction": null, @@ -7835,22 +7835,22 @@ { "body": null, "documentation": null, - "id": 1798, + "id": 1824, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToExchangeSwapInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1794, + "id": 1820, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1785, + "id": 1811, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1798, + "scope": 1824, "src": "3036:19:12", "stateVariable": false, "storageLocation": "default", @@ -7859,7 +7859,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1784, + "id": 1810, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3036:7:12", @@ -7873,10 +7873,10 @@ }, { "constant": false, - "id": 1787, + "id": 1813, "name": "min_tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1798, + "scope": 1824, "src": "3057:25:12", "stateVariable": false, "storageLocation": "default", @@ -7885,7 +7885,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1786, + "id": 1812, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3057:7:12", @@ -7899,10 +7899,10 @@ }, { "constant": false, - "id": 1789, + "id": 1815, "name": "min_eth_bought", "nodeType": "VariableDeclaration", - "scope": 1798, + "scope": 1824, "src": "3084:22:12", "stateVariable": false, "storageLocation": "default", @@ -7911,7 +7911,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1788, + "id": 1814, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3084:7:12", @@ -7925,10 +7925,10 @@ }, { "constant": false, - "id": 1791, + "id": 1817, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1798, + "scope": 1824, "src": "3108:16:12", "stateVariable": false, "storageLocation": "default", @@ -7937,7 +7937,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1790, + "id": 1816, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3108:7:12", @@ -7951,10 +7951,10 @@ }, { "constant": false, - "id": 1793, + "id": 1819, "name": "exchange_addr", "nodeType": "VariableDeclaration", - "scope": 1798, + "scope": 1824, "src": "3126:21:12", "stateVariable": false, "storageLocation": "default", @@ -7963,7 +7963,7 @@ "typeString": "address" }, "typeName": { - "id": 1792, + "id": 1818, "name": "address", "nodeType": "ElementaryTypeName", "src": "3126:7:12", @@ -7980,15 +7980,15 @@ "src": "3035:113:12" }, "returnParameters": { - "id": 1797, + "id": 1823, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1796, + "id": 1822, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1798, + "scope": 1824, "src": "3167:22:12", "stateVariable": false, "storageLocation": "default", @@ -7997,7 +7997,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1795, + "id": 1821, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3167:7:12", @@ -8012,7 +8012,7 @@ ], "src": "3166:24:12" }, - "scope": 1909, + "scope": 1935, "src": "3002:189:12", "stateMutability": "nonpayable", "superFunction": null, @@ -8021,22 +8021,22 @@ { "body": null, "documentation": null, - "id": 1815, + "id": 1841, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToExchangeTransferInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1811, + "id": 1837, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1800, + "id": 1826, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3234:19:12", "stateVariable": false, "storageLocation": "default", @@ -8045,7 +8045,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1799, + "id": 1825, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3234:7:12", @@ -8059,10 +8059,10 @@ }, { "constant": false, - "id": 1802, + "id": 1828, "name": "min_tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3255:25:12", "stateVariable": false, "storageLocation": "default", @@ -8071,7 +8071,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1801, + "id": 1827, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3255:7:12", @@ -8085,10 +8085,10 @@ }, { "constant": false, - "id": 1804, + "id": 1830, "name": "min_eth_bought", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3282:22:12", "stateVariable": false, "storageLocation": "default", @@ -8097,7 +8097,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1803, + "id": 1829, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3282:7:12", @@ -8111,10 +8111,10 @@ }, { "constant": false, - "id": 1806, + "id": 1832, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3306:16:12", "stateVariable": false, "storageLocation": "default", @@ -8123,7 +8123,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1805, + "id": 1831, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3306:7:12", @@ -8137,10 +8137,10 @@ }, { "constant": false, - "id": 1808, + "id": 1834, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3324:17:12", "stateVariable": false, "storageLocation": "default", @@ -8149,7 +8149,7 @@ "typeString": "address" }, "typeName": { - "id": 1807, + "id": 1833, "name": "address", "nodeType": "ElementaryTypeName", "src": "3324:7:12", @@ -8164,10 +8164,10 @@ }, { "constant": false, - "id": 1810, + "id": 1836, "name": "exchange_addr", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3343:21:12", "stateVariable": false, "storageLocation": "default", @@ -8176,7 +8176,7 @@ "typeString": "address" }, "typeName": { - "id": 1809, + "id": 1835, "name": "address", "nodeType": "ElementaryTypeName", "src": "3343:7:12", @@ -8193,15 +8193,15 @@ "src": "3233:132:12" }, "returnParameters": { - "id": 1814, + "id": 1840, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1813, + "id": 1839, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1815, + "scope": 1841, "src": "3384:22:12", "stateVariable": false, "storageLocation": "default", @@ -8210,7 +8210,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1812, + "id": 1838, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3384:7:12", @@ -8225,7 +8225,7 @@ ], "src": "3383:24:12" }, - "scope": 1909, + "scope": 1935, "src": "3196:212:12", "stateMutability": "nonpayable", "superFunction": null, @@ -8234,22 +8234,22 @@ { "body": null, "documentation": null, - "id": 1830, + "id": 1856, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToExchangeSwapOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1826, + "id": 1852, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1817, + "id": 1843, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1830, + "scope": 1856, "src": "3448:21:12", "stateVariable": false, "storageLocation": "default", @@ -8258,7 +8258,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1816, + "id": 1842, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3448:7:12", @@ -8272,10 +8272,10 @@ }, { "constant": false, - "id": 1819, + "id": 1845, "name": "max_tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1830, + "scope": 1856, "src": "3471:23:12", "stateVariable": false, "storageLocation": "default", @@ -8284,7 +8284,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1818, + "id": 1844, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3471:7:12", @@ -8298,10 +8298,10 @@ }, { "constant": false, - "id": 1821, + "id": 1847, "name": "max_eth_sold", "nodeType": "VariableDeclaration", - "scope": 1830, + "scope": 1856, "src": "3496:20:12", "stateVariable": false, "storageLocation": "default", @@ -8310,7 +8310,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1820, + "id": 1846, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3496:7:12", @@ -8324,10 +8324,10 @@ }, { "constant": false, - "id": 1823, + "id": 1849, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1830, + "scope": 1856, "src": "3518:16:12", "stateVariable": false, "storageLocation": "default", @@ -8336,7 +8336,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1822, + "id": 1848, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3518:7:12", @@ -8350,10 +8350,10 @@ }, { "constant": false, - "id": 1825, + "id": 1851, "name": "exchange_addr", "nodeType": "VariableDeclaration", - "scope": 1830, + "scope": 1856, "src": "3536:21:12", "stateVariable": false, "storageLocation": "default", @@ -8362,7 +8362,7 @@ "typeString": "address" }, "typeName": { - "id": 1824, + "id": 1850, "name": "address", "nodeType": "ElementaryTypeName", "src": "3536:7:12", @@ -8379,15 +8379,15 @@ "src": "3447:111:12" }, "returnParameters": { - "id": 1829, + "id": 1855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1828, + "id": 1854, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1830, + "scope": 1856, "src": "3577:20:12", "stateVariable": false, "storageLocation": "default", @@ -8396,7 +8396,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1827, + "id": 1853, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3577:7:12", @@ -8411,7 +8411,7 @@ ], "src": "3576:22:12" }, - "scope": 1909, + "scope": 1935, "src": "3413:186:12", "stateMutability": "nonpayable", "superFunction": null, @@ -8420,22 +8420,22 @@ { "body": null, "documentation": null, - "id": 1847, + "id": 1873, "implemented": false, "kind": "function", "modifiers": [], "name": "tokenToExchangeTransferOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 1843, + "id": 1869, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1832, + "id": 1858, "name": "tokens_bought", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3643:21:12", "stateVariable": false, "storageLocation": "default", @@ -8444,7 +8444,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1831, + "id": 1857, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3643:7:12", @@ -8458,10 +8458,10 @@ }, { "constant": false, - "id": 1834, + "id": 1860, "name": "max_tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3666:23:12", "stateVariable": false, "storageLocation": "default", @@ -8470,7 +8470,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1833, + "id": 1859, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3666:7:12", @@ -8484,10 +8484,10 @@ }, { "constant": false, - "id": 1836, + "id": 1862, "name": "max_eth_sold", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3691:20:12", "stateVariable": false, "storageLocation": "default", @@ -8496,7 +8496,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1835, + "id": 1861, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3691:7:12", @@ -8510,10 +8510,10 @@ }, { "constant": false, - "id": 1838, + "id": 1864, "name": "deadline", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3713:16:12", "stateVariable": false, "storageLocation": "default", @@ -8522,7 +8522,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1837, + "id": 1863, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3713:7:12", @@ -8536,10 +8536,10 @@ }, { "constant": false, - "id": 1840, + "id": 1866, "name": "recipient", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3731:17:12", "stateVariable": false, "storageLocation": "default", @@ -8548,7 +8548,7 @@ "typeString": "address" }, "typeName": { - "id": 1839, + "id": 1865, "name": "address", "nodeType": "ElementaryTypeName", "src": "3731:7:12", @@ -8563,10 +8563,10 @@ }, { "constant": false, - "id": 1842, + "id": 1868, "name": "exchange_addr", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3750:21:12", "stateVariable": false, "storageLocation": "default", @@ -8575,7 +8575,7 @@ "typeString": "address" }, "typeName": { - "id": 1841, + "id": 1867, "name": "address", "nodeType": "ElementaryTypeName", "src": "3750:7:12", @@ -8592,15 +8592,15 @@ "src": "3642:130:12" }, "returnParameters": { - "id": 1846, + "id": 1872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1845, + "id": 1871, "name": "tokens_sold", "nodeType": "VariableDeclaration", - "scope": 1847, + "scope": 1873, "src": "3791:20:12", "stateVariable": false, "storageLocation": "default", @@ -8609,7 +8609,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1844, + "id": 1870, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3791:7:12", @@ -8624,7 +8624,7 @@ ], "src": "3790:22:12" }, - "scope": 1909, + "scope": 1935, "src": "3604:209:12", "stateMutability": "nonpayable", "superFunction": null, @@ -8632,10 +8632,10 @@ }, { "constant": false, - "id": 1849, + "id": 1875, "name": "name", "nodeType": "VariableDeclaration", - "scope": 1909, + "scope": 1935, "src": "3866:19:12", "stateVariable": true, "storageLocation": "default", @@ -8644,7 +8644,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 1848, + "id": 1874, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "3866:7:12", @@ -8658,10 +8658,10 @@ }, { "constant": false, - "id": 1851, + "id": 1877, "name": "symbol", "nodeType": "VariableDeclaration", - "scope": 1909, + "scope": 1935, "src": "3891:21:12", "stateVariable": true, "storageLocation": "default", @@ -8670,7 +8670,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 1850, + "id": 1876, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "3891:7:12", @@ -8684,10 +8684,10 @@ }, { "constant": false, - "id": 1853, + "id": 1879, "name": "decimals", "nodeType": "VariableDeclaration", - "scope": 1909, + "scope": 1935, "src": "3918:23:12", "stateVariable": true, "storageLocation": "default", @@ -8696,7 +8696,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1852, + "id": 1878, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3918:7:12", @@ -8711,22 +8711,22 @@ { "body": null, "documentation": null, - "id": 1862, + "id": 1888, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 1858, + "id": 1884, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1855, + "id": 1881, "name": "_to", "nodeType": "VariableDeclaration", - "scope": 1862, + "scope": 1888, "src": "3965:11:12", "stateVariable": false, "storageLocation": "default", @@ -8735,7 +8735,7 @@ "typeString": "address" }, "typeName": { - "id": 1854, + "id": 1880, "name": "address", "nodeType": "ElementaryTypeName", "src": "3965:7:12", @@ -8750,10 +8750,10 @@ }, { "constant": false, - "id": 1857, + "id": 1883, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 1862, + "scope": 1888, "src": "3978:14:12", "stateVariable": false, "storageLocation": "default", @@ -8762,7 +8762,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1856, + "id": 1882, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3978:7:12", @@ -8778,15 +8778,15 @@ "src": "3964:29:12" }, "returnParameters": { - "id": 1861, + "id": 1887, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1860, + "id": 1886, "name": "", "nodeType": "VariableDeclaration", - "scope": 1862, + "scope": 1888, "src": "4012:4:12", "stateVariable": false, "storageLocation": "default", @@ -8795,7 +8795,7 @@ "typeString": "bool" }, "typeName": { - "id": 1859, + "id": 1885, "name": "bool", "nodeType": "ElementaryTypeName", "src": "4012:4:12", @@ -8810,7 +8810,7 @@ ], "src": "4011:6:12" }, - "scope": 1909, + "scope": 1935, "src": "3947:71:12", "stateMutability": "nonpayable", "superFunction": null, @@ -8819,22 +8819,22 @@ { "body": null, "documentation": null, - "id": 1873, + "id": 1899, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 1869, + "id": 1895, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1864, + "id": 1890, "name": "_from", "nodeType": "VariableDeclaration", - "scope": 1873, + "scope": 1899, "src": "4045:13:12", "stateVariable": false, "storageLocation": "default", @@ -8843,7 +8843,7 @@ "typeString": "address" }, "typeName": { - "id": 1863, + "id": 1889, "name": "address", "nodeType": "ElementaryTypeName", "src": "4045:7:12", @@ -8858,10 +8858,10 @@ }, { "constant": false, - "id": 1866, + "id": 1892, "name": "_to", "nodeType": "VariableDeclaration", - "scope": 1873, + "scope": 1899, "src": "4060:11:12", "stateVariable": false, "storageLocation": "default", @@ -8870,7 +8870,7 @@ "typeString": "address" }, "typeName": { - "id": 1865, + "id": 1891, "name": "address", "nodeType": "ElementaryTypeName", "src": "4060:7:12", @@ -8885,10 +8885,10 @@ }, { "constant": false, - "id": 1868, + "id": 1894, "name": "value", "nodeType": "VariableDeclaration", - "scope": 1873, + "scope": 1899, "src": "4073:13:12", "stateVariable": false, "storageLocation": "default", @@ -8897,7 +8897,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1867, + "id": 1893, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4073:7:12", @@ -8913,15 +8913,15 @@ "src": "4044:43:12" }, "returnParameters": { - "id": 1872, + "id": 1898, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1871, + "id": 1897, "name": "", "nodeType": "VariableDeclaration", - "scope": 1873, + "scope": 1899, "src": "4106:4:12", "stateVariable": false, "storageLocation": "default", @@ -8930,7 +8930,7 @@ "typeString": "bool" }, "typeName": { - "id": 1870, + "id": 1896, "name": "bool", "nodeType": "ElementaryTypeName", "src": "4106:4:12", @@ -8945,7 +8945,7 @@ ], "src": "4105:6:12" }, - "scope": 1909, + "scope": 1935, "src": "4023:89:12", "stateMutability": "nonpayable", "superFunction": null, @@ -8954,22 +8954,22 @@ { "body": null, "documentation": null, - "id": 1882, + "id": 1908, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 1878, + "id": 1904, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1875, + "id": 1901, "name": "_spender", "nodeType": "VariableDeclaration", - "scope": 1882, + "scope": 1908, "src": "4134:16:12", "stateVariable": false, "storageLocation": "default", @@ -8978,7 +8978,7 @@ "typeString": "address" }, "typeName": { - "id": 1874, + "id": 1900, "name": "address", "nodeType": "ElementaryTypeName", "src": "4134:7:12", @@ -8993,10 +8993,10 @@ }, { "constant": false, - "id": 1877, + "id": 1903, "name": "_value", "nodeType": "VariableDeclaration", - "scope": 1882, + "scope": 1908, "src": "4152:14:12", "stateVariable": false, "storageLocation": "default", @@ -9005,7 +9005,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1876, + "id": 1902, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4152:7:12", @@ -9021,15 +9021,15 @@ "src": "4133:34:12" }, "returnParameters": { - "id": 1881, + "id": 1907, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1880, + "id": 1906, "name": "", "nodeType": "VariableDeclaration", - "scope": 1882, + "scope": 1908, "src": "4186:4:12", "stateVariable": false, "storageLocation": "default", @@ -9038,7 +9038,7 @@ "typeString": "bool" }, "typeName": { - "id": 1879, + "id": 1905, "name": "bool", "nodeType": "ElementaryTypeName", "src": "4186:4:12", @@ -9053,7 +9053,7 @@ ], "src": "4185:6:12" }, - "scope": 1909, + "scope": 1935, "src": "4117:75:12", "stateMutability": "nonpayable", "superFunction": null, @@ -9062,22 +9062,22 @@ { "body": null, "documentation": null, - "id": 1891, + "id": 1917, "implemented": false, "kind": "function", "modifiers": [], "name": "allowance", "nodeType": "FunctionDefinition", "parameters": { - "id": 1887, + "id": 1913, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1884, + "id": 1910, "name": "_owner", "nodeType": "VariableDeclaration", - "scope": 1891, + "scope": 1917, "src": "4216:14:12", "stateVariable": false, "storageLocation": "default", @@ -9086,7 +9086,7 @@ "typeString": "address" }, "typeName": { - "id": 1883, + "id": 1909, "name": "address", "nodeType": "ElementaryTypeName", "src": "4216:7:12", @@ -9101,10 +9101,10 @@ }, { "constant": false, - "id": 1886, + "id": 1912, "name": "_spender", "nodeType": "VariableDeclaration", - "scope": 1891, + "scope": 1917, "src": "4232:16:12", "stateVariable": false, "storageLocation": "default", @@ -9113,7 +9113,7 @@ "typeString": "address" }, "typeName": { - "id": 1885, + "id": 1911, "name": "address", "nodeType": "ElementaryTypeName", "src": "4232:7:12", @@ -9130,15 +9130,15 @@ "src": "4215:34:12" }, "returnParameters": { - "id": 1890, + "id": 1916, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1889, + "id": 1915, "name": "", "nodeType": "VariableDeclaration", - "scope": 1891, + "scope": 1917, "src": "4273:7:12", "stateVariable": false, "storageLocation": "default", @@ -9147,7 +9147,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1888, + "id": 1914, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4273:7:12", @@ -9162,7 +9162,7 @@ ], "src": "4272:9:12" }, - "scope": 1909, + "scope": 1935, "src": "4197:85:12", "stateMutability": "view", "superFunction": null, @@ -9171,22 +9171,22 @@ { "body": null, "documentation": null, - "id": 1898, + "id": 1924, "implemented": false, "kind": "function", "modifiers": [], "name": "balanceOf", "nodeType": "FunctionDefinition", "parameters": { - "id": 1894, + "id": 1920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1893, + "id": 1919, "name": "_owner", "nodeType": "VariableDeclaration", - "scope": 1898, + "scope": 1924, "src": "4306:14:12", "stateVariable": false, "storageLocation": "default", @@ -9195,7 +9195,7 @@ "typeString": "address" }, "typeName": { - "id": 1892, + "id": 1918, "name": "address", "nodeType": "ElementaryTypeName", "src": "4306:7:12", @@ -9212,15 +9212,15 @@ "src": "4305:16:12" }, "returnParameters": { - "id": 1897, + "id": 1923, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1896, + "id": 1922, "name": "", "nodeType": "VariableDeclaration", - "scope": 1898, + "scope": 1924, "src": "4345:7:12", "stateVariable": false, "storageLocation": "default", @@ -9229,7 +9229,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1895, + "id": 1921, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4345:7:12", @@ -9244,7 +9244,7 @@ ], "src": "4344:9:12" }, - "scope": 1909, + "scope": 1935, "src": "4287:67:12", "stateMutability": "view", "superFunction": null, @@ -9253,28 +9253,28 @@ { "body": null, "documentation": null, - "id": 1903, + "id": 1929, "implemented": false, "kind": "function", "modifiers": [], "name": "totalSupply", "nodeType": "FunctionDefinition", "parameters": { - "id": 1899, + "id": 1925, "nodeType": "ParameterList", "parameters": [], "src": "4379:2:12" }, "returnParameters": { - "id": 1902, + "id": 1928, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1901, + "id": 1927, "name": "", "nodeType": "VariableDeclaration", - "scope": 1903, + "scope": 1929, "src": "4405:7:12", "stateVariable": false, "storageLocation": "default", @@ -9283,7 +9283,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1900, + "id": 1926, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4405:7:12", @@ -9298,7 +9298,7 @@ ], "src": "4404:9:12" }, - "scope": 1909, + "scope": 1935, "src": "4359:55:12", "stateMutability": "view", "superFunction": null, @@ -9307,22 +9307,22 @@ { "body": null, "documentation": null, - "id": 1908, + "id": 1934, "implemented": false, "kind": "function", "modifiers": [], "name": "setup", "nodeType": "FunctionDefinition", "parameters": { - "id": 1906, + "id": 1932, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1905, + "id": 1931, "name": "token_addr", "nodeType": "VariableDeclaration", - "scope": 1908, + "scope": 1934, "src": "4451:18:12", "stateVariable": false, "storageLocation": "default", @@ -9331,7 +9331,7 @@ "typeString": "address" }, "typeName": { - "id": 1904, + "id": 1930, "name": "address", "nodeType": "ElementaryTypeName", "src": "4451:7:12", @@ -9348,19 +9348,19 @@ "src": "4450:20:12" }, "returnParameters": { - "id": 1907, + "id": 1933, "nodeType": "ParameterList", "parameters": [], "src": "4479:0:12" }, - "scope": 1909, + "scope": 1935, "src": "4436:44:12", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 1910, + "scope": 1936, "src": "25:4457:12" } ], @@ -9372,7 +9372,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.476Z", + "updatedAt": "2020-04-08T12:21:13.694Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/IUniswapFactory.json b/packages/smart-contracts/artifacts/IUniswapFactory.json index f6baf47..cec0e9d 100644 --- a/packages/smart-contracts/artifacts/IUniswapFactory.json +++ b/packages/smart-contracts/artifacts/IUniswapFactory.json @@ -142,14 +142,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol", "exportedSymbols": { "IUniswapFactory": [ - 1949 + 1975 ] }, - "id": 1950, + "id": 1976, "nodeType": "SourceUnit", "nodes": [ { - "id": 1911, + "id": 1937, "literals": [ "solidity", "0.5", @@ -164,19 +164,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1949, + "id": 1975, "linearizedBaseContracts": [ - 1949 + 1975 ], "name": "IUniswapFactory", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 1913, + "id": 1939, "name": "exchangeTemplate", "nodeType": "VariableDeclaration", - "scope": 1949, + "scope": 1975, "src": "80:31:13", "stateVariable": true, "storageLocation": "default", @@ -185,7 +185,7 @@ "typeString": "address" }, "typeName": { - "id": 1912, + "id": 1938, "name": "address", "nodeType": "ElementaryTypeName", "src": "80:7:13", @@ -200,10 +200,10 @@ }, { "constant": false, - "id": 1915, + "id": 1941, "name": "tokenCount", "nodeType": "VariableDeclaration", - "scope": 1949, + "scope": 1975, "src": "117:25:13", "stateVariable": true, "storageLocation": "default", @@ -212,7 +212,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1914, + "id": 1940, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "117:7:13", @@ -227,22 +227,22 @@ { "body": null, "documentation": null, - "id": 1922, + "id": 1948, "implemented": false, "kind": "function", "modifiers": [], "name": "createExchange", "nodeType": "FunctionDefinition", "parameters": { - "id": 1918, + "id": 1944, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1917, + "id": 1943, "name": "token", "nodeType": "VariableDeclaration", - "scope": 1922, + "scope": 1948, "src": "195:13:13", "stateVariable": false, "storageLocation": "default", @@ -251,7 +251,7 @@ "typeString": "address" }, "typeName": { - "id": 1916, + "id": 1942, "name": "address", "nodeType": "ElementaryTypeName", "src": "195:7:13", @@ -268,15 +268,15 @@ "src": "194:15:13" }, "returnParameters": { - "id": 1921, + "id": 1947, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1920, + "id": 1946, "name": "exchange", "nodeType": "VariableDeclaration", - "scope": 1922, + "scope": 1948, "src": "228:16:13", "stateVariable": false, "storageLocation": "default", @@ -285,7 +285,7 @@ "typeString": "address" }, "typeName": { - "id": 1919, + "id": 1945, "name": "address", "nodeType": "ElementaryTypeName", "src": "228:7:13", @@ -301,7 +301,7 @@ ], "src": "227:18:13" }, - "scope": 1949, + "scope": 1975, "src": "171:75:13", "stateMutability": "nonpayable", "superFunction": null, @@ -310,22 +310,22 @@ { "body": null, "documentation": null, - "id": 1929, + "id": 1955, "implemented": false, "kind": "function", "modifiers": [], "name": "getExchange", "nodeType": "FunctionDefinition", "parameters": { - "id": 1925, + "id": 1951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1924, + "id": 1950, "name": "token", "nodeType": "VariableDeclaration", - "scope": 1929, + "scope": 1955, "src": "307:13:13", "stateVariable": false, "storageLocation": "default", @@ -334,7 +334,7 @@ "typeString": "address" }, "typeName": { - "id": 1923, + "id": 1949, "name": "address", "nodeType": "ElementaryTypeName", "src": "307:7:13", @@ -351,15 +351,15 @@ "src": "306:15:13" }, "returnParameters": { - "id": 1928, + "id": 1954, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1927, + "id": 1953, "name": "exchange", "nodeType": "VariableDeclaration", - "scope": 1929, + "scope": 1955, "src": "345:16:13", "stateVariable": false, "storageLocation": "default", @@ -368,7 +368,7 @@ "typeString": "address" }, "typeName": { - "id": 1926, + "id": 1952, "name": "address", "nodeType": "ElementaryTypeName", "src": "345:7:13", @@ -384,7 +384,7 @@ ], "src": "344:18:13" }, - "scope": 1949, + "scope": 1975, "src": "286:77:13", "stateMutability": "view", "superFunction": null, @@ -393,22 +393,22 @@ { "body": null, "documentation": null, - "id": 1936, + "id": 1962, "implemented": false, "kind": "function", "modifiers": [], "name": "getToken", "nodeType": "FunctionDefinition", "parameters": { - "id": 1932, + "id": 1958, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1931, + "id": 1957, "name": "exchange", "nodeType": "VariableDeclaration", - "scope": 1936, + "scope": 1962, "src": "386:16:13", "stateVariable": false, "storageLocation": "default", @@ -417,7 +417,7 @@ "typeString": "address" }, "typeName": { - "id": 1930, + "id": 1956, "name": "address", "nodeType": "ElementaryTypeName", "src": "386:7:13", @@ -434,15 +434,15 @@ "src": "385:18:13" }, "returnParameters": { - "id": 1935, + "id": 1961, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1934, + "id": 1960, "name": "token", "nodeType": "VariableDeclaration", - "scope": 1936, + "scope": 1962, "src": "427:13:13", "stateVariable": false, "storageLocation": "default", @@ -451,7 +451,7 @@ "typeString": "address" }, "typeName": { - "id": 1933, + "id": 1959, "name": "address", "nodeType": "ElementaryTypeName", "src": "427:7:13", @@ -467,7 +467,7 @@ ], "src": "426:15:13" }, - "scope": 1949, + "scope": 1975, "src": "368:74:13", "stateMutability": "view", "superFunction": null, @@ -476,22 +476,22 @@ { "body": null, "documentation": null, - "id": 1943, + "id": 1969, "implemented": false, "kind": "function", "modifiers": [], "name": "getTokenWithId", "nodeType": "FunctionDefinition", "parameters": { - "id": 1939, + "id": 1965, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1938, + "id": 1964, "name": "tokenId", "nodeType": "VariableDeclaration", - "scope": 1943, + "scope": 1969, "src": "471:15:13", "stateVariable": false, "storageLocation": "default", @@ -500,7 +500,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1937, + "id": 1963, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "471:7:13", @@ -516,15 +516,15 @@ "src": "470:17:13" }, "returnParameters": { - "id": 1942, + "id": 1968, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1941, + "id": 1967, "name": "token", "nodeType": "VariableDeclaration", - "scope": 1943, + "scope": 1969, "src": "511:13:13", "stateVariable": false, "storageLocation": "default", @@ -533,7 +533,7 @@ "typeString": "address" }, "typeName": { - "id": 1940, + "id": 1966, "name": "address", "nodeType": "ElementaryTypeName", "src": "511:7:13", @@ -549,7 +549,7 @@ ], "src": "510:15:13" }, - "scope": 1949, + "scope": 1975, "src": "447:79:13", "stateMutability": "view", "superFunction": null, @@ -558,22 +558,22 @@ { "body": null, "documentation": null, - "id": 1948, + "id": 1974, "implemented": false, "kind": "function", "modifiers": [], "name": "initializeFactory", "nodeType": "FunctionDefinition", "parameters": { - "id": 1946, + "id": 1972, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1945, + "id": 1971, "name": "template", "nodeType": "VariableDeclaration", - "scope": 1948, + "scope": 1974, "src": "575:16:13", "stateVariable": false, "storageLocation": "default", @@ -582,7 +582,7 @@ "typeString": "address" }, "typeName": { - "id": 1944, + "id": 1970, "name": "address", "nodeType": "ElementaryTypeName", "src": "575:7:13", @@ -599,19 +599,19 @@ "src": "574:18:13" }, "returnParameters": { - "id": 1947, + "id": 1973, "nodeType": "ParameterList", "parameters": [], "src": "601:0:13" }, - "scope": 1949, + "scope": 1975, "src": "548:54:13", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 1950, + "scope": 1976, "src": "25:579:13" } ], @@ -621,14 +621,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol", "exportedSymbols": { "IUniswapFactory": [ - 1949 + 1975 ] }, - "id": 1950, + "id": 1976, "nodeType": "SourceUnit", "nodes": [ { - "id": 1911, + "id": 1937, "literals": [ "solidity", "0.5", @@ -643,19 +643,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1949, + "id": 1975, "linearizedBaseContracts": [ - 1949 + 1975 ], "name": "IUniswapFactory", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 1913, + "id": 1939, "name": "exchangeTemplate", "nodeType": "VariableDeclaration", - "scope": 1949, + "scope": 1975, "src": "80:31:13", "stateVariable": true, "storageLocation": "default", @@ -664,7 +664,7 @@ "typeString": "address" }, "typeName": { - "id": 1912, + "id": 1938, "name": "address", "nodeType": "ElementaryTypeName", "src": "80:7:13", @@ -679,10 +679,10 @@ }, { "constant": false, - "id": 1915, + "id": 1941, "name": "tokenCount", "nodeType": "VariableDeclaration", - "scope": 1949, + "scope": 1975, "src": "117:25:13", "stateVariable": true, "storageLocation": "default", @@ -691,7 +691,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1914, + "id": 1940, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "117:7:13", @@ -706,22 +706,22 @@ { "body": null, "documentation": null, - "id": 1922, + "id": 1948, "implemented": false, "kind": "function", "modifiers": [], "name": "createExchange", "nodeType": "FunctionDefinition", "parameters": { - "id": 1918, + "id": 1944, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1917, + "id": 1943, "name": "token", "nodeType": "VariableDeclaration", - "scope": 1922, + "scope": 1948, "src": "195:13:13", "stateVariable": false, "storageLocation": "default", @@ -730,7 +730,7 @@ "typeString": "address" }, "typeName": { - "id": 1916, + "id": 1942, "name": "address", "nodeType": "ElementaryTypeName", "src": "195:7:13", @@ -747,15 +747,15 @@ "src": "194:15:13" }, "returnParameters": { - "id": 1921, + "id": 1947, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1920, + "id": 1946, "name": "exchange", "nodeType": "VariableDeclaration", - "scope": 1922, + "scope": 1948, "src": "228:16:13", "stateVariable": false, "storageLocation": "default", @@ -764,7 +764,7 @@ "typeString": "address" }, "typeName": { - "id": 1919, + "id": 1945, "name": "address", "nodeType": "ElementaryTypeName", "src": "228:7:13", @@ -780,7 +780,7 @@ ], "src": "227:18:13" }, - "scope": 1949, + "scope": 1975, "src": "171:75:13", "stateMutability": "nonpayable", "superFunction": null, @@ -789,22 +789,22 @@ { "body": null, "documentation": null, - "id": 1929, + "id": 1955, "implemented": false, "kind": "function", "modifiers": [], "name": "getExchange", "nodeType": "FunctionDefinition", "parameters": { - "id": 1925, + "id": 1951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1924, + "id": 1950, "name": "token", "nodeType": "VariableDeclaration", - "scope": 1929, + "scope": 1955, "src": "307:13:13", "stateVariable": false, "storageLocation": "default", @@ -813,7 +813,7 @@ "typeString": "address" }, "typeName": { - "id": 1923, + "id": 1949, "name": "address", "nodeType": "ElementaryTypeName", "src": "307:7:13", @@ -830,15 +830,15 @@ "src": "306:15:13" }, "returnParameters": { - "id": 1928, + "id": 1954, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1927, + "id": 1953, "name": "exchange", "nodeType": "VariableDeclaration", - "scope": 1929, + "scope": 1955, "src": "345:16:13", "stateVariable": false, "storageLocation": "default", @@ -847,7 +847,7 @@ "typeString": "address" }, "typeName": { - "id": 1926, + "id": 1952, "name": "address", "nodeType": "ElementaryTypeName", "src": "345:7:13", @@ -863,7 +863,7 @@ ], "src": "344:18:13" }, - "scope": 1949, + "scope": 1975, "src": "286:77:13", "stateMutability": "view", "superFunction": null, @@ -872,22 +872,22 @@ { "body": null, "documentation": null, - "id": 1936, + "id": 1962, "implemented": false, "kind": "function", "modifiers": [], "name": "getToken", "nodeType": "FunctionDefinition", "parameters": { - "id": 1932, + "id": 1958, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1931, + "id": 1957, "name": "exchange", "nodeType": "VariableDeclaration", - "scope": 1936, + "scope": 1962, "src": "386:16:13", "stateVariable": false, "storageLocation": "default", @@ -896,7 +896,7 @@ "typeString": "address" }, "typeName": { - "id": 1930, + "id": 1956, "name": "address", "nodeType": "ElementaryTypeName", "src": "386:7:13", @@ -913,15 +913,15 @@ "src": "385:18:13" }, "returnParameters": { - "id": 1935, + "id": 1961, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1934, + "id": 1960, "name": "token", "nodeType": "VariableDeclaration", - "scope": 1936, + "scope": 1962, "src": "427:13:13", "stateVariable": false, "storageLocation": "default", @@ -930,7 +930,7 @@ "typeString": "address" }, "typeName": { - "id": 1933, + "id": 1959, "name": "address", "nodeType": "ElementaryTypeName", "src": "427:7:13", @@ -946,7 +946,7 @@ ], "src": "426:15:13" }, - "scope": 1949, + "scope": 1975, "src": "368:74:13", "stateMutability": "view", "superFunction": null, @@ -955,22 +955,22 @@ { "body": null, "documentation": null, - "id": 1943, + "id": 1969, "implemented": false, "kind": "function", "modifiers": [], "name": "getTokenWithId", "nodeType": "FunctionDefinition", "parameters": { - "id": 1939, + "id": 1965, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1938, + "id": 1964, "name": "tokenId", "nodeType": "VariableDeclaration", - "scope": 1943, + "scope": 1969, "src": "471:15:13", "stateVariable": false, "storageLocation": "default", @@ -979,7 +979,7 @@ "typeString": "uint256" }, "typeName": { - "id": 1937, + "id": 1963, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "471:7:13", @@ -995,15 +995,15 @@ "src": "470:17:13" }, "returnParameters": { - "id": 1942, + "id": 1968, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1941, + "id": 1967, "name": "token", "nodeType": "VariableDeclaration", - "scope": 1943, + "scope": 1969, "src": "511:13:13", "stateVariable": false, "storageLocation": "default", @@ -1012,7 +1012,7 @@ "typeString": "address" }, "typeName": { - "id": 1940, + "id": 1966, "name": "address", "nodeType": "ElementaryTypeName", "src": "511:7:13", @@ -1028,7 +1028,7 @@ ], "src": "510:15:13" }, - "scope": 1949, + "scope": 1975, "src": "447:79:13", "stateMutability": "view", "superFunction": null, @@ -1037,22 +1037,22 @@ { "body": null, "documentation": null, - "id": 1948, + "id": 1974, "implemented": false, "kind": "function", "modifiers": [], "name": "initializeFactory", "nodeType": "FunctionDefinition", "parameters": { - "id": 1946, + "id": 1972, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1945, + "id": 1971, "name": "template", "nodeType": "VariableDeclaration", - "scope": 1948, + "scope": 1974, "src": "575:16:13", "stateVariable": false, "storageLocation": "default", @@ -1061,7 +1061,7 @@ "typeString": "address" }, "typeName": { - "id": 1944, + "id": 1970, "name": "address", "nodeType": "ElementaryTypeName", "src": "575:7:13", @@ -1078,19 +1078,19 @@ "src": "574:18:13" }, "returnParameters": { - "id": 1947, + "id": 1973, "nodeType": "ParameterList", "parameters": [], "src": "601:0:13" }, - "scope": 1949, + "scope": 1975, "src": "548:54:13", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 1950, + "scope": 1976, "src": "25:579:13" } ], @@ -1102,7 +1102,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.479Z", + "updatedAt": "2020-04-08T12:21:13.698Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/JugLike.json b/packages/smart-contracts/artifacts/JugLike.json index 2839fed..fdac7e2 100644 --- a/packages/smart-contracts/artifacts/JugLike.json +++ b/packages/smart-contracts/artifacts/JugLike.json @@ -34,35 +34,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -74,9 +74,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -88,9 +88,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -98,22 +98,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -122,7 +122,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -137,10 +137,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -149,7 +149,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -165,12 +165,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -179,22 +179,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -203,7 +203,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -218,10 +218,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -230,7 +230,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -246,12 +246,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -260,22 +260,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -284,7 +284,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -299,10 +299,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -311,7 +311,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -326,10 +326,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -338,7 +338,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -354,12 +354,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -368,25 +368,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -395,22 +395,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -419,7 +419,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -435,19 +435,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -456,9 +456,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -466,22 +466,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -490,7 +490,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -505,10 +505,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -517,7 +517,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -531,10 +531,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -543,7 +543,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -560,15 +560,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -577,7 +577,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -592,7 +592,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -601,22 +601,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -625,7 +625,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -641,15 +641,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -658,7 +658,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -673,7 +673,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -682,22 +682,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -706,7 +706,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -722,15 +722,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -739,7 +739,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -755,7 +755,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -764,22 +764,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -788,7 +788,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -804,15 +804,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -821,7 +821,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -837,7 +837,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -846,28 +846,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -876,7 +876,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -892,7 +892,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -901,22 +901,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -925,7 +925,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -939,10 +939,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -951,7 +951,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -968,15 +968,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -985,7 +985,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -1000,7 +1000,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1009,22 +1009,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -1033,7 +1033,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -1047,10 +1047,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -1059,7 +1059,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -1076,12 +1076,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1090,22 +1090,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -1114,7 +1114,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -1128,10 +1128,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -1140,7 +1140,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -1155,10 +1155,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -1167,7 +1167,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -1183,12 +1183,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1197,22 +1197,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -1221,7 +1221,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -1236,10 +1236,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -1248,7 +1248,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -1264,12 +1264,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1278,22 +1278,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -1302,7 +1302,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -1316,10 +1316,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -1328,7 +1328,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -1342,10 +1342,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -1354,7 +1354,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -1370,12 +1370,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1384,22 +1384,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -1408,7 +1408,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -1422,10 +1422,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -1434,7 +1434,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -1449,10 +1449,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -1461,7 +1461,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -1477,12 +1477,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1491,22 +1491,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -1515,7 +1515,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -1529,10 +1529,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -1541,7 +1541,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -1556,10 +1556,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -1568,7 +1568,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -1584,12 +1584,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1598,22 +1598,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -1622,7 +1622,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -1637,10 +1637,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -1649,7 +1649,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -1663,10 +1663,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -1675,7 +1675,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -1690,10 +1690,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -1702,7 +1702,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -1718,12 +1718,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1732,22 +1732,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -1756,7 +1756,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -1770,10 +1770,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -1782,7 +1782,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -1799,12 +1799,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1813,22 +1813,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -1837,7 +1837,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -1852,10 +1852,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -1864,7 +1864,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -1880,12 +1880,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1894,22 +1894,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -1918,7 +1918,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -1932,10 +1932,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -1944,7 +1944,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -1960,19 +1960,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -1981,9 +1981,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -1991,22 +1991,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -2015,7 +2015,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -2030,10 +2030,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -2042,7 +2042,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -2059,15 +2059,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -2076,7 +2076,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -2091,7 +2091,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -2100,22 +2100,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -2124,7 +2124,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -2140,15 +2140,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -2157,7 +2157,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -2171,10 +2171,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -2183,7 +2183,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -2197,10 +2197,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -2209,7 +2209,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -2223,10 +2223,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -2235,7 +2235,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -2249,10 +2249,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -2261,7 +2261,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -2276,7 +2276,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -2285,22 +2285,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -2309,7 +2309,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -2326,15 +2326,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -2343,7 +2343,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -2358,7 +2358,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -2367,22 +2367,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -2391,7 +2391,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -2405,10 +2405,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -2417,7 +2417,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -2434,15 +2434,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -2451,7 +2451,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -2465,10 +2465,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -2477,7 +2477,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -2492,7 +2492,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -2501,22 +2501,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -2525,7 +2525,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -2539,10 +2539,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -2551,7 +2551,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -2566,10 +2566,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -2578,7 +2578,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -2593,10 +2593,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -2605,7 +2605,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -2620,10 +2620,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -2632,7 +2632,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -2646,10 +2646,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -2658,7 +2658,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -2674,12 +2674,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2688,22 +2688,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -2712,7 +2712,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -2729,12 +2729,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2743,22 +2743,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -2767,7 +2767,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -2782,10 +2782,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -2794,7 +2794,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -2809,10 +2809,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -2821,7 +2821,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -2837,19 +2837,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -2858,9 +2858,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -2868,28 +2868,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -2898,7 +2898,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -2913,7 +2913,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2922,44 +2922,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -2969,7 +2969,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2978,22 +2978,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -3002,7 +3002,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -3017,10 +3017,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -3029,7 +3029,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -3045,12 +3045,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -3059,22 +3059,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -3083,7 +3083,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -3098,10 +3098,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -3110,7 +3110,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -3126,19 +3126,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -3147,9 +3147,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -3157,44 +3157,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -3204,7 +3204,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3213,44 +3213,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3260,7 +3260,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3269,22 +3269,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -3293,7 +3293,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -3308,10 +3308,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -3320,7 +3320,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -3336,12 +3336,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -3350,22 +3350,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -3374,7 +3374,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -3389,10 +3389,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -3401,7 +3401,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -3417,19 +3417,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -3438,9 +3438,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -3448,22 +3448,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -3472,7 +3472,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -3488,15 +3488,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -3505,7 +3505,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -3520,14 +3520,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -3536,19 +3536,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -3557,7 +3557,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -3572,7 +3572,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -3580,7 +3580,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -3600,7 +3600,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -3625,7 +3625,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -3639,7 +3639,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -3650,18 +3650,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3673,7 +3673,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -3702,7 +3702,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -3713,7 +3713,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -3723,18 +3723,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3749,18 +3749,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3771,11 +3771,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3795,7 +3795,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -3812,11 +3812,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3833,11 +3833,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3859,7 +3859,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -3886,21 +3886,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -3914,29 +3914,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -3945,7 +3945,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -3959,10 +3959,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -3971,7 +3971,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -3987,15 +3987,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -4004,7 +4004,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -4019,7 +4019,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -4027,7 +4027,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -4037,11 +4037,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4050,11 +4050,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4083,11 +4083,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4102,18 +4102,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -4123,25 +4123,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -4151,25 +4151,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -4183,7 +4183,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -4193,11 +4193,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4206,11 +4206,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4234,11 +4234,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4253,18 +4253,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -4274,25 +4274,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -4306,29 +4306,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -4337,7 +4337,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -4352,10 +4352,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -4364,7 +4364,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -4379,10 +4379,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -4391,7 +4391,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -4407,19 +4407,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -4428,38 +4428,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -4473,7 +4473,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -4483,18 +4483,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4509,18 +4509,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4531,11 +4531,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4555,7 +4555,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4572,11 +4572,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4592,7 +4592,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -4619,21 +4619,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -4647,29 +4647,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -4678,7 +4678,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -4692,10 +4692,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -4704,7 +4704,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -4720,15 +4720,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -4737,7 +4737,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -4752,7 +4752,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -4760,25 +4760,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -4792,11 +4792,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4811,7 +4811,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -4824,7 +4824,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -4844,7 +4844,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -4858,18 +4858,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -4881,7 +4881,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -4905,7 +4905,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -4932,21 +4932,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -4960,29 +4960,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -4991,7 +4991,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -5007,15 +5007,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -5024,7 +5024,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -5039,7 +5039,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -5047,25 +5047,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5079,11 +5079,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5096,7 +5096,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -5104,7 +5104,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -5124,7 +5124,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -5157,18 +5157,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -5188,29 +5188,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -5219,7 +5219,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -5235,15 +5235,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -5252,7 +5252,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -5267,7 +5267,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -5275,25 +5275,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5307,11 +5307,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5324,7 +5324,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -5332,7 +5332,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -5358,7 +5358,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -5366,7 +5366,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -5393,11 +5393,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5412,18 +5412,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -5433,25 +5433,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -5472,7 +5472,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5503,18 +5503,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -5534,29 +5534,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -5565,7 +5565,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -5580,10 +5580,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -5592,7 +5592,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -5608,15 +5608,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -5625,7 +5625,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -5640,7 +5640,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -5648,25 +5648,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5681,18 +5681,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5710,7 +5710,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -5718,7 +5718,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -5744,7 +5744,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -5752,7 +5752,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -5779,11 +5779,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5798,18 +5798,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -5819,25 +5819,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -5858,7 +5858,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5878,7 +5878,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5903,29 +5903,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -5934,7 +5934,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -5949,10 +5949,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -5961,7 +5961,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -5977,15 +5977,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -5994,7 +5994,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -6009,7 +6009,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -6017,21 +6017,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -6040,7 +6040,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -6053,17 +6053,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6083,11 +6083,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6102,18 +6102,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -6123,25 +6123,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -6160,15 +6160,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -6177,7 +6177,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -6190,17 +6190,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6220,11 +6220,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6239,18 +6239,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -6260,25 +6260,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -6302,18 +6302,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6327,11 +6327,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6340,11 +6340,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6363,18 +6363,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -6395,29 +6395,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6435,7 +6435,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -6448,11 +6448,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6461,11 +6461,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6484,18 +6484,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -6511,11 +6511,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6534,18 +6534,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -6563,11 +6563,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6588,18 +6588,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -6619,25 +6619,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6654,7 +6654,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -6667,11 +6667,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6686,7 +6686,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -6699,7 +6699,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -6715,11 +6715,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6738,18 +6738,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -6770,11 +6770,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6783,11 +6783,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6806,18 +6806,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -6839,18 +6839,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -6863,18 +6863,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6886,7 +6886,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -6918,7 +6918,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -6928,22 +6928,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -6952,7 +6952,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -6967,10 +6967,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -6979,7 +6979,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -6994,10 +6994,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -7006,7 +7006,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -7021,10 +7021,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -7033,7 +7033,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -7047,10 +7047,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -7059,7 +7059,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -7075,15 +7075,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -7092,7 +7092,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -7107,7 +7107,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -7115,14 +7115,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -7131,10 +7131,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -7143,7 +7143,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -7159,17 +7159,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7189,11 +7189,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7208,18 +7208,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -7229,25 +7229,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -7267,16 +7267,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -7285,7 +7285,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -7298,17 +7298,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7317,11 +7317,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7345,11 +7345,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7364,18 +7364,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -7385,25 +7385,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -7422,15 +7422,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -7439,7 +7439,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -7452,17 +7452,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7482,11 +7482,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7501,18 +7501,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -7522,25 +7522,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -7559,15 +7559,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -7576,7 +7576,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -7589,7 +7589,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7598,11 +7598,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7611,11 +7611,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7634,18 +7634,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -7661,11 +7661,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7684,18 +7684,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -7715,18 +7715,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7741,18 +7741,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7763,11 +7763,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7786,25 +7786,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7821,7 +7821,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -7831,11 +7831,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7844,11 +7844,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7867,18 +7867,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -7896,11 +7896,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7915,18 +7915,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -7939,18 +7939,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7962,7 +7962,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -7994,29 +7994,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -8025,7 +8025,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -8040,10 +8040,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -8052,7 +8052,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -8067,10 +8067,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -8079,7 +8079,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -8094,10 +8094,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -8106,7 +8106,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -8122,15 +8122,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -8139,7 +8139,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -8154,7 +8154,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -8162,25 +8162,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8194,11 +8194,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -8207,11 +8207,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8235,11 +8235,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8254,18 +8254,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -8275,25 +8275,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -8313,29 +8313,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -8344,7 +8344,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -8359,10 +8359,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -8371,7 +8371,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -8385,10 +8385,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -8397,7 +8397,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -8414,15 +8414,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -8431,7 +8431,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -8446,7 +8446,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8454,7 +8454,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -8464,11 +8464,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8477,11 +8477,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8505,11 +8505,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8524,18 +8524,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -8545,25 +8545,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -8577,29 +8577,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -8608,7 +8608,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -8623,10 +8623,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -8635,7 +8635,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -8649,10 +8649,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -8661,7 +8661,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -8678,12 +8678,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8691,7 +8691,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -8701,11 +8701,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8714,11 +8714,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8727,11 +8727,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8759,11 +8759,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8778,18 +8778,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -8799,25 +8799,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -8831,29 +8831,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -8862,7 +8862,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -8877,10 +8877,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -8889,7 +8889,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -8903,10 +8903,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -8915,7 +8915,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -8930,10 +8930,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -8942,7 +8942,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -8958,12 +8958,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8971,7 +8971,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -8981,11 +8981,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8994,11 +8994,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9007,11 +9007,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9039,11 +9039,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9058,18 +9058,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -9079,25 +9079,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -9111,29 +9111,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -9142,7 +9142,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -9157,10 +9157,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -9169,7 +9169,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -9183,10 +9183,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -9195,7 +9195,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -9210,10 +9210,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -9222,7 +9222,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -9238,12 +9238,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9251,7 +9251,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -9261,11 +9261,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9274,11 +9274,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9287,11 +9287,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9319,11 +9319,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9338,18 +9338,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -9359,25 +9359,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -9391,29 +9391,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -9422,7 +9422,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -9437,10 +9437,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -9449,7 +9449,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -9463,10 +9463,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -9475,7 +9475,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -9489,10 +9489,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -9501,7 +9501,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -9517,12 +9517,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9530,21 +9530,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -9553,7 +9553,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -9567,7 +9567,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -9578,11 +9578,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9597,18 +9597,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -9618,25 +9618,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -9655,15 +9655,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -9672,7 +9672,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -9686,17 +9686,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9716,11 +9716,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9735,18 +9735,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -9756,25 +9756,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -9793,15 +9793,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -9810,7 +9810,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -9823,17 +9823,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9853,11 +9853,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9872,18 +9872,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -9893,25 +9893,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -9931,16 +9931,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -9949,7 +9949,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -9962,17 +9962,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -9981,11 +9981,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10009,11 +10009,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10028,18 +10028,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -10049,25 +10049,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -10090,11 +10090,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10103,11 +10103,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10119,11 +10119,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10132,11 +10132,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10145,11 +10145,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10158,11 +10158,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10189,18 +10189,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -10230,18 +10230,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -10255,7 +10255,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -10265,11 +10265,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10278,11 +10278,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10291,7 +10291,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -10305,11 +10305,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10324,18 +10324,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -10356,7 +10356,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -10370,11 +10370,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10389,7 +10389,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -10402,7 +10402,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -10441,18 +10441,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -10466,7 +10466,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -10476,11 +10476,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10489,11 +10489,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10505,14 +10505,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10520,11 +10520,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -10537,7 +10537,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -10553,11 +10553,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10584,18 +10584,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -10609,7 +10609,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -10622,14 +10622,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10637,11 +10637,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -10654,7 +10654,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -10670,11 +10670,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10698,11 +10698,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10717,18 +10717,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -10738,25 +10738,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -10770,7 +10770,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -10780,11 +10780,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10809,11 +10809,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10828,18 +10828,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -10849,25 +10849,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -10877,25 +10877,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -10909,29 +10909,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -10940,7 +10940,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -10955,10 +10955,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -10967,7 +10967,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -10982,10 +10982,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -10994,7 +10994,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -11009,10 +11009,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -11021,7 +11021,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -11035,10 +11035,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -11047,7 +11047,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -11063,12 +11063,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -11076,21 +11076,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -11099,7 +11099,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -11113,7 +11113,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -11124,11 +11124,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11143,18 +11143,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -11164,25 +11164,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -11201,15 +11201,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -11218,7 +11218,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -11232,17 +11232,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11262,11 +11262,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11281,18 +11281,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -11302,25 +11302,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -11339,15 +11339,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -11356,7 +11356,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -11369,17 +11369,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11399,11 +11399,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11418,18 +11418,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -11439,25 +11439,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -11477,16 +11477,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -11495,7 +11495,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -11508,17 +11508,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11527,11 +11527,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11555,11 +11555,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11574,18 +11574,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -11595,25 +11595,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -11636,11 +11636,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11649,11 +11649,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11665,11 +11665,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11678,11 +11678,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11691,11 +11691,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11704,11 +11704,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11735,18 +11735,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -11776,18 +11776,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -11801,21 +11801,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -11824,7 +11824,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -11837,17 +11837,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11856,11 +11856,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11879,18 +11879,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -11913,11 +11913,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11926,11 +11926,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11939,7 +11939,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -11953,11 +11953,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11972,18 +11972,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -12004,7 +12004,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -12018,11 +12018,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12037,7 +12037,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -12050,7 +12050,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -12089,18 +12089,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -12114,7 +12114,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -12124,11 +12124,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12137,11 +12137,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12153,14 +12153,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12168,11 +12168,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -12185,7 +12185,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -12201,11 +12201,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12232,18 +12232,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -12257,7 +12257,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -12270,14 +12270,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12285,11 +12285,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -12302,7 +12302,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -12318,11 +12318,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12346,11 +12346,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12365,18 +12365,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -12386,25 +12386,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -12418,29 +12418,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -12449,7 +12449,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -12464,10 +12464,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -12476,7 +12476,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -12491,10 +12491,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -12503,7 +12503,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -12518,10 +12518,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -12530,7 +12530,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -12544,10 +12544,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -12556,7 +12556,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -12572,19 +12572,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -12594,35 +12594,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -12634,9 +12634,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -12648,9 +12648,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -12658,22 +12658,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -12682,7 +12682,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -12697,10 +12697,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -12709,7 +12709,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -12725,12 +12725,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12739,22 +12739,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -12763,7 +12763,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -12778,10 +12778,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -12790,7 +12790,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -12806,12 +12806,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12820,22 +12820,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -12844,7 +12844,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -12859,10 +12859,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -12871,7 +12871,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -12886,10 +12886,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -12898,7 +12898,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -12914,12 +12914,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12928,25 +12928,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -12955,22 +12955,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -12979,7 +12979,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -12995,19 +12995,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -13016,9 +13016,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -13026,22 +13026,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -13050,7 +13050,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -13065,10 +13065,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -13077,7 +13077,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -13091,10 +13091,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -13103,7 +13103,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -13120,15 +13120,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -13137,7 +13137,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -13152,7 +13152,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -13161,22 +13161,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -13185,7 +13185,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -13201,15 +13201,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -13218,7 +13218,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -13233,7 +13233,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -13242,22 +13242,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -13266,7 +13266,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -13282,15 +13282,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -13299,7 +13299,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -13315,7 +13315,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -13324,22 +13324,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -13348,7 +13348,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -13364,15 +13364,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -13381,7 +13381,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -13397,7 +13397,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -13406,28 +13406,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -13436,7 +13436,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -13452,7 +13452,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -13461,22 +13461,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -13485,7 +13485,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -13499,10 +13499,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -13511,7 +13511,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -13528,15 +13528,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -13545,7 +13545,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -13560,7 +13560,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13569,22 +13569,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -13593,7 +13593,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -13607,10 +13607,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -13619,7 +13619,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -13636,12 +13636,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13650,22 +13650,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -13674,7 +13674,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -13688,10 +13688,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -13700,7 +13700,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -13715,10 +13715,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -13727,7 +13727,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -13743,12 +13743,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13757,22 +13757,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -13781,7 +13781,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -13796,10 +13796,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -13808,7 +13808,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -13824,12 +13824,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13838,22 +13838,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -13862,7 +13862,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -13876,10 +13876,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -13888,7 +13888,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -13902,10 +13902,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -13914,7 +13914,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -13930,12 +13930,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13944,22 +13944,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -13968,7 +13968,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -13982,10 +13982,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -13994,7 +13994,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -14009,10 +14009,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -14021,7 +14021,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -14037,12 +14037,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14051,22 +14051,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -14075,7 +14075,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -14089,10 +14089,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -14101,7 +14101,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -14116,10 +14116,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -14128,7 +14128,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -14144,12 +14144,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14158,22 +14158,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -14182,7 +14182,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -14197,10 +14197,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -14209,7 +14209,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -14223,10 +14223,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -14235,7 +14235,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -14250,10 +14250,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -14262,7 +14262,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -14278,12 +14278,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14292,22 +14292,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -14316,7 +14316,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -14330,10 +14330,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -14342,7 +14342,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -14359,12 +14359,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14373,22 +14373,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -14397,7 +14397,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -14412,10 +14412,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -14424,7 +14424,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -14440,12 +14440,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14454,22 +14454,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -14478,7 +14478,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -14492,10 +14492,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -14504,7 +14504,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -14520,19 +14520,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -14541,9 +14541,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -14551,22 +14551,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -14575,7 +14575,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -14590,10 +14590,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -14602,7 +14602,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -14619,15 +14619,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -14636,7 +14636,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -14651,7 +14651,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -14660,22 +14660,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -14684,7 +14684,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -14700,15 +14700,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -14717,7 +14717,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -14731,10 +14731,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -14743,7 +14743,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -14757,10 +14757,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -14769,7 +14769,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -14783,10 +14783,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -14795,7 +14795,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -14809,10 +14809,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -14821,7 +14821,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -14836,7 +14836,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -14845,22 +14845,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -14869,7 +14869,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -14886,15 +14886,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -14903,7 +14903,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -14918,7 +14918,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -14927,22 +14927,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -14951,7 +14951,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -14965,10 +14965,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -14977,7 +14977,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -14994,15 +14994,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -15011,7 +15011,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -15025,10 +15025,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -15037,7 +15037,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -15052,7 +15052,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -15061,22 +15061,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -15085,7 +15085,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -15099,10 +15099,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -15111,7 +15111,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -15126,10 +15126,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -15138,7 +15138,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -15153,10 +15153,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -15165,7 +15165,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -15180,10 +15180,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -15192,7 +15192,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -15206,10 +15206,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -15218,7 +15218,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -15234,12 +15234,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15248,22 +15248,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -15272,7 +15272,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -15289,12 +15289,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15303,22 +15303,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -15327,7 +15327,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -15342,10 +15342,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -15354,7 +15354,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -15369,10 +15369,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -15381,7 +15381,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -15397,19 +15397,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -15418,9 +15418,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -15428,28 +15428,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -15458,7 +15458,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -15473,7 +15473,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15482,44 +15482,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15529,7 +15529,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15538,22 +15538,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -15562,7 +15562,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -15577,10 +15577,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -15589,7 +15589,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -15605,12 +15605,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -15619,22 +15619,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -15643,7 +15643,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -15658,10 +15658,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -15670,7 +15670,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -15686,19 +15686,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -15707,9 +15707,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -15717,44 +15717,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -15764,7 +15764,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15773,44 +15773,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15820,7 +15820,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15829,22 +15829,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -15853,7 +15853,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -15868,10 +15868,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -15880,7 +15880,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -15896,12 +15896,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -15910,22 +15910,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -15934,7 +15934,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -15949,10 +15949,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -15961,7 +15961,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -15977,19 +15977,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -15998,9 +15998,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -16008,22 +16008,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -16032,7 +16032,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -16048,15 +16048,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -16065,7 +16065,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -16080,14 +16080,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -16096,19 +16096,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -16117,7 +16117,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -16132,7 +16132,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -16140,7 +16140,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -16160,7 +16160,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -16185,7 +16185,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -16199,7 +16199,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -16210,18 +16210,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16233,7 +16233,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -16262,7 +16262,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -16273,7 +16273,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -16283,18 +16283,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16309,18 +16309,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16331,11 +16331,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16355,7 +16355,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -16372,11 +16372,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16393,11 +16393,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16419,7 +16419,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -16446,21 +16446,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -16474,29 +16474,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -16505,7 +16505,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -16519,10 +16519,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -16531,7 +16531,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -16547,15 +16547,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -16564,7 +16564,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -16579,7 +16579,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -16587,7 +16587,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -16597,11 +16597,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16610,11 +16610,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16643,11 +16643,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16662,18 +16662,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -16683,25 +16683,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -16711,25 +16711,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -16743,7 +16743,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -16753,11 +16753,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16766,11 +16766,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16794,11 +16794,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16813,18 +16813,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -16834,25 +16834,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -16866,29 +16866,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -16897,7 +16897,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -16912,10 +16912,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -16924,7 +16924,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -16939,10 +16939,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -16951,7 +16951,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -16967,19 +16967,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -16988,38 +16988,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -17033,7 +17033,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -17043,18 +17043,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17069,18 +17069,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17091,11 +17091,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17115,7 +17115,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -17132,11 +17132,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17152,7 +17152,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -17179,21 +17179,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -17207,29 +17207,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -17238,7 +17238,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -17252,10 +17252,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -17264,7 +17264,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -17280,15 +17280,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -17297,7 +17297,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -17312,7 +17312,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -17320,25 +17320,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17352,11 +17352,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17371,7 +17371,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -17384,7 +17384,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -17404,7 +17404,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -17418,18 +17418,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17441,7 +17441,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -17465,7 +17465,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -17492,21 +17492,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -17520,29 +17520,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -17551,7 +17551,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -17567,15 +17567,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -17584,7 +17584,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -17599,7 +17599,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -17607,25 +17607,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17639,11 +17639,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17656,7 +17656,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -17664,7 +17664,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -17684,7 +17684,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -17717,18 +17717,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -17748,29 +17748,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -17779,7 +17779,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -17795,15 +17795,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -17812,7 +17812,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -17827,7 +17827,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -17835,25 +17835,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17867,11 +17867,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17884,7 +17884,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -17892,7 +17892,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -17918,7 +17918,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -17926,7 +17926,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -17953,11 +17953,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -17972,18 +17972,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -17993,25 +17993,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -18032,7 +18032,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18063,18 +18063,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -18094,29 +18094,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -18125,7 +18125,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -18140,10 +18140,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -18152,7 +18152,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -18168,15 +18168,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -18185,7 +18185,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -18200,7 +18200,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18208,25 +18208,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18241,18 +18241,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18270,7 +18270,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -18278,7 +18278,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -18304,7 +18304,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -18312,7 +18312,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -18339,11 +18339,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18358,18 +18358,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -18379,25 +18379,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -18418,7 +18418,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18438,7 +18438,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18463,29 +18463,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -18494,7 +18494,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -18509,10 +18509,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -18521,7 +18521,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -18537,15 +18537,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -18554,7 +18554,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -18569,7 +18569,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18577,21 +18577,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -18600,7 +18600,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -18613,17 +18613,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -18643,11 +18643,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18662,18 +18662,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -18683,25 +18683,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -18720,15 +18720,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -18737,7 +18737,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -18750,17 +18750,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18780,11 +18780,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18799,18 +18799,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -18820,25 +18820,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -18862,18 +18862,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18887,11 +18887,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18900,11 +18900,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18923,18 +18923,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -18955,29 +18955,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -18995,7 +18995,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -19008,11 +19008,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19021,11 +19021,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19044,18 +19044,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -19071,11 +19071,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19094,18 +19094,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -19123,11 +19123,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19148,18 +19148,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -19179,25 +19179,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19214,7 +19214,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -19227,11 +19227,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19246,7 +19246,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -19259,7 +19259,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -19275,11 +19275,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19298,18 +19298,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -19330,11 +19330,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19343,11 +19343,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19366,18 +19366,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -19399,18 +19399,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -19423,18 +19423,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19446,7 +19446,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -19478,7 +19478,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -19488,22 +19488,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -19512,7 +19512,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -19527,10 +19527,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -19539,7 +19539,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -19554,10 +19554,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -19566,7 +19566,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -19581,10 +19581,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -19593,7 +19593,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -19607,10 +19607,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -19619,7 +19619,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -19635,15 +19635,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -19652,7 +19652,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -19667,7 +19667,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -19675,14 +19675,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -19691,10 +19691,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -19703,7 +19703,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -19719,17 +19719,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -19749,11 +19749,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19768,18 +19768,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -19789,25 +19789,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -19827,16 +19827,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -19845,7 +19845,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -19858,17 +19858,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -19877,11 +19877,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19905,11 +19905,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19924,18 +19924,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -19945,25 +19945,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -19982,15 +19982,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -19999,7 +19999,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -20012,17 +20012,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20042,11 +20042,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20061,18 +20061,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -20082,25 +20082,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -20119,15 +20119,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -20136,7 +20136,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -20149,7 +20149,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -20158,11 +20158,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20171,11 +20171,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20194,18 +20194,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -20221,11 +20221,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20244,18 +20244,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -20275,18 +20275,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20301,18 +20301,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20323,11 +20323,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20346,25 +20346,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20381,7 +20381,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -20391,11 +20391,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20404,11 +20404,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20427,18 +20427,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -20456,11 +20456,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20475,18 +20475,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -20499,18 +20499,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20522,7 +20522,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -20554,29 +20554,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -20585,7 +20585,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -20600,10 +20600,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -20612,7 +20612,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -20627,10 +20627,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -20639,7 +20639,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -20654,10 +20654,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -20666,7 +20666,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -20682,15 +20682,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -20699,7 +20699,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -20714,7 +20714,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -20722,25 +20722,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20754,11 +20754,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -20767,11 +20767,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20795,11 +20795,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20814,18 +20814,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -20835,25 +20835,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -20873,29 +20873,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -20904,7 +20904,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -20919,10 +20919,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -20931,7 +20931,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -20945,10 +20945,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -20957,7 +20957,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -20974,15 +20974,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -20991,7 +20991,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -21006,7 +21006,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21014,7 +21014,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -21024,11 +21024,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21037,11 +21037,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21065,11 +21065,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21084,18 +21084,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -21105,25 +21105,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -21137,29 +21137,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -21168,7 +21168,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -21183,10 +21183,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -21195,7 +21195,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -21209,10 +21209,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -21221,7 +21221,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -21238,12 +21238,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21251,7 +21251,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -21261,11 +21261,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21274,11 +21274,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21287,11 +21287,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21319,11 +21319,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21338,18 +21338,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -21359,25 +21359,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -21391,29 +21391,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -21422,7 +21422,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -21437,10 +21437,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -21449,7 +21449,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -21463,10 +21463,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -21475,7 +21475,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -21490,10 +21490,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -21502,7 +21502,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -21518,12 +21518,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21531,7 +21531,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -21541,11 +21541,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21554,11 +21554,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21567,11 +21567,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21599,11 +21599,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21618,18 +21618,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -21639,25 +21639,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -21671,29 +21671,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -21702,7 +21702,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -21717,10 +21717,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -21729,7 +21729,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -21743,10 +21743,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -21755,7 +21755,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -21770,10 +21770,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -21782,7 +21782,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -21798,12 +21798,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21811,7 +21811,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -21821,11 +21821,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21834,11 +21834,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -21847,11 +21847,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -21879,11 +21879,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21898,18 +21898,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -21919,25 +21919,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -21951,29 +21951,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -21982,7 +21982,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -21997,10 +21997,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -22009,7 +22009,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -22023,10 +22023,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -22035,7 +22035,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -22049,10 +22049,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -22061,7 +22061,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -22077,12 +22077,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -22090,21 +22090,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -22113,7 +22113,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -22127,7 +22127,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -22138,11 +22138,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22157,18 +22157,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -22178,25 +22178,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -22215,15 +22215,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -22232,7 +22232,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -22246,17 +22246,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22276,11 +22276,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22295,18 +22295,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -22316,25 +22316,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -22353,15 +22353,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -22370,7 +22370,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -22383,17 +22383,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22413,11 +22413,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22432,18 +22432,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -22453,25 +22453,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -22491,16 +22491,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -22509,7 +22509,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -22522,17 +22522,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22541,11 +22541,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22569,11 +22569,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22588,18 +22588,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -22609,25 +22609,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -22650,11 +22650,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22663,11 +22663,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22679,11 +22679,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22692,11 +22692,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22705,11 +22705,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22718,11 +22718,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22749,18 +22749,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -22790,18 +22790,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -22815,7 +22815,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -22825,11 +22825,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22838,11 +22838,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22851,7 +22851,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -22865,11 +22865,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22884,18 +22884,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -22916,7 +22916,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -22930,11 +22930,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22949,7 +22949,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -22962,7 +22962,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -23001,18 +23001,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -23026,7 +23026,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -23036,11 +23036,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23049,11 +23049,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23065,14 +23065,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23080,11 +23080,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -23097,7 +23097,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -23113,11 +23113,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23144,18 +23144,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -23169,7 +23169,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -23182,14 +23182,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23197,11 +23197,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -23214,7 +23214,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -23230,11 +23230,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23258,11 +23258,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23277,18 +23277,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -23298,25 +23298,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -23330,7 +23330,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -23340,11 +23340,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23369,11 +23369,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23388,18 +23388,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -23409,25 +23409,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -23437,25 +23437,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -23469,29 +23469,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -23500,7 +23500,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -23515,10 +23515,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -23527,7 +23527,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -23542,10 +23542,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -23554,7 +23554,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -23569,10 +23569,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -23581,7 +23581,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -23595,10 +23595,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -23607,7 +23607,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -23623,12 +23623,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -23636,21 +23636,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -23659,7 +23659,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -23673,7 +23673,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -23684,11 +23684,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23703,18 +23703,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -23724,25 +23724,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -23761,15 +23761,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -23778,7 +23778,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -23792,17 +23792,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23822,11 +23822,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23841,18 +23841,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -23862,25 +23862,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -23899,15 +23899,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -23916,7 +23916,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -23929,17 +23929,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23959,11 +23959,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23978,18 +23978,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -23999,25 +23999,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -24037,16 +24037,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -24055,7 +24055,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -24068,17 +24068,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24087,11 +24087,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24115,11 +24115,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24134,18 +24134,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -24155,25 +24155,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -24196,11 +24196,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24209,11 +24209,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24225,11 +24225,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24238,11 +24238,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24251,11 +24251,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24264,11 +24264,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24295,18 +24295,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -24336,18 +24336,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -24361,21 +24361,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -24384,7 +24384,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -24397,17 +24397,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24416,11 +24416,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24439,18 +24439,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -24473,11 +24473,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24486,11 +24486,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24499,7 +24499,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -24513,11 +24513,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24532,18 +24532,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -24564,7 +24564,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -24578,11 +24578,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24597,7 +24597,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -24610,7 +24610,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -24649,18 +24649,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -24674,7 +24674,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -24684,11 +24684,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24697,11 +24697,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24713,14 +24713,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -24728,11 +24728,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -24745,7 +24745,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -24761,11 +24761,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24792,18 +24792,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -24817,7 +24817,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -24830,14 +24830,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -24845,11 +24845,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -24862,7 +24862,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -24878,11 +24878,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24906,11 +24906,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24925,18 +24925,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -24946,25 +24946,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -24978,29 +24978,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -25009,7 +25009,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -25024,10 +25024,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -25036,7 +25036,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -25051,10 +25051,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -25063,7 +25063,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -25078,10 +25078,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -25090,7 +25090,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -25104,10 +25104,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -25116,7 +25116,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -25132,19 +25132,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -25156,7 +25156,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.585Z", + "updatedAt": "2020-04-08T12:21:13.841Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/ManagerLike.json b/packages/smart-contracts/artifacts/ManagerLike.json index 401f7d7..3df08c3 100644 --- a/packages/smart-contracts/artifacts/ManagerLike.json +++ b/packages/smart-contracts/artifacts/ManagerLike.json @@ -378,35 +378,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -418,9 +418,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -432,9 +432,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -442,22 +442,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -466,7 +466,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -481,10 +481,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -493,7 +493,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -509,12 +509,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -523,22 +523,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -547,7 +547,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -562,10 +562,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -574,7 +574,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -590,12 +590,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -604,22 +604,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -628,7 +628,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -643,10 +643,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -655,7 +655,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -670,10 +670,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -682,7 +682,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -698,12 +698,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -712,25 +712,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -739,22 +739,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -763,7 +763,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -779,19 +779,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -800,9 +800,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -810,22 +810,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -834,7 +834,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -849,10 +849,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -861,7 +861,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -875,10 +875,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -887,7 +887,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -904,15 +904,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -921,7 +921,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -936,7 +936,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -945,22 +945,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -969,7 +969,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -985,15 +985,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -1002,7 +1002,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -1017,7 +1017,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -1026,22 +1026,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -1050,7 +1050,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -1066,15 +1066,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -1083,7 +1083,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -1099,7 +1099,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -1108,22 +1108,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -1132,7 +1132,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -1148,15 +1148,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -1165,7 +1165,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -1181,7 +1181,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -1190,28 +1190,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -1220,7 +1220,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -1236,7 +1236,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -1245,22 +1245,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -1269,7 +1269,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -1283,10 +1283,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -1295,7 +1295,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -1312,15 +1312,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -1329,7 +1329,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -1344,7 +1344,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1353,22 +1353,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -1377,7 +1377,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -1391,10 +1391,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -1403,7 +1403,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -1420,12 +1420,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1434,22 +1434,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -1458,7 +1458,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -1472,10 +1472,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -1484,7 +1484,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -1499,10 +1499,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -1511,7 +1511,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -1527,12 +1527,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1541,22 +1541,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -1565,7 +1565,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -1580,10 +1580,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -1592,7 +1592,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -1608,12 +1608,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1622,22 +1622,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -1646,7 +1646,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -1660,10 +1660,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -1672,7 +1672,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -1686,10 +1686,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -1698,7 +1698,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -1714,12 +1714,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1728,22 +1728,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -1752,7 +1752,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -1766,10 +1766,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -1778,7 +1778,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -1793,10 +1793,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -1805,7 +1805,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -1821,12 +1821,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1835,22 +1835,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -1859,7 +1859,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -1873,10 +1873,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -1885,7 +1885,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -1900,10 +1900,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -1912,7 +1912,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -1928,12 +1928,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1942,22 +1942,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -1966,7 +1966,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -1981,10 +1981,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -1993,7 +1993,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -2007,10 +2007,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -2019,7 +2019,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -2034,10 +2034,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -2046,7 +2046,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -2062,12 +2062,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2076,22 +2076,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -2100,7 +2100,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -2114,10 +2114,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -2126,7 +2126,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -2143,12 +2143,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2157,22 +2157,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -2181,7 +2181,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -2196,10 +2196,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -2208,7 +2208,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -2224,12 +2224,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2238,22 +2238,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -2262,7 +2262,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -2276,10 +2276,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -2288,7 +2288,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -2304,19 +2304,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -2325,9 +2325,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -2335,22 +2335,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -2359,7 +2359,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -2374,10 +2374,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -2386,7 +2386,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -2403,15 +2403,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -2420,7 +2420,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -2435,7 +2435,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -2444,22 +2444,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -2468,7 +2468,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -2484,15 +2484,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -2501,7 +2501,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -2515,10 +2515,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -2527,7 +2527,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -2541,10 +2541,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -2553,7 +2553,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -2567,10 +2567,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -2579,7 +2579,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -2593,10 +2593,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -2605,7 +2605,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -2620,7 +2620,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -2629,22 +2629,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -2653,7 +2653,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -2670,15 +2670,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -2687,7 +2687,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -2702,7 +2702,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -2711,22 +2711,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -2735,7 +2735,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -2749,10 +2749,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -2761,7 +2761,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -2778,15 +2778,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -2795,7 +2795,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -2809,10 +2809,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -2821,7 +2821,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -2836,7 +2836,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -2845,22 +2845,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -2869,7 +2869,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -2883,10 +2883,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -2895,7 +2895,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -2910,10 +2910,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -2922,7 +2922,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -2937,10 +2937,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -2949,7 +2949,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -2964,10 +2964,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -2976,7 +2976,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -2990,10 +2990,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -3002,7 +3002,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -3018,12 +3018,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3032,22 +3032,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -3056,7 +3056,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -3073,12 +3073,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3087,22 +3087,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -3111,7 +3111,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -3126,10 +3126,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -3138,7 +3138,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -3153,10 +3153,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -3165,7 +3165,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -3181,19 +3181,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -3202,9 +3202,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -3212,28 +3212,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -3242,7 +3242,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -3257,7 +3257,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3266,44 +3266,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3313,7 +3313,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3322,22 +3322,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -3346,7 +3346,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -3361,10 +3361,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -3373,7 +3373,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -3389,12 +3389,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -3403,22 +3403,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -3427,7 +3427,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -3442,10 +3442,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -3454,7 +3454,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -3470,19 +3470,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -3491,9 +3491,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -3501,44 +3501,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -3548,7 +3548,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3557,44 +3557,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3604,7 +3604,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3613,22 +3613,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -3637,7 +3637,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -3652,10 +3652,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -3664,7 +3664,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -3680,12 +3680,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -3694,22 +3694,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -3718,7 +3718,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -3733,10 +3733,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -3745,7 +3745,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -3761,19 +3761,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -3782,9 +3782,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -3792,22 +3792,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -3816,7 +3816,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -3832,15 +3832,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -3849,7 +3849,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -3864,14 +3864,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -3880,19 +3880,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -3901,7 +3901,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -3916,7 +3916,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -3924,7 +3924,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -3944,7 +3944,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -3969,7 +3969,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -3983,7 +3983,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -3994,18 +3994,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4017,7 +4017,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -4046,7 +4046,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -4057,7 +4057,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -4067,18 +4067,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4093,18 +4093,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4115,11 +4115,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4139,7 +4139,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4156,11 +4156,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4177,11 +4177,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4203,7 +4203,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -4230,21 +4230,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -4258,29 +4258,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -4289,7 +4289,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -4303,10 +4303,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -4315,7 +4315,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -4331,15 +4331,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -4348,7 +4348,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -4363,7 +4363,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -4371,7 +4371,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -4381,11 +4381,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4394,11 +4394,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4427,11 +4427,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4446,18 +4446,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -4467,25 +4467,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -4495,25 +4495,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -4527,7 +4527,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -4537,11 +4537,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4550,11 +4550,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4578,11 +4578,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4597,18 +4597,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -4618,25 +4618,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -4650,29 +4650,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -4681,7 +4681,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -4696,10 +4696,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -4708,7 +4708,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -4723,10 +4723,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -4735,7 +4735,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -4751,19 +4751,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -4772,38 +4772,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -4817,7 +4817,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -4827,18 +4827,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4853,18 +4853,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4875,11 +4875,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4899,7 +4899,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4916,11 +4916,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4936,7 +4936,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -4963,21 +4963,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -4991,29 +4991,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -5022,7 +5022,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -5036,10 +5036,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -5048,7 +5048,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -5064,15 +5064,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -5081,7 +5081,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -5096,7 +5096,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -5104,25 +5104,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -5136,11 +5136,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5155,7 +5155,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -5168,7 +5168,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -5188,7 +5188,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -5202,18 +5202,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -5225,7 +5225,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -5249,7 +5249,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -5276,21 +5276,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -5304,29 +5304,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -5335,7 +5335,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -5351,15 +5351,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -5368,7 +5368,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -5383,7 +5383,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -5391,25 +5391,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5423,11 +5423,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5440,7 +5440,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -5448,7 +5448,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -5468,7 +5468,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -5501,18 +5501,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -5532,29 +5532,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -5563,7 +5563,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -5579,15 +5579,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -5596,7 +5596,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -5611,7 +5611,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -5619,25 +5619,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5651,11 +5651,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5668,7 +5668,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -5676,7 +5676,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -5702,7 +5702,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -5710,7 +5710,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -5737,11 +5737,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5756,18 +5756,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -5777,25 +5777,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -5816,7 +5816,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5847,18 +5847,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -5878,29 +5878,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -5909,7 +5909,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -5924,10 +5924,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -5936,7 +5936,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -5952,15 +5952,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -5969,7 +5969,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -5984,7 +5984,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -5992,25 +5992,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6025,18 +6025,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6054,7 +6054,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -6062,7 +6062,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -6088,7 +6088,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -6096,7 +6096,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -6123,11 +6123,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6142,18 +6142,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -6163,25 +6163,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -6202,7 +6202,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -6222,7 +6222,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -6247,29 +6247,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -6278,7 +6278,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -6293,10 +6293,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -6305,7 +6305,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -6321,15 +6321,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -6338,7 +6338,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -6353,7 +6353,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -6361,21 +6361,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -6384,7 +6384,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -6397,17 +6397,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6427,11 +6427,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6446,18 +6446,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -6467,25 +6467,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -6504,15 +6504,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -6521,7 +6521,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -6534,17 +6534,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6564,11 +6564,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6583,18 +6583,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -6604,25 +6604,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -6646,18 +6646,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6671,11 +6671,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6684,11 +6684,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6707,18 +6707,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -6739,29 +6739,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6779,7 +6779,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -6792,11 +6792,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6805,11 +6805,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6828,18 +6828,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -6855,11 +6855,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6878,18 +6878,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -6907,11 +6907,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6932,18 +6932,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -6963,25 +6963,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6998,7 +6998,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -7011,11 +7011,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -7030,7 +7030,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -7043,7 +7043,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -7059,11 +7059,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7082,18 +7082,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -7114,11 +7114,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7127,11 +7127,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7150,18 +7150,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -7183,18 +7183,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -7207,18 +7207,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -7230,7 +7230,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -7262,7 +7262,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -7272,22 +7272,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -7296,7 +7296,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -7311,10 +7311,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -7323,7 +7323,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -7338,10 +7338,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -7350,7 +7350,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -7365,10 +7365,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -7377,7 +7377,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -7391,10 +7391,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -7403,7 +7403,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -7419,15 +7419,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -7436,7 +7436,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -7451,7 +7451,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -7459,14 +7459,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -7475,10 +7475,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -7487,7 +7487,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -7503,17 +7503,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7533,11 +7533,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7552,18 +7552,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -7573,25 +7573,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -7611,16 +7611,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -7629,7 +7629,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -7642,17 +7642,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7661,11 +7661,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7689,11 +7689,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7708,18 +7708,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -7729,25 +7729,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -7766,15 +7766,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -7783,7 +7783,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -7796,17 +7796,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7826,11 +7826,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7845,18 +7845,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -7866,25 +7866,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -7903,15 +7903,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -7920,7 +7920,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -7933,7 +7933,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7942,11 +7942,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7955,11 +7955,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7978,18 +7978,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -8005,11 +8005,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8028,18 +8028,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -8059,18 +8059,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8085,18 +8085,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8107,11 +8107,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8130,25 +8130,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8165,7 +8165,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -8175,11 +8175,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8188,11 +8188,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8211,18 +8211,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -8240,11 +8240,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8259,18 +8259,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -8283,18 +8283,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8306,7 +8306,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -8338,29 +8338,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -8369,7 +8369,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -8384,10 +8384,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -8396,7 +8396,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -8411,10 +8411,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -8423,7 +8423,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -8438,10 +8438,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -8450,7 +8450,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -8466,15 +8466,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -8483,7 +8483,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -8498,7 +8498,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -8506,25 +8506,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8538,11 +8538,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -8551,11 +8551,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8579,11 +8579,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8598,18 +8598,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -8619,25 +8619,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -8657,29 +8657,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -8688,7 +8688,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -8703,10 +8703,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -8715,7 +8715,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -8729,10 +8729,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -8741,7 +8741,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -8758,15 +8758,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -8775,7 +8775,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -8790,7 +8790,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8798,7 +8798,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -8808,11 +8808,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8821,11 +8821,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8849,11 +8849,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8868,18 +8868,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -8889,25 +8889,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -8921,29 +8921,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -8952,7 +8952,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -8967,10 +8967,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -8979,7 +8979,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -8993,10 +8993,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -9005,7 +9005,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -9022,12 +9022,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9035,7 +9035,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -9045,11 +9045,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9058,11 +9058,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9071,11 +9071,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9103,11 +9103,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9122,18 +9122,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -9143,25 +9143,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -9175,29 +9175,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -9206,7 +9206,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -9221,10 +9221,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -9233,7 +9233,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -9247,10 +9247,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -9259,7 +9259,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -9274,10 +9274,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -9286,7 +9286,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -9302,12 +9302,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9315,7 +9315,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -9325,11 +9325,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9338,11 +9338,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9351,11 +9351,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9383,11 +9383,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9402,18 +9402,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -9423,25 +9423,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -9455,29 +9455,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -9486,7 +9486,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -9501,10 +9501,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -9513,7 +9513,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -9527,10 +9527,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -9539,7 +9539,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -9554,10 +9554,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -9566,7 +9566,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -9582,12 +9582,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9595,7 +9595,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -9605,11 +9605,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9618,11 +9618,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9631,11 +9631,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9663,11 +9663,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9682,18 +9682,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -9703,25 +9703,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -9735,29 +9735,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -9766,7 +9766,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -9781,10 +9781,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -9793,7 +9793,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -9807,10 +9807,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -9819,7 +9819,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -9833,10 +9833,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -9845,7 +9845,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -9861,12 +9861,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9874,21 +9874,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -9897,7 +9897,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -9911,7 +9911,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -9922,11 +9922,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9941,18 +9941,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -9962,25 +9962,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -9999,15 +9999,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -10016,7 +10016,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -10030,17 +10030,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10060,11 +10060,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10079,18 +10079,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -10100,25 +10100,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -10137,15 +10137,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -10154,7 +10154,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -10167,17 +10167,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10197,11 +10197,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10216,18 +10216,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -10237,25 +10237,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -10275,16 +10275,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -10293,7 +10293,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -10306,17 +10306,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10325,11 +10325,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10353,11 +10353,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10372,18 +10372,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -10393,25 +10393,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -10434,11 +10434,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10447,11 +10447,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10463,11 +10463,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10476,11 +10476,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10489,11 +10489,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10502,11 +10502,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10533,18 +10533,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -10574,18 +10574,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -10599,7 +10599,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -10609,11 +10609,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10622,11 +10622,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10635,7 +10635,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -10649,11 +10649,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10668,18 +10668,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -10700,7 +10700,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -10714,11 +10714,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10733,7 +10733,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -10746,7 +10746,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -10785,18 +10785,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -10810,7 +10810,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -10820,11 +10820,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10833,11 +10833,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10849,14 +10849,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10864,11 +10864,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -10881,7 +10881,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -10897,11 +10897,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10928,18 +10928,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -10953,7 +10953,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -10966,14 +10966,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10981,11 +10981,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -10998,7 +10998,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -11014,11 +11014,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11042,11 +11042,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11061,18 +11061,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -11082,25 +11082,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -11114,7 +11114,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -11124,11 +11124,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11153,11 +11153,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11172,18 +11172,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -11193,25 +11193,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -11221,25 +11221,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -11253,29 +11253,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -11284,7 +11284,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -11299,10 +11299,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -11311,7 +11311,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -11326,10 +11326,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -11338,7 +11338,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -11353,10 +11353,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -11365,7 +11365,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -11379,10 +11379,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -11391,7 +11391,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -11407,12 +11407,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -11420,21 +11420,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -11443,7 +11443,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -11457,7 +11457,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -11468,11 +11468,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11487,18 +11487,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -11508,25 +11508,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -11545,15 +11545,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -11562,7 +11562,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -11576,17 +11576,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11606,11 +11606,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11625,18 +11625,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -11646,25 +11646,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -11683,15 +11683,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -11700,7 +11700,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -11713,17 +11713,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11743,11 +11743,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11762,18 +11762,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -11783,25 +11783,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -11821,16 +11821,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -11839,7 +11839,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -11852,17 +11852,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11871,11 +11871,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11899,11 +11899,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11918,18 +11918,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -11939,25 +11939,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -11980,11 +11980,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11993,11 +11993,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12009,11 +12009,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12022,11 +12022,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12035,11 +12035,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12048,11 +12048,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -12079,18 +12079,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -12120,18 +12120,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -12145,21 +12145,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -12168,7 +12168,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -12181,17 +12181,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12200,11 +12200,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12223,18 +12223,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -12257,11 +12257,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12270,11 +12270,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12283,7 +12283,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -12297,11 +12297,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12316,18 +12316,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -12348,7 +12348,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -12362,11 +12362,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12381,7 +12381,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -12394,7 +12394,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -12433,18 +12433,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -12458,7 +12458,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -12468,11 +12468,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12481,11 +12481,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12497,14 +12497,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12512,11 +12512,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -12529,7 +12529,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -12545,11 +12545,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12576,18 +12576,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -12601,7 +12601,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -12614,14 +12614,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12629,11 +12629,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -12646,7 +12646,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -12662,11 +12662,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12690,11 +12690,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12709,18 +12709,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -12730,25 +12730,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -12762,29 +12762,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -12793,7 +12793,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -12808,10 +12808,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -12820,7 +12820,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -12835,10 +12835,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -12847,7 +12847,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -12862,10 +12862,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -12874,7 +12874,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -12888,10 +12888,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -12900,7 +12900,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -12916,19 +12916,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -12938,35 +12938,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -12978,9 +12978,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -12992,9 +12992,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -13002,22 +13002,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -13026,7 +13026,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -13041,10 +13041,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -13053,7 +13053,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -13069,12 +13069,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13083,22 +13083,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -13107,7 +13107,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -13122,10 +13122,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -13134,7 +13134,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -13150,12 +13150,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13164,22 +13164,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -13188,7 +13188,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -13203,10 +13203,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -13215,7 +13215,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -13230,10 +13230,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -13242,7 +13242,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -13258,12 +13258,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13272,25 +13272,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -13299,22 +13299,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -13323,7 +13323,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -13339,19 +13339,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -13360,9 +13360,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -13370,22 +13370,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -13394,7 +13394,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -13409,10 +13409,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -13421,7 +13421,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -13435,10 +13435,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -13447,7 +13447,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -13464,15 +13464,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -13481,7 +13481,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -13496,7 +13496,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -13505,22 +13505,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -13529,7 +13529,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -13545,15 +13545,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -13562,7 +13562,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -13577,7 +13577,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -13586,22 +13586,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -13610,7 +13610,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -13626,15 +13626,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -13643,7 +13643,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -13659,7 +13659,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -13668,22 +13668,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -13692,7 +13692,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -13708,15 +13708,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -13725,7 +13725,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -13741,7 +13741,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -13750,28 +13750,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -13780,7 +13780,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -13796,7 +13796,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -13805,22 +13805,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -13829,7 +13829,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -13843,10 +13843,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -13855,7 +13855,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -13872,15 +13872,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -13889,7 +13889,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -13904,7 +13904,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13913,22 +13913,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -13937,7 +13937,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -13951,10 +13951,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -13963,7 +13963,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -13980,12 +13980,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13994,22 +13994,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -14018,7 +14018,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -14032,10 +14032,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -14044,7 +14044,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -14059,10 +14059,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -14071,7 +14071,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -14087,12 +14087,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14101,22 +14101,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -14125,7 +14125,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -14140,10 +14140,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -14152,7 +14152,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -14168,12 +14168,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14182,22 +14182,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -14206,7 +14206,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -14220,10 +14220,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -14232,7 +14232,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -14246,10 +14246,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -14258,7 +14258,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -14274,12 +14274,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14288,22 +14288,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -14312,7 +14312,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -14326,10 +14326,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -14338,7 +14338,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -14353,10 +14353,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -14365,7 +14365,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -14381,12 +14381,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14395,22 +14395,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -14419,7 +14419,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -14433,10 +14433,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -14445,7 +14445,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -14460,10 +14460,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -14472,7 +14472,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -14488,12 +14488,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14502,22 +14502,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -14526,7 +14526,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -14541,10 +14541,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -14553,7 +14553,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -14567,10 +14567,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -14579,7 +14579,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -14594,10 +14594,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -14606,7 +14606,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -14622,12 +14622,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14636,22 +14636,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -14660,7 +14660,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -14674,10 +14674,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -14686,7 +14686,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -14703,12 +14703,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14717,22 +14717,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -14741,7 +14741,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -14756,10 +14756,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -14768,7 +14768,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -14784,12 +14784,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14798,22 +14798,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -14822,7 +14822,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -14836,10 +14836,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -14848,7 +14848,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -14864,19 +14864,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -14885,9 +14885,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -14895,22 +14895,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -14919,7 +14919,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -14934,10 +14934,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -14946,7 +14946,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -14963,15 +14963,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -14980,7 +14980,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -14995,7 +14995,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -15004,22 +15004,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -15028,7 +15028,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -15044,15 +15044,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -15061,7 +15061,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -15075,10 +15075,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -15087,7 +15087,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -15101,10 +15101,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -15113,7 +15113,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -15127,10 +15127,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -15139,7 +15139,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -15153,10 +15153,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -15165,7 +15165,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -15180,7 +15180,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -15189,22 +15189,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -15213,7 +15213,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -15230,15 +15230,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -15247,7 +15247,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -15262,7 +15262,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -15271,22 +15271,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -15295,7 +15295,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -15309,10 +15309,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -15321,7 +15321,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -15338,15 +15338,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -15355,7 +15355,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -15369,10 +15369,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -15381,7 +15381,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -15396,7 +15396,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -15405,22 +15405,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -15429,7 +15429,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -15443,10 +15443,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -15455,7 +15455,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -15470,10 +15470,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -15482,7 +15482,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -15497,10 +15497,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -15509,7 +15509,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -15524,10 +15524,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -15536,7 +15536,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -15550,10 +15550,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -15562,7 +15562,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -15578,12 +15578,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15592,22 +15592,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -15616,7 +15616,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -15633,12 +15633,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15647,22 +15647,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -15671,7 +15671,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -15686,10 +15686,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -15698,7 +15698,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -15713,10 +15713,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -15725,7 +15725,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -15741,19 +15741,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -15762,9 +15762,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -15772,28 +15772,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -15802,7 +15802,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -15817,7 +15817,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15826,44 +15826,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15873,7 +15873,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15882,22 +15882,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -15906,7 +15906,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -15921,10 +15921,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -15933,7 +15933,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -15949,12 +15949,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -15963,22 +15963,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -15987,7 +15987,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -16002,10 +16002,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -16014,7 +16014,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -16030,19 +16030,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -16051,9 +16051,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -16061,44 +16061,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -16108,7 +16108,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -16117,44 +16117,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -16164,7 +16164,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -16173,22 +16173,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -16197,7 +16197,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -16212,10 +16212,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -16224,7 +16224,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -16240,12 +16240,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -16254,22 +16254,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -16278,7 +16278,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -16293,10 +16293,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -16305,7 +16305,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -16321,19 +16321,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -16342,9 +16342,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -16352,22 +16352,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -16376,7 +16376,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -16392,15 +16392,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -16409,7 +16409,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -16424,14 +16424,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -16440,19 +16440,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -16461,7 +16461,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -16476,7 +16476,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -16484,7 +16484,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -16504,7 +16504,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -16529,7 +16529,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -16543,7 +16543,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -16554,18 +16554,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16577,7 +16577,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -16606,7 +16606,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -16617,7 +16617,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -16627,18 +16627,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16653,18 +16653,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16675,11 +16675,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16699,7 +16699,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -16716,11 +16716,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16737,11 +16737,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16763,7 +16763,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -16790,21 +16790,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -16818,29 +16818,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -16849,7 +16849,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -16863,10 +16863,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -16875,7 +16875,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -16891,15 +16891,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -16908,7 +16908,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -16923,7 +16923,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -16931,7 +16931,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -16941,11 +16941,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16954,11 +16954,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16987,11 +16987,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -17006,18 +17006,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -17027,25 +17027,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -17055,25 +17055,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -17087,7 +17087,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -17097,11 +17097,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -17110,11 +17110,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17138,11 +17138,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -17157,18 +17157,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -17178,25 +17178,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -17210,29 +17210,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -17241,7 +17241,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -17256,10 +17256,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -17268,7 +17268,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -17283,10 +17283,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -17295,7 +17295,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -17311,19 +17311,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -17332,38 +17332,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -17377,7 +17377,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -17387,18 +17387,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17413,18 +17413,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17435,11 +17435,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17459,7 +17459,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -17476,11 +17476,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17496,7 +17496,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -17523,21 +17523,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -17551,29 +17551,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -17582,7 +17582,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -17596,10 +17596,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -17608,7 +17608,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -17624,15 +17624,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -17641,7 +17641,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -17656,7 +17656,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -17664,25 +17664,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17696,11 +17696,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17715,7 +17715,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -17728,7 +17728,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -17748,7 +17748,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -17762,18 +17762,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17785,7 +17785,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -17809,7 +17809,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -17836,21 +17836,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -17864,29 +17864,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -17895,7 +17895,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -17911,15 +17911,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -17928,7 +17928,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -17943,7 +17943,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -17951,25 +17951,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17983,11 +17983,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18000,7 +18000,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -18008,7 +18008,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -18028,7 +18028,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -18061,18 +18061,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -18092,29 +18092,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -18123,7 +18123,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -18139,15 +18139,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -18156,7 +18156,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -18171,7 +18171,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -18179,25 +18179,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18211,11 +18211,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18228,7 +18228,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -18236,7 +18236,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -18262,7 +18262,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -18270,7 +18270,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -18297,11 +18297,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18316,18 +18316,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -18337,25 +18337,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -18376,7 +18376,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18407,18 +18407,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -18438,29 +18438,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -18469,7 +18469,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -18484,10 +18484,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -18496,7 +18496,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -18512,15 +18512,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -18529,7 +18529,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -18544,7 +18544,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18552,25 +18552,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18585,18 +18585,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18614,7 +18614,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -18622,7 +18622,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -18648,7 +18648,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -18656,7 +18656,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -18683,11 +18683,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18702,18 +18702,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -18723,25 +18723,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -18762,7 +18762,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18782,7 +18782,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18807,29 +18807,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -18838,7 +18838,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -18853,10 +18853,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -18865,7 +18865,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -18881,15 +18881,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -18898,7 +18898,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -18913,7 +18913,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18921,21 +18921,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -18944,7 +18944,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -18957,17 +18957,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -18987,11 +18987,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19006,18 +19006,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -19027,25 +19027,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -19064,15 +19064,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -19081,7 +19081,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -19094,17 +19094,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19124,11 +19124,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19143,18 +19143,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -19164,25 +19164,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -19206,18 +19206,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19231,11 +19231,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19244,11 +19244,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19267,18 +19267,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -19299,29 +19299,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19339,7 +19339,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -19352,11 +19352,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19365,11 +19365,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19388,18 +19388,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -19415,11 +19415,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19438,18 +19438,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -19467,11 +19467,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19492,18 +19492,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -19523,25 +19523,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19558,7 +19558,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -19571,11 +19571,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19590,7 +19590,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -19603,7 +19603,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -19619,11 +19619,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19642,18 +19642,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -19674,11 +19674,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19687,11 +19687,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19710,18 +19710,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -19743,18 +19743,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -19767,18 +19767,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19790,7 +19790,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -19822,7 +19822,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -19832,22 +19832,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -19856,7 +19856,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -19871,10 +19871,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -19883,7 +19883,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -19898,10 +19898,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -19910,7 +19910,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -19925,10 +19925,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -19937,7 +19937,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -19951,10 +19951,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -19963,7 +19963,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -19979,15 +19979,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -19996,7 +19996,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -20011,7 +20011,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -20019,14 +20019,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -20035,10 +20035,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -20047,7 +20047,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -20063,17 +20063,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -20093,11 +20093,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20112,18 +20112,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -20133,25 +20133,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -20171,16 +20171,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -20189,7 +20189,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -20202,17 +20202,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -20221,11 +20221,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20249,11 +20249,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20268,18 +20268,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -20289,25 +20289,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -20326,15 +20326,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -20343,7 +20343,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -20356,17 +20356,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20386,11 +20386,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20405,18 +20405,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -20426,25 +20426,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -20463,15 +20463,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -20480,7 +20480,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -20493,7 +20493,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -20502,11 +20502,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20515,11 +20515,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20538,18 +20538,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -20565,11 +20565,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20588,18 +20588,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -20619,18 +20619,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20645,18 +20645,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20667,11 +20667,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20690,25 +20690,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20725,7 +20725,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -20735,11 +20735,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20748,11 +20748,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20771,18 +20771,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -20800,11 +20800,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20819,18 +20819,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -20843,18 +20843,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20866,7 +20866,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -20898,29 +20898,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -20929,7 +20929,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -20944,10 +20944,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -20956,7 +20956,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -20971,10 +20971,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -20983,7 +20983,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -20998,10 +20998,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -21010,7 +21010,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -21026,15 +21026,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -21043,7 +21043,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -21058,7 +21058,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -21066,25 +21066,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21098,11 +21098,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -21111,11 +21111,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21139,11 +21139,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21158,18 +21158,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -21179,25 +21179,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -21217,29 +21217,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -21248,7 +21248,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -21263,10 +21263,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -21275,7 +21275,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -21289,10 +21289,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -21301,7 +21301,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -21318,15 +21318,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -21335,7 +21335,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -21350,7 +21350,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21358,7 +21358,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -21368,11 +21368,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21381,11 +21381,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21409,11 +21409,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21428,18 +21428,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -21449,25 +21449,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -21481,29 +21481,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -21512,7 +21512,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -21527,10 +21527,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -21539,7 +21539,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -21553,10 +21553,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -21565,7 +21565,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -21582,12 +21582,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21595,7 +21595,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -21605,11 +21605,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21618,11 +21618,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21631,11 +21631,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21663,11 +21663,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21682,18 +21682,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -21703,25 +21703,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -21735,29 +21735,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -21766,7 +21766,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -21781,10 +21781,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -21793,7 +21793,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -21807,10 +21807,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -21819,7 +21819,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -21834,10 +21834,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -21846,7 +21846,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -21862,12 +21862,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21875,7 +21875,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -21885,11 +21885,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21898,11 +21898,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21911,11 +21911,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21943,11 +21943,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21962,18 +21962,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -21983,25 +21983,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -22015,29 +22015,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -22046,7 +22046,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -22061,10 +22061,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -22073,7 +22073,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -22087,10 +22087,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -22099,7 +22099,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -22114,10 +22114,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -22126,7 +22126,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -22142,12 +22142,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -22155,7 +22155,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -22165,11 +22165,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22178,11 +22178,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -22191,11 +22191,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -22223,11 +22223,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22242,18 +22242,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -22263,25 +22263,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -22295,29 +22295,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -22326,7 +22326,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -22341,10 +22341,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -22353,7 +22353,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -22367,10 +22367,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -22379,7 +22379,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -22393,10 +22393,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -22405,7 +22405,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -22421,12 +22421,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -22434,21 +22434,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -22457,7 +22457,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -22471,7 +22471,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -22482,11 +22482,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22501,18 +22501,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -22522,25 +22522,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -22559,15 +22559,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -22576,7 +22576,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -22590,17 +22590,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22620,11 +22620,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22639,18 +22639,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -22660,25 +22660,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -22697,15 +22697,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -22714,7 +22714,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -22727,17 +22727,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22757,11 +22757,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22776,18 +22776,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -22797,25 +22797,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -22835,16 +22835,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -22853,7 +22853,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -22866,17 +22866,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22885,11 +22885,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22913,11 +22913,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22932,18 +22932,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -22953,25 +22953,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -22994,11 +22994,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23007,11 +23007,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23023,11 +23023,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23036,11 +23036,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23049,11 +23049,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23062,11 +23062,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -23093,18 +23093,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -23134,18 +23134,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -23159,7 +23159,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -23169,11 +23169,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23182,11 +23182,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23195,7 +23195,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -23209,11 +23209,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23228,18 +23228,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -23260,7 +23260,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -23274,11 +23274,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23293,7 +23293,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -23306,7 +23306,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -23345,18 +23345,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -23370,7 +23370,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -23380,11 +23380,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23393,11 +23393,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23409,14 +23409,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23424,11 +23424,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -23441,7 +23441,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -23457,11 +23457,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23488,18 +23488,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -23513,7 +23513,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -23526,14 +23526,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23541,11 +23541,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -23558,7 +23558,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -23574,11 +23574,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23602,11 +23602,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23621,18 +23621,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -23642,25 +23642,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -23674,7 +23674,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -23684,11 +23684,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23713,11 +23713,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23732,18 +23732,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -23753,25 +23753,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -23781,25 +23781,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -23813,29 +23813,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -23844,7 +23844,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -23859,10 +23859,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -23871,7 +23871,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -23886,10 +23886,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -23898,7 +23898,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -23913,10 +23913,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -23925,7 +23925,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -23939,10 +23939,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -23951,7 +23951,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -23967,12 +23967,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -23980,21 +23980,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -24003,7 +24003,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -24017,7 +24017,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -24028,11 +24028,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24047,18 +24047,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -24068,25 +24068,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -24105,15 +24105,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -24122,7 +24122,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -24136,17 +24136,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24166,11 +24166,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24185,18 +24185,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -24206,25 +24206,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -24243,15 +24243,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -24260,7 +24260,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -24273,17 +24273,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24303,11 +24303,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24322,18 +24322,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -24343,25 +24343,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -24381,16 +24381,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -24399,7 +24399,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -24412,17 +24412,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24431,11 +24431,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24459,11 +24459,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24478,18 +24478,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -24499,25 +24499,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -24540,11 +24540,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24553,11 +24553,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24569,11 +24569,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24582,11 +24582,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24595,11 +24595,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24608,11 +24608,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24639,18 +24639,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -24680,18 +24680,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -24705,21 +24705,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -24728,7 +24728,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -24741,17 +24741,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24760,11 +24760,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24783,18 +24783,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -24817,11 +24817,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24830,11 +24830,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24843,7 +24843,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -24857,11 +24857,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24876,18 +24876,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -24908,7 +24908,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -24922,11 +24922,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24941,7 +24941,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -24954,7 +24954,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -24993,18 +24993,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -25018,7 +25018,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -25028,11 +25028,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -25041,11 +25041,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -25057,14 +25057,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -25072,11 +25072,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -25089,7 +25089,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -25105,11 +25105,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -25136,18 +25136,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -25161,7 +25161,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -25174,14 +25174,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -25189,11 +25189,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -25206,7 +25206,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -25222,11 +25222,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -25250,11 +25250,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -25269,18 +25269,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -25290,25 +25290,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -25322,29 +25322,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -25353,7 +25353,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -25368,10 +25368,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -25380,7 +25380,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -25395,10 +25395,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -25407,7 +25407,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -25422,10 +25422,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -25434,7 +25434,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -25448,10 +25448,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -25460,7 +25460,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -25476,19 +25476,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -25500,7 +25500,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.595Z", + "updatedAt": "2020-04-08T12:21:13.856Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/Migrations.json b/packages/smart-contracts/artifacts/Migrations.json index 7d6eba1..f955d4f 100644 --- a/packages/smart-contracts/artifacts/Migrations.json +++ b/packages/smart-contracts/artifacts/Migrations.json @@ -187,7 +187,7 @@ "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "158:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_message", @@ -271,7 +271,7 @@ "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "209:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_message", @@ -598,7 +598,7 @@ "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "158:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_message", @@ -682,7 +682,7 @@ "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7827, + "referencedDeclaration": 7818, "src": "209:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_message", @@ -895,7 +895,7 @@ } }, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:28:59.357Z", + "updatedAt": "2020-04-08T12:22:38.662Z", "networkType": "ethereum", "devdoc": { "methods": {} diff --git a/packages/smart-contracts/artifacts/SafeERC20.json b/packages/smart-contracts/artifacts/SafeERC20.json index 99ca577..6f19a33 100644 --- a/packages/smart-contracts/artifacts/SafeERC20.json +++ b/packages/smart-contracts/artifacts/SafeERC20.json @@ -45,7 +45,7 @@ "id": 124, "nodeType": "ImportDirective", "scope": 341, - "sourceUnit": 7738, + "sourceUnit": 7729, "src": "49:51:2", "symbolAliases": [], "unitAlias": "" @@ -56,7 +56,7 @@ "id": 125, "nodeType": "ImportDirective", "scope": 341, - "sourceUnit": 7813, + "sourceUnit": 7804, "src": "101:51:2", "symbolAliases": [], "unitAlias": "" @@ -81,10 +81,10 @@ "id": 126, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7737, + "referencedDeclaration": 7728, "src": "641:8:2", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$7737", + "typeIdentifier": "t_contract$_SafeMath_$7728", "typeString": "library SafeMath" } }, @@ -108,10 +108,10 @@ "id": 129, "name": "Address", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7812, + "referencedDeclaration": 7803, "src": "673:7:2", "typeDescriptions": { - "typeIdentifier": "t_contract$_Address_$7812", + "typeIdentifier": "t_contract$_Address_$7803", "typeString": "library Address" } }, @@ -248,7 +248,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "807:3:2", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -569,7 +569,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "1005:3:2", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -897,7 +897,7 @@ "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7849, + "referencedDeclaration": 7840, "src": "1492:4:2", "typeDescriptions": { "typeIdentifier": "t_contract$_SafeERC20_$340", @@ -1085,10 +1085,10 @@ "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1443:7:2", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", @@ -1226,7 +1226,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "1629:3:2", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -1486,7 +1486,7 @@ "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7849, + "referencedDeclaration": 7840, "src": "1848:4:2", "typeDescriptions": { "typeIdentifier": "t_contract$_SafeERC20_$340", @@ -1601,7 +1601,7 @@ "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 7577, + "referencedDeclaration": 7568, "src": "1824:43:2", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", @@ -1738,7 +1738,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "1910:3:2", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -2020,7 +2020,7 @@ "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7849, + "referencedDeclaration": 7840, "src": "2136:4:2", "typeDescriptions": { "typeIdentifier": "t_contract$_SafeERC20_$340", @@ -2135,7 +2135,7 @@ "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 7620, + "referencedDeclaration": 7611, "src": "2112:43:2", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$_t_string_memory_ptr_$returns$_t_uint256_$bound_to$_t_uint256_$", @@ -2272,7 +2272,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "2243:3:2", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -2530,7 +2530,7 @@ "lValueRequested": false, "memberName": "isContract", "nodeType": "MemberAccess", - "referencedDeclaration": 7764, + "referencedDeclaration": 7755, "src": "3298:25:2", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_bool_$bound_to$_t_address_$", @@ -2585,10 +2585,10 @@ "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3290:7:2", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", @@ -2830,10 +2830,10 @@ "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3508:7:2", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", @@ -3004,7 +3004,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "3704:3:2", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -3073,10 +3073,10 @@ "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3696:7:2", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", @@ -3230,7 +3230,7 @@ "id": 124, "nodeType": "ImportDirective", "scope": 341, - "sourceUnit": 7738, + "sourceUnit": 7729, "src": "49:51:2", "symbolAliases": [], "unitAlias": "" @@ -3241,7 +3241,7 @@ "id": 125, "nodeType": "ImportDirective", "scope": 341, - "sourceUnit": 7813, + "sourceUnit": 7804, "src": "101:51:2", "symbolAliases": [], "unitAlias": "" @@ -3266,10 +3266,10 @@ "id": 126, "name": "SafeMath", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7737, + "referencedDeclaration": 7728, "src": "641:8:2", "typeDescriptions": { - "typeIdentifier": "t_contract$_SafeMath_$7737", + "typeIdentifier": "t_contract$_SafeMath_$7728", "typeString": "library SafeMath" } }, @@ -3293,10 +3293,10 @@ "id": 129, "name": "Address", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 7812, + "referencedDeclaration": 7803, "src": "673:7:2", "typeDescriptions": { - "typeIdentifier": "t_contract$_Address_$7812", + "typeIdentifier": "t_contract$_Address_$7803", "typeString": "library Address" } }, @@ -3433,7 +3433,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "807:3:2", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -3754,7 +3754,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "1005:3:2", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -4082,7 +4082,7 @@ "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7849, + "referencedDeclaration": 7840, "src": "1492:4:2", "typeDescriptions": { "typeIdentifier": "t_contract$_SafeERC20_$340", @@ -4270,10 +4270,10 @@ "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1443:7:2", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", @@ -4411,7 +4411,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "1629:3:2", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -4671,7 +4671,7 @@ "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7849, + "referencedDeclaration": 7840, "src": "1848:4:2", "typeDescriptions": { "typeIdentifier": "t_contract$_SafeERC20_$340", @@ -4786,7 +4786,7 @@ "lValueRequested": false, "memberName": "add", "nodeType": "MemberAccess", - "referencedDeclaration": 7577, + "referencedDeclaration": 7568, "src": "1824:43:2", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$bound_to$_t_uint256_$", @@ -4923,7 +4923,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "1910:3:2", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -5205,7 +5205,7 @@ "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7849, + "referencedDeclaration": 7840, "src": "2136:4:2", "typeDescriptions": { "typeIdentifier": "t_contract$_SafeERC20_$340", @@ -5320,7 +5320,7 @@ "lValueRequested": false, "memberName": "sub", "nodeType": "MemberAccess", - "referencedDeclaration": 7620, + "referencedDeclaration": 7611, "src": "2112:43:2", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$_t_string_memory_ptr_$returns$_t_uint256_$bound_to$_t_uint256_$", @@ -5457,7 +5457,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "2243:3:2", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -5715,7 +5715,7 @@ "lValueRequested": false, "memberName": "isContract", "nodeType": "MemberAccess", - "referencedDeclaration": 7764, + "referencedDeclaration": 7755, "src": "3298:25:2", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_bool_$bound_to$_t_address_$", @@ -5770,10 +5770,10 @@ "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3290:7:2", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", @@ -6015,10 +6015,10 @@ "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3508:7:2", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", @@ -6189,7 +6189,7 @@ "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7814, + "referencedDeclaration": 7805, "src": "3704:3:2", "typeDescriptions": { "typeIdentifier": "t_magic_abi", @@ -6258,10 +6258,10 @@ "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3696:7:2", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", @@ -6384,7 +6384,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.456Z", + "updatedAt": "2020-04-08T12:21:13.663Z", "devdoc": { "details": "Wrappers around ERC20 operations that throw on failure (when the token contract returns false). Tokens that return no value (and instead revert or throw on failure) are also supported, non-reverting calls are assumed to be successful. To use this library you can add a `using SafeERC20 for ERC20;` statement to your contract, which allows you to call the safe operations as `token.safeTransfer(...)`, etc.", "methods": {}, diff --git a/packages/smart-contracts/artifacts/SafeMath.json b/packages/smart-contracts/artifacts/SafeMath.json index f841fdc..d6dcc44 100644 --- a/packages/smart-contracts/artifacts/SafeMath.json +++ b/packages/smart-contracts/artifacts/SafeMath.json @@ -12,14 +12,14 @@ "absolutePath": "@openzeppelin/contracts/math/SafeMath.sol", "exportedSymbols": { "SafeMath": [ - 7737 + 7728 ] }, - "id": 7738, + "id": 7729, "nodeType": "SourceUnit", "nodes": [ { - "id": 7552, + "id": 7543, "literals": [ "solidity", "^", @@ -35,30 +35,30 @@ "contractKind": "library", "documentation": "@dev Wrappers over Solidity's arithmetic operations with added overflow\nchecks.\n * Arithmetic operations in Solidity wrap on overflow. This can easily result\nin bugs, because programmers usually assume that an overflow raises an\nerror, which is the standard behavior in high level programming languages.\n`SafeMath` restores this intuition by reverting the transaction when an\noperation overflows.\n * Using this library instead of the unchecked operations eliminates an entire\nclass of bugs, so it's recommended to use it always.", "fullyImplemented": true, - "id": 7737, + "id": 7728, "linearizedBaseContracts": [ - 7737 + 7728 ], "name": "SafeMath", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 7576, + "id": 7567, "nodeType": "Block", "src": "901:109:32", "statements": [ { "assignments": [ - 7562 + 7553 ], "declarations": [ { "constant": false, - "id": 7562, + "id": 7553, "name": "c", "nodeType": "VariableDeclaration", - "scope": 7576, + "scope": 7567, "src": "911:9:32", "stateVariable": false, "storageLocation": "default", @@ -67,7 +67,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7561, + "id": 7552, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "911:7:32", @@ -80,25 +80,25 @@ "visibility": "internal" } ], - "id": 7566, + "id": 7557, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7565, + "id": 7556, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7563, + "id": 7554, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7554, + "referencedDeclaration": 7545, "src": "923:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -109,11 +109,11 @@ "operator": "+", "rightExpression": { "argumentTypes": null, - "id": 7564, + "id": 7555, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7556, + "referencedDeclaration": 7547, "src": "927:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -139,18 +139,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7570, + "id": 7561, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7568, + "id": 7559, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7562, + "referencedDeclaration": 7553, "src": "946:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -161,11 +161,11 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 7569, + "id": 7560, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7554, + "referencedDeclaration": 7545, "src": "951:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -181,7 +181,7 @@ { "argumentTypes": null, "hexValue": "536166654d6174683a206164646974696f6e206f766572666c6f77", - "id": 7571, + "id": 7562, "isConstant": false, "isLValue": false, "isPure": true, @@ -208,21 +208,21 @@ "typeString": "literal_string \"SafeMath: addition overflow\"" } ], - "id": 7567, + "id": 7558, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "938:7:32", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7572, + "id": 7563, "isConstant": false, "isLValue": false, "isPure": false, @@ -236,48 +236,48 @@ "typeString": "tuple()" } }, - "id": 7573, + "id": 7564, "nodeType": "ExpressionStatement", "src": "938:46:32" }, { "expression": { "argumentTypes": null, - "id": 7574, + "id": 7565, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7562, + "referencedDeclaration": 7553, "src": "1002:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 7560, - "id": 7575, + "functionReturnParameters": 7551, + "id": 7566, "nodeType": "Return", "src": "995:8:32" } ] }, "documentation": "@dev Returns the addition of two unsigned integers, reverting on\noverflow.\n * Counterpart to Solidity's `+` operator.\n * Requirements:\n- Addition cannot overflow.", - "id": 7577, + "id": 7568, "implemented": true, "kind": "function", "modifiers": [], "name": "add", "nodeType": "FunctionDefinition", "parameters": { - "id": 7557, + "id": 7548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7554, + "id": 7545, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7577, + "scope": 7568, "src": "847:9:32", "stateVariable": false, "storageLocation": "default", @@ -286,7 +286,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7553, + "id": 7544, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "847:7:32", @@ -300,10 +300,10 @@ }, { "constant": false, - "id": 7556, + "id": 7547, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7577, + "scope": 7568, "src": "858:9:32", "stateVariable": false, "storageLocation": "default", @@ -312,7 +312,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7555, + "id": 7546, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "858:7:32", @@ -328,15 +328,15 @@ "src": "846:22:32" }, "returnParameters": { - "id": 7560, + "id": 7551, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7559, + "id": 7550, "name": "", "nodeType": "VariableDeclaration", - "scope": 7577, + "scope": 7568, "src": "892:7:32", "stateVariable": false, "storageLocation": "default", @@ -345,7 +345,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7558, + "id": 7549, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "892:7:32", @@ -360,7 +360,7 @@ ], "src": "891:9:32" }, - "scope": 7737, + "scope": 7728, "src": "834:176:32", "stateMutability": "pure", "superFunction": null, @@ -368,7 +368,7 @@ }, { "body": { - "id": 7592, + "id": 7583, "nodeType": "Block", "src": "1341:67:32", "statements": [ @@ -378,11 +378,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7587, + "id": 7578, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7579, + "referencedDeclaration": 7570, "src": "1362:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -391,11 +391,11 @@ }, { "argumentTypes": null, - "id": 7588, + "id": 7579, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7581, + "referencedDeclaration": 7572, "src": "1365:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -405,7 +405,7 @@ { "argumentTypes": null, "hexValue": "536166654d6174683a207375627472616374696f6e206f766572666c6f77", - "id": 7589, + "id": 7580, "isConstant": false, "isLValue": false, "isPure": true, @@ -436,21 +436,21 @@ "typeString": "literal_string \"SafeMath: subtraction overflow\"" } ], - "id": 7586, + "id": 7577, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [ - 7593, - 7620 + 7584, + 7611 ], - "referencedDeclaration": 7620, + "referencedDeclaration": 7611, "src": "1358:3:32", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,string memory) pure returns (uint256)" } }, - "id": 7590, + "id": 7581, "isConstant": false, "isLValue": false, "isPure": false, @@ -464,30 +464,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 7585, - "id": 7591, + "functionReturnParameters": 7576, + "id": 7582, "nodeType": "Return", "src": "1351:50:32" } ] }, "documentation": "@dev Returns the subtraction of two unsigned integers, reverting on\noverflow (when the result is negative).\n * Counterpart to Solidity's `-` operator.\n * Requirements:\n- Subtraction cannot overflow.", - "id": 7593, + "id": 7584, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 7582, + "id": 7573, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7579, + "id": 7570, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7593, + "scope": 7584, "src": "1287:9:32", "stateVariable": false, "storageLocation": "default", @@ -496,7 +496,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7578, + "id": 7569, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1287:7:32", @@ -510,10 +510,10 @@ }, { "constant": false, - "id": 7581, + "id": 7572, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7593, + "scope": 7584, "src": "1298:9:32", "stateVariable": false, "storageLocation": "default", @@ -522,7 +522,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7580, + "id": 7571, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1298:7:32", @@ -538,15 +538,15 @@ "src": "1286:22:32" }, "returnParameters": { - "id": 7585, + "id": 7576, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7584, + "id": 7575, "name": "", "nodeType": "VariableDeclaration", - "scope": 7593, + "scope": 7584, "src": "1332:7:32", "stateVariable": false, "storageLocation": "default", @@ -555,7 +555,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7583, + "id": 7574, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1332:7:32", @@ -570,7 +570,7 @@ ], "src": "1331:9:32" }, - "scope": 7737, + "scope": 7728, "src": "1274:134:32", "stateMutability": "pure", "superFunction": null, @@ -578,7 +578,7 @@ }, { "body": { - "id": 7619, + "id": 7610, "nodeType": "Block", "src": "1827:92:32", "statements": [ @@ -592,18 +592,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7607, + "id": 7598, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7605, + "id": 7596, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7597, + "referencedDeclaration": 7588, "src": "1845:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -614,11 +614,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 7606, + "id": 7597, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7595, + "referencedDeclaration": 7586, "src": "1850:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -633,11 +633,11 @@ }, { "argumentTypes": null, - "id": 7608, + "id": 7599, "name": "errorMessage", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7599, + "referencedDeclaration": 7590, "src": "1853:12:32", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", @@ -656,21 +656,21 @@ "typeString": "string memory" } ], - "id": 7604, + "id": 7595, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1837:7:32", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7609, + "id": 7600, "isConstant": false, "isLValue": false, "isPure": false, @@ -684,21 +684,21 @@ "typeString": "tuple()" } }, - "id": 7610, + "id": 7601, "nodeType": "ExpressionStatement", "src": "1837:29:32" }, { "assignments": [ - 7612 + 7603 ], "declarations": [ { "constant": false, - "id": 7612, + "id": 7603, "name": "c", "nodeType": "VariableDeclaration", - "scope": 7619, + "scope": 7610, "src": "1876:9:32", "stateVariable": false, "storageLocation": "default", @@ -707,7 +707,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7611, + "id": 7602, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1876:7:32", @@ -720,25 +720,25 @@ "visibility": "internal" } ], - "id": 7616, + "id": 7607, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7615, + "id": 7606, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7613, + "id": 7604, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7595, + "referencedDeclaration": 7586, "src": "1888:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -749,11 +749,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 7614, + "id": 7605, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7597, + "referencedDeclaration": 7588, "src": "1892:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -772,41 +772,41 @@ { "expression": { "argumentTypes": null, - "id": 7617, + "id": 7608, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7612, + "referencedDeclaration": 7603, "src": "1911:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 7603, - "id": 7618, + "functionReturnParameters": 7594, + "id": 7609, "nodeType": "Return", "src": "1904:8:32" } ] }, "documentation": "@dev Returns the subtraction of two unsigned integers, reverting with custom message on\noverflow (when the result is negative).\n * Counterpart to Solidity's `-` operator.\n * Requirements:\n- Subtraction cannot overflow.\n * _Available since v2.4.0._", - "id": 7620, + "id": 7611, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 7600, + "id": 7591, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7595, + "id": 7586, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7620, + "scope": 7611, "src": "1745:9:32", "stateVariable": false, "storageLocation": "default", @@ -815,7 +815,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7594, + "id": 7585, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1745:7:32", @@ -829,10 +829,10 @@ }, { "constant": false, - "id": 7597, + "id": 7588, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7620, + "scope": 7611, "src": "1756:9:32", "stateVariable": false, "storageLocation": "default", @@ -841,7 +841,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7596, + "id": 7587, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1756:7:32", @@ -855,10 +855,10 @@ }, { "constant": false, - "id": 7599, + "id": 7590, "name": "errorMessage", "nodeType": "VariableDeclaration", - "scope": 7620, + "scope": 7611, "src": "1767:26:32", "stateVariable": false, "storageLocation": "memory", @@ -867,7 +867,7 @@ "typeString": "string" }, "typeName": { - "id": 7598, + "id": 7589, "name": "string", "nodeType": "ElementaryTypeName", "src": "1767:6:32", @@ -883,15 +883,15 @@ "src": "1744:50:32" }, "returnParameters": { - "id": 7603, + "id": 7594, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7602, + "id": 7593, "name": "", "nodeType": "VariableDeclaration", - "scope": 7620, + "scope": 7611, "src": "1818:7:32", "stateVariable": false, "storageLocation": "default", @@ -900,7 +900,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7601, + "id": 7592, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1818:7:32", @@ -915,7 +915,7 @@ ], "src": "1817:9:32" }, - "scope": 7737, + "scope": 7728, "src": "1732:187:32", "stateMutability": "pure", "superFunction": null, @@ -923,7 +923,7 @@ }, { "body": { - "id": 7653, + "id": 7644, "nodeType": "Block", "src": "2226:392:32", "statements": [ @@ -934,18 +934,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7631, + "id": 7622, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7629, + "id": 7620, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7622, + "referencedDeclaration": 7613, "src": "2458:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -957,7 +957,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 7630, + "id": 7621, "isConstant": false, "isLValue": false, "isPure": true, @@ -979,11 +979,11 @@ } }, "falseBody": null, - "id": 7635, + "id": 7626, "nodeType": "IfStatement", "src": "2454:45:32", "trueBody": { - "id": 7634, + "id": 7625, "nodeType": "Block", "src": "2466:33:32", "statements": [ @@ -991,7 +991,7 @@ "expression": { "argumentTypes": null, "hexValue": "30", - "id": 7632, + "id": 7623, "isConstant": false, "isLValue": false, "isPure": true, @@ -1006,8 +1006,8 @@ }, "value": "0" }, - "functionReturnParameters": 7628, - "id": 7633, + "functionReturnParameters": 7619, + "id": 7624, "nodeType": "Return", "src": "2480:8:32" } @@ -1016,15 +1016,15 @@ }, { "assignments": [ - 7637 + 7628 ], "declarations": [ { "constant": false, - "id": 7637, + "id": 7628, "name": "c", "nodeType": "VariableDeclaration", - "scope": 7653, + "scope": 7644, "src": "2509:9:32", "stateVariable": false, "storageLocation": "default", @@ -1033,7 +1033,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7636, + "id": 7627, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2509:7:32", @@ -1046,25 +1046,25 @@ "visibility": "internal" } ], - "id": 7641, + "id": 7632, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7640, + "id": 7631, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7638, + "id": 7629, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7622, + "referencedDeclaration": 7613, "src": "2521:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1075,11 +1075,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 7639, + "id": 7630, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7624, + "referencedDeclaration": 7615, "src": "2525:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1105,7 +1105,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7647, + "id": 7638, "isConstant": false, "isLValue": false, "isPure": false, @@ -1116,18 +1116,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7645, + "id": 7636, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7643, + "id": 7634, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7637, + "referencedDeclaration": 7628, "src": "2544:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1138,11 +1138,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 7644, + "id": 7635, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7622, + "referencedDeclaration": 7613, "src": "2548:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1159,11 +1159,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 7646, + "id": 7637, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7624, + "referencedDeclaration": 7615, "src": "2553:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1179,7 +1179,7 @@ { "argumentTypes": null, "hexValue": "536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77", - "id": 7648, + "id": 7639, "isConstant": false, "isLValue": false, "isPure": true, @@ -1206,21 +1206,21 @@ "typeString": "literal_string \"SafeMath: multiplication overflow\"" } ], - "id": 7642, + "id": 7633, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2536:7:32", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7649, + "id": 7640, "isConstant": false, "isLValue": false, "isPure": false, @@ -1234,48 +1234,48 @@ "typeString": "tuple()" } }, - "id": 7650, + "id": 7641, "nodeType": "ExpressionStatement", "src": "2536:56:32" }, { "expression": { "argumentTypes": null, - "id": 7651, + "id": 7642, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7637, + "referencedDeclaration": 7628, "src": "2610:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 7628, - "id": 7652, + "functionReturnParameters": 7619, + "id": 7643, "nodeType": "Return", "src": "2603:8:32" } ] }, "documentation": "@dev Returns the multiplication of two unsigned integers, reverting on\noverflow.\n * Counterpart to Solidity's `*` operator.\n * Requirements:\n- Multiplication cannot overflow.", - "id": 7654, + "id": 7645, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 7625, + "id": 7616, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7622, + "id": 7613, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7654, + "scope": 7645, "src": "2172:9:32", "stateVariable": false, "storageLocation": "default", @@ -1284,7 +1284,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7621, + "id": 7612, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2172:7:32", @@ -1298,10 +1298,10 @@ }, { "constant": false, - "id": 7624, + "id": 7615, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7654, + "scope": 7645, "src": "2183:9:32", "stateVariable": false, "storageLocation": "default", @@ -1310,7 +1310,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7623, + "id": 7614, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2183:7:32", @@ -1326,15 +1326,15 @@ "src": "2171:22:32" }, "returnParameters": { - "id": 7628, + "id": 7619, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7627, + "id": 7618, "name": "", "nodeType": "VariableDeclaration", - "scope": 7654, + "scope": 7645, "src": "2217:7:32", "stateVariable": false, "storageLocation": "default", @@ -1343,7 +1343,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7626, + "id": 7617, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2217:7:32", @@ -1358,7 +1358,7 @@ ], "src": "2216:9:32" }, - "scope": 7737, + "scope": 7728, "src": "2159:459:32", "stateMutability": "pure", "superFunction": null, @@ -1366,7 +1366,7 @@ }, { "body": { - "id": 7669, + "id": 7660, "nodeType": "Block", "src": "3140:63:32", "statements": [ @@ -1376,11 +1376,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7664, + "id": 7655, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7656, + "referencedDeclaration": 7647, "src": "3161:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1389,11 +1389,11 @@ }, { "argumentTypes": null, - "id": 7665, + "id": 7656, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7658, + "referencedDeclaration": 7649, "src": "3164:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1403,7 +1403,7 @@ { "argumentTypes": null, "hexValue": "536166654d6174683a206469766973696f6e206279207a65726f", - "id": 7666, + "id": 7657, "isConstant": false, "isLValue": false, "isPure": true, @@ -1434,21 +1434,21 @@ "typeString": "literal_string \"SafeMath: division by zero\"" } ], - "id": 7663, + "id": 7654, "name": "div", "nodeType": "Identifier", "overloadedDeclarations": [ - 7670, - 7697 + 7661, + 7688 ], - "referencedDeclaration": 7697, + "referencedDeclaration": 7688, "src": "3157:3:32", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,string memory) pure returns (uint256)" } }, - "id": 7667, + "id": 7658, "isConstant": false, "isLValue": false, "isPure": false, @@ -1462,30 +1462,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 7662, - "id": 7668, + "functionReturnParameters": 7653, + "id": 7659, "nodeType": "Return", "src": "3150:46:32" } ] }, "documentation": "@dev Returns the integer division of two unsigned integers. Reverts on\ndivision by zero. The result is rounded towards zero.\n * Counterpart to Solidity's `/` operator. Note: this function uses a\n`revert` opcode (which leaves remaining gas untouched) while Solidity\nuses an invalid opcode to revert (consuming all remaining gas).\n * Requirements:\n- The divisor cannot be zero.", - "id": 7670, + "id": 7661, "implemented": true, "kind": "function", "modifiers": [], "name": "div", "nodeType": "FunctionDefinition", "parameters": { - "id": 7659, + "id": 7650, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7656, + "id": 7647, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7670, + "scope": 7661, "src": "3086:9:32", "stateVariable": false, "storageLocation": "default", @@ -1494,7 +1494,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7655, + "id": 7646, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3086:7:32", @@ -1508,10 +1508,10 @@ }, { "constant": false, - "id": 7658, + "id": 7649, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7670, + "scope": 7661, "src": "3097:9:32", "stateVariable": false, "storageLocation": "default", @@ -1520,7 +1520,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7657, + "id": 7648, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3097:7:32", @@ -1536,15 +1536,15 @@ "src": "3085:22:32" }, "returnParameters": { - "id": 7662, + "id": 7653, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7661, + "id": 7652, "name": "", "nodeType": "VariableDeclaration", - "scope": 7670, + "scope": 7661, "src": "3131:7:32", "stateVariable": false, "storageLocation": "default", @@ -1553,7 +1553,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7660, + "id": 7651, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3131:7:32", @@ -1568,7 +1568,7 @@ ], "src": "3130:9:32" }, - "scope": 7737, + "scope": 7728, "src": "3073:130:32", "stateMutability": "pure", "superFunction": null, @@ -1576,7 +1576,7 @@ }, { "body": { - "id": 7696, + "id": 7687, "nodeType": "Block", "src": "3813:243:32", "statements": [ @@ -1590,18 +1590,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7684, + "id": 7675, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7682, + "id": 7673, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7674, + "referencedDeclaration": 7665, "src": "3897:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1613,7 +1613,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 7683, + "id": 7674, "isConstant": false, "isLValue": false, "isPure": true, @@ -1636,11 +1636,11 @@ }, { "argumentTypes": null, - "id": 7685, + "id": 7676, "name": "errorMessage", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7676, + "referencedDeclaration": 7667, "src": "3904:12:32", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", @@ -1659,21 +1659,21 @@ "typeString": "string memory" } ], - "id": 7681, + "id": 7672, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3889:7:32", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7686, + "id": 7677, "isConstant": false, "isLValue": false, "isPure": false, @@ -1687,21 +1687,21 @@ "typeString": "tuple()" } }, - "id": 7687, + "id": 7678, "nodeType": "ExpressionStatement", "src": "3889:28:32" }, { "assignments": [ - 7689 + 7680 ], "declarations": [ { "constant": false, - "id": 7689, + "id": 7680, "name": "c", "nodeType": "VariableDeclaration", - "scope": 7696, + "scope": 7687, "src": "3927:9:32", "stateVariable": false, "storageLocation": "default", @@ -1710,7 +1710,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7688, + "id": 7679, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3927:7:32", @@ -1723,25 +1723,25 @@ "visibility": "internal" } ], - "id": 7693, + "id": 7684, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7692, + "id": 7683, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7690, + "id": 7681, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7672, + "referencedDeclaration": 7663, "src": "3939:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1752,11 +1752,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 7691, + "id": 7682, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7674, + "referencedDeclaration": 7665, "src": "3943:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1775,41 +1775,41 @@ { "expression": { "argumentTypes": null, - "id": 7694, + "id": 7685, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7689, + "referencedDeclaration": 7680, "src": "4048:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 7680, - "id": 7695, + "functionReturnParameters": 7671, + "id": 7686, "nodeType": "Return", "src": "4041:8:32" } ] }, "documentation": "@dev Returns the integer division of two unsigned integers. Reverts with custom message on\ndivision by zero. The result is rounded towards zero.\n * Counterpart to Solidity's `/` operator. Note: this function uses a\n`revert` opcode (which leaves remaining gas untouched) while Solidity\nuses an invalid opcode to revert (consuming all remaining gas).\n * Requirements:\n- The divisor cannot be zero.\n * _Available since v2.4.0._", - "id": 7697, + "id": 7688, "implemented": true, "kind": "function", "modifiers": [], "name": "div", "nodeType": "FunctionDefinition", "parameters": { - "id": 7677, + "id": 7668, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7672, + "id": 7663, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7697, + "scope": 7688, "src": "3731:9:32", "stateVariable": false, "storageLocation": "default", @@ -1818,7 +1818,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7671, + "id": 7662, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3731:7:32", @@ -1832,10 +1832,10 @@ }, { "constant": false, - "id": 7674, + "id": 7665, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7697, + "scope": 7688, "src": "3742:9:32", "stateVariable": false, "storageLocation": "default", @@ -1844,7 +1844,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7673, + "id": 7664, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3742:7:32", @@ -1858,10 +1858,10 @@ }, { "constant": false, - "id": 7676, + "id": 7667, "name": "errorMessage", "nodeType": "VariableDeclaration", - "scope": 7697, + "scope": 7688, "src": "3753:26:32", "stateVariable": false, "storageLocation": "memory", @@ -1870,7 +1870,7 @@ "typeString": "string" }, "typeName": { - "id": 7675, + "id": 7666, "name": "string", "nodeType": "ElementaryTypeName", "src": "3753:6:32", @@ -1886,15 +1886,15 @@ "src": "3730:50:32" }, "returnParameters": { - "id": 7680, + "id": 7671, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7679, + "id": 7670, "name": "", "nodeType": "VariableDeclaration", - "scope": 7697, + "scope": 7688, "src": "3804:7:32", "stateVariable": false, "storageLocation": "default", @@ -1903,7 +1903,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7678, + "id": 7669, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3804:7:32", @@ -1918,7 +1918,7 @@ ], "src": "3803:9:32" }, - "scope": 7737, + "scope": 7728, "src": "3718:338:32", "stateMutability": "pure", "superFunction": null, @@ -1926,7 +1926,7 @@ }, { "body": { - "id": 7712, + "id": 7703, "nodeType": "Block", "src": "4567:61:32", "statements": [ @@ -1936,11 +1936,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7707, + "id": 7698, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7699, + "referencedDeclaration": 7690, "src": "4588:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1949,11 +1949,11 @@ }, { "argumentTypes": null, - "id": 7708, + "id": 7699, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7701, + "referencedDeclaration": 7692, "src": "4591:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1963,7 +1963,7 @@ { "argumentTypes": null, "hexValue": "536166654d6174683a206d6f64756c6f206279207a65726f", - "id": 7709, + "id": 7700, "isConstant": false, "isLValue": false, "isPure": true, @@ -1994,21 +1994,21 @@ "typeString": "literal_string \"SafeMath: modulo by zero\"" } ], - "id": 7706, + "id": 7697, "name": "mod", "nodeType": "Identifier", "overloadedDeclarations": [ - 7713, - 7736 + 7704, + 7727 ], - "referencedDeclaration": 7736, + "referencedDeclaration": 7727, "src": "4584:3:32", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,string memory) pure returns (uint256)" } }, - "id": 7710, + "id": 7701, "isConstant": false, "isLValue": false, "isPure": false, @@ -2022,30 +2022,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 7705, - "id": 7711, + "functionReturnParameters": 7696, + "id": 7702, "nodeType": "Return", "src": "4577:44:32" } ] }, "documentation": "@dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo),\nReverts when dividing by zero.\n * Counterpart to Solidity's `%` operator. This function uses a `revert`\nopcode (which leaves remaining gas untouched) while Solidity uses an\ninvalid opcode to revert (consuming all remaining gas).\n * Requirements:\n- The divisor cannot be zero.", - "id": 7713, + "id": 7704, "implemented": true, "kind": "function", "modifiers": [], "name": "mod", "nodeType": "FunctionDefinition", "parameters": { - "id": 7702, + "id": 7693, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7699, + "id": 7690, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7713, + "scope": 7704, "src": "4513:9:32", "stateVariable": false, "storageLocation": "default", @@ -2054,7 +2054,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7698, + "id": 7689, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4513:7:32", @@ -2068,10 +2068,10 @@ }, { "constant": false, - "id": 7701, + "id": 7692, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7713, + "scope": 7704, "src": "4524:9:32", "stateVariable": false, "storageLocation": "default", @@ -2080,7 +2080,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7700, + "id": 7691, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4524:7:32", @@ -2096,15 +2096,15 @@ "src": "4512:22:32" }, "returnParameters": { - "id": 7705, + "id": 7696, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7704, + "id": 7695, "name": "", "nodeType": "VariableDeclaration", - "scope": 7713, + "scope": 7704, "src": "4558:7:32", "stateVariable": false, "storageLocation": "default", @@ -2113,7 +2113,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7703, + "id": 7694, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4558:7:32", @@ -2128,7 +2128,7 @@ ], "src": "4557:9:32" }, - "scope": 7737, + "scope": 7728, "src": "4500:128:32", "stateMutability": "pure", "superFunction": null, @@ -2136,7 +2136,7 @@ }, { "body": { - "id": 7735, + "id": 7726, "nodeType": "Block", "src": "5227:68:32", "statements": [ @@ -2150,18 +2150,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7727, + "id": 7718, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7725, + "id": 7716, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7717, + "referencedDeclaration": 7708, "src": "5245:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2173,7 +2173,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 7726, + "id": 7717, "isConstant": false, "isLValue": false, "isPure": true, @@ -2196,11 +2196,11 @@ }, { "argumentTypes": null, - "id": 7728, + "id": 7719, "name": "errorMessage", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7719, + "referencedDeclaration": 7710, "src": "5253:12:32", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", @@ -2219,21 +2219,21 @@ "typeString": "string memory" } ], - "id": 7724, + "id": 7715, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "5237:7:32", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7729, + "id": 7720, "isConstant": false, "isLValue": false, "isPure": false, @@ -2247,7 +2247,7 @@ "typeString": "tuple()" } }, - "id": 7730, + "id": 7721, "nodeType": "ExpressionStatement", "src": "5237:29:32" }, @@ -2258,18 +2258,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7733, + "id": 7724, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7731, + "id": 7722, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7715, + "referencedDeclaration": 7706, "src": "5283:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2280,11 +2280,11 @@ "operator": "%", "rightExpression": { "argumentTypes": null, - "id": 7732, + "id": 7723, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7717, + "referencedDeclaration": 7708, "src": "5287:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2297,30 +2297,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 7723, - "id": 7734, + "functionReturnParameters": 7714, + "id": 7725, "nodeType": "Return", "src": "5276:12:32" } ] }, "documentation": "@dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo),\nReverts with custom message when dividing by zero.\n * Counterpart to Solidity's `%` operator. This function uses a `revert`\nopcode (which leaves remaining gas untouched) while Solidity uses an\ninvalid opcode to revert (consuming all remaining gas).\n * Requirements:\n- The divisor cannot be zero.\n * _Available since v2.4.0._", - "id": 7736, + "id": 7727, "implemented": true, "kind": "function", "modifiers": [], "name": "mod", "nodeType": "FunctionDefinition", "parameters": { - "id": 7720, + "id": 7711, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7715, + "id": 7706, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7736, + "scope": 7727, "src": "5145:9:32", "stateVariable": false, "storageLocation": "default", @@ -2329,7 +2329,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7714, + "id": 7705, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5145:7:32", @@ -2343,10 +2343,10 @@ }, { "constant": false, - "id": 7717, + "id": 7708, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7736, + "scope": 7727, "src": "5156:9:32", "stateVariable": false, "storageLocation": "default", @@ -2355,7 +2355,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7716, + "id": 7707, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5156:7:32", @@ -2369,10 +2369,10 @@ }, { "constant": false, - "id": 7719, + "id": 7710, "name": "errorMessage", "nodeType": "VariableDeclaration", - "scope": 7736, + "scope": 7727, "src": "5167:26:32", "stateVariable": false, "storageLocation": "memory", @@ -2381,7 +2381,7 @@ "typeString": "string" }, "typeName": { - "id": 7718, + "id": 7709, "name": "string", "nodeType": "ElementaryTypeName", "src": "5167:6:32", @@ -2397,15 +2397,15 @@ "src": "5144:50:32" }, "returnParameters": { - "id": 7723, + "id": 7714, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7722, + "id": 7713, "name": "", "nodeType": "VariableDeclaration", - "scope": 7736, + "scope": 7727, "src": "5218:7:32", "stateVariable": false, "storageLocation": "default", @@ -2414,7 +2414,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7721, + "id": 7712, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5218:7:32", @@ -2429,14 +2429,14 @@ ], "src": "5217:9:32" }, - "scope": 7737, + "scope": 7728, "src": "5132:163:32", "stateMutability": "pure", "superFunction": null, "visibility": "internal" } ], - "scope": 7738, + "scope": 7729, "src": "589:4708:32" } ], @@ -2446,14 +2446,14 @@ "absolutePath": "@openzeppelin/contracts/math/SafeMath.sol", "exportedSymbols": { "SafeMath": [ - 7737 + 7728 ] }, - "id": 7738, + "id": 7729, "nodeType": "SourceUnit", "nodes": [ { - "id": 7552, + "id": 7543, "literals": [ "solidity", "^", @@ -2469,30 +2469,30 @@ "contractKind": "library", "documentation": "@dev Wrappers over Solidity's arithmetic operations with added overflow\nchecks.\n * Arithmetic operations in Solidity wrap on overflow. This can easily result\nin bugs, because programmers usually assume that an overflow raises an\nerror, which is the standard behavior in high level programming languages.\n`SafeMath` restores this intuition by reverting the transaction when an\noperation overflows.\n * Using this library instead of the unchecked operations eliminates an entire\nclass of bugs, so it's recommended to use it always.", "fullyImplemented": true, - "id": 7737, + "id": 7728, "linearizedBaseContracts": [ - 7737 + 7728 ], "name": "SafeMath", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 7576, + "id": 7567, "nodeType": "Block", "src": "901:109:32", "statements": [ { "assignments": [ - 7562 + 7553 ], "declarations": [ { "constant": false, - "id": 7562, + "id": 7553, "name": "c", "nodeType": "VariableDeclaration", - "scope": 7576, + "scope": 7567, "src": "911:9:32", "stateVariable": false, "storageLocation": "default", @@ -2501,7 +2501,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7561, + "id": 7552, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "911:7:32", @@ -2514,25 +2514,25 @@ "visibility": "internal" } ], - "id": 7566, + "id": 7557, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7565, + "id": 7556, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7563, + "id": 7554, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7554, + "referencedDeclaration": 7545, "src": "923:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2543,11 +2543,11 @@ "operator": "+", "rightExpression": { "argumentTypes": null, - "id": 7564, + "id": 7555, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7556, + "referencedDeclaration": 7547, "src": "927:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2573,18 +2573,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7570, + "id": 7561, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7568, + "id": 7559, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7562, + "referencedDeclaration": 7553, "src": "946:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2595,11 +2595,11 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 7569, + "id": 7560, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7554, + "referencedDeclaration": 7545, "src": "951:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2615,7 +2615,7 @@ { "argumentTypes": null, "hexValue": "536166654d6174683a206164646974696f6e206f766572666c6f77", - "id": 7571, + "id": 7562, "isConstant": false, "isLValue": false, "isPure": true, @@ -2642,21 +2642,21 @@ "typeString": "literal_string \"SafeMath: addition overflow\"" } ], - "id": 7567, + "id": 7558, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "938:7:32", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7572, + "id": 7563, "isConstant": false, "isLValue": false, "isPure": false, @@ -2670,48 +2670,48 @@ "typeString": "tuple()" } }, - "id": 7573, + "id": 7564, "nodeType": "ExpressionStatement", "src": "938:46:32" }, { "expression": { "argumentTypes": null, - "id": 7574, + "id": 7565, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7562, + "referencedDeclaration": 7553, "src": "1002:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 7560, - "id": 7575, + "functionReturnParameters": 7551, + "id": 7566, "nodeType": "Return", "src": "995:8:32" } ] }, "documentation": "@dev Returns the addition of two unsigned integers, reverting on\noverflow.\n * Counterpart to Solidity's `+` operator.\n * Requirements:\n- Addition cannot overflow.", - "id": 7577, + "id": 7568, "implemented": true, "kind": "function", "modifiers": [], "name": "add", "nodeType": "FunctionDefinition", "parameters": { - "id": 7557, + "id": 7548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7554, + "id": 7545, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7577, + "scope": 7568, "src": "847:9:32", "stateVariable": false, "storageLocation": "default", @@ -2720,7 +2720,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7553, + "id": 7544, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "847:7:32", @@ -2734,10 +2734,10 @@ }, { "constant": false, - "id": 7556, + "id": 7547, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7577, + "scope": 7568, "src": "858:9:32", "stateVariable": false, "storageLocation": "default", @@ -2746,7 +2746,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7555, + "id": 7546, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "858:7:32", @@ -2762,15 +2762,15 @@ "src": "846:22:32" }, "returnParameters": { - "id": 7560, + "id": 7551, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7559, + "id": 7550, "name": "", "nodeType": "VariableDeclaration", - "scope": 7577, + "scope": 7568, "src": "892:7:32", "stateVariable": false, "storageLocation": "default", @@ -2779,7 +2779,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7558, + "id": 7549, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "892:7:32", @@ -2794,7 +2794,7 @@ ], "src": "891:9:32" }, - "scope": 7737, + "scope": 7728, "src": "834:176:32", "stateMutability": "pure", "superFunction": null, @@ -2802,7 +2802,7 @@ }, { "body": { - "id": 7592, + "id": 7583, "nodeType": "Block", "src": "1341:67:32", "statements": [ @@ -2812,11 +2812,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7587, + "id": 7578, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7579, + "referencedDeclaration": 7570, "src": "1362:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2825,11 +2825,11 @@ }, { "argumentTypes": null, - "id": 7588, + "id": 7579, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7581, + "referencedDeclaration": 7572, "src": "1365:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2839,7 +2839,7 @@ { "argumentTypes": null, "hexValue": "536166654d6174683a207375627472616374696f6e206f766572666c6f77", - "id": 7589, + "id": 7580, "isConstant": false, "isLValue": false, "isPure": true, @@ -2870,21 +2870,21 @@ "typeString": "literal_string \"SafeMath: subtraction overflow\"" } ], - "id": 7586, + "id": 7577, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [ - 7593, - 7620 + 7584, + 7611 ], - "referencedDeclaration": 7620, + "referencedDeclaration": 7611, "src": "1358:3:32", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,string memory) pure returns (uint256)" } }, - "id": 7590, + "id": 7581, "isConstant": false, "isLValue": false, "isPure": false, @@ -2898,30 +2898,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 7585, - "id": 7591, + "functionReturnParameters": 7576, + "id": 7582, "nodeType": "Return", "src": "1351:50:32" } ] }, "documentation": "@dev Returns the subtraction of two unsigned integers, reverting on\noverflow (when the result is negative).\n * Counterpart to Solidity's `-` operator.\n * Requirements:\n- Subtraction cannot overflow.", - "id": 7593, + "id": 7584, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 7582, + "id": 7573, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7579, + "id": 7570, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7593, + "scope": 7584, "src": "1287:9:32", "stateVariable": false, "storageLocation": "default", @@ -2930,7 +2930,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7578, + "id": 7569, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1287:7:32", @@ -2944,10 +2944,10 @@ }, { "constant": false, - "id": 7581, + "id": 7572, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7593, + "scope": 7584, "src": "1298:9:32", "stateVariable": false, "storageLocation": "default", @@ -2956,7 +2956,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7580, + "id": 7571, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1298:7:32", @@ -2972,15 +2972,15 @@ "src": "1286:22:32" }, "returnParameters": { - "id": 7585, + "id": 7576, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7584, + "id": 7575, "name": "", "nodeType": "VariableDeclaration", - "scope": 7593, + "scope": 7584, "src": "1332:7:32", "stateVariable": false, "storageLocation": "default", @@ -2989,7 +2989,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7583, + "id": 7574, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1332:7:32", @@ -3004,7 +3004,7 @@ ], "src": "1331:9:32" }, - "scope": 7737, + "scope": 7728, "src": "1274:134:32", "stateMutability": "pure", "superFunction": null, @@ -3012,7 +3012,7 @@ }, { "body": { - "id": 7619, + "id": 7610, "nodeType": "Block", "src": "1827:92:32", "statements": [ @@ -3026,18 +3026,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7607, + "id": 7598, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7605, + "id": 7596, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7597, + "referencedDeclaration": 7588, "src": "1845:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3048,11 +3048,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 7606, + "id": 7597, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7595, + "referencedDeclaration": 7586, "src": "1850:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3067,11 +3067,11 @@ }, { "argumentTypes": null, - "id": 7608, + "id": 7599, "name": "errorMessage", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7599, + "referencedDeclaration": 7590, "src": "1853:12:32", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", @@ -3090,21 +3090,21 @@ "typeString": "string memory" } ], - "id": 7604, + "id": 7595, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "1837:7:32", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7609, + "id": 7600, "isConstant": false, "isLValue": false, "isPure": false, @@ -3118,21 +3118,21 @@ "typeString": "tuple()" } }, - "id": 7610, + "id": 7601, "nodeType": "ExpressionStatement", "src": "1837:29:32" }, { "assignments": [ - 7612 + 7603 ], "declarations": [ { "constant": false, - "id": 7612, + "id": 7603, "name": "c", "nodeType": "VariableDeclaration", - "scope": 7619, + "scope": 7610, "src": "1876:9:32", "stateVariable": false, "storageLocation": "default", @@ -3141,7 +3141,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7611, + "id": 7602, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1876:7:32", @@ -3154,25 +3154,25 @@ "visibility": "internal" } ], - "id": 7616, + "id": 7607, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7615, + "id": 7606, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7613, + "id": 7604, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7595, + "referencedDeclaration": 7586, "src": "1888:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3183,11 +3183,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 7614, + "id": 7605, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7597, + "referencedDeclaration": 7588, "src": "1892:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3206,41 +3206,41 @@ { "expression": { "argumentTypes": null, - "id": 7617, + "id": 7608, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7612, + "referencedDeclaration": 7603, "src": "1911:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 7603, - "id": 7618, + "functionReturnParameters": 7594, + "id": 7609, "nodeType": "Return", "src": "1904:8:32" } ] }, "documentation": "@dev Returns the subtraction of two unsigned integers, reverting with custom message on\noverflow (when the result is negative).\n * Counterpart to Solidity's `-` operator.\n * Requirements:\n- Subtraction cannot overflow.\n * _Available since v2.4.0._", - "id": 7620, + "id": 7611, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 7600, + "id": 7591, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7595, + "id": 7586, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7620, + "scope": 7611, "src": "1745:9:32", "stateVariable": false, "storageLocation": "default", @@ -3249,7 +3249,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7594, + "id": 7585, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1745:7:32", @@ -3263,10 +3263,10 @@ }, { "constant": false, - "id": 7597, + "id": 7588, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7620, + "scope": 7611, "src": "1756:9:32", "stateVariable": false, "storageLocation": "default", @@ -3275,7 +3275,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7596, + "id": 7587, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1756:7:32", @@ -3289,10 +3289,10 @@ }, { "constant": false, - "id": 7599, + "id": 7590, "name": "errorMessage", "nodeType": "VariableDeclaration", - "scope": 7620, + "scope": 7611, "src": "1767:26:32", "stateVariable": false, "storageLocation": "memory", @@ -3301,7 +3301,7 @@ "typeString": "string" }, "typeName": { - "id": 7598, + "id": 7589, "name": "string", "nodeType": "ElementaryTypeName", "src": "1767:6:32", @@ -3317,15 +3317,15 @@ "src": "1744:50:32" }, "returnParameters": { - "id": 7603, + "id": 7594, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7602, + "id": 7593, "name": "", "nodeType": "VariableDeclaration", - "scope": 7620, + "scope": 7611, "src": "1818:7:32", "stateVariable": false, "storageLocation": "default", @@ -3334,7 +3334,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7601, + "id": 7592, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "1818:7:32", @@ -3349,7 +3349,7 @@ ], "src": "1817:9:32" }, - "scope": 7737, + "scope": 7728, "src": "1732:187:32", "stateMutability": "pure", "superFunction": null, @@ -3357,7 +3357,7 @@ }, { "body": { - "id": 7653, + "id": 7644, "nodeType": "Block", "src": "2226:392:32", "statements": [ @@ -3368,18 +3368,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7631, + "id": 7622, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7629, + "id": 7620, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7622, + "referencedDeclaration": 7613, "src": "2458:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3391,7 +3391,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 7630, + "id": 7621, "isConstant": false, "isLValue": false, "isPure": true, @@ -3413,11 +3413,11 @@ } }, "falseBody": null, - "id": 7635, + "id": 7626, "nodeType": "IfStatement", "src": "2454:45:32", "trueBody": { - "id": 7634, + "id": 7625, "nodeType": "Block", "src": "2466:33:32", "statements": [ @@ -3425,7 +3425,7 @@ "expression": { "argumentTypes": null, "hexValue": "30", - "id": 7632, + "id": 7623, "isConstant": false, "isLValue": false, "isPure": true, @@ -3440,8 +3440,8 @@ }, "value": "0" }, - "functionReturnParameters": 7628, - "id": 7633, + "functionReturnParameters": 7619, + "id": 7624, "nodeType": "Return", "src": "2480:8:32" } @@ -3450,15 +3450,15 @@ }, { "assignments": [ - 7637 + 7628 ], "declarations": [ { "constant": false, - "id": 7637, + "id": 7628, "name": "c", "nodeType": "VariableDeclaration", - "scope": 7653, + "scope": 7644, "src": "2509:9:32", "stateVariable": false, "storageLocation": "default", @@ -3467,7 +3467,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7636, + "id": 7627, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2509:7:32", @@ -3480,25 +3480,25 @@ "visibility": "internal" } ], - "id": 7641, + "id": 7632, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7640, + "id": 7631, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7638, + "id": 7629, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7622, + "referencedDeclaration": 7613, "src": "2521:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3509,11 +3509,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 7639, + "id": 7630, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7624, + "referencedDeclaration": 7615, "src": "2525:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3539,7 +3539,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7647, + "id": 7638, "isConstant": false, "isLValue": false, "isPure": false, @@ -3550,18 +3550,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7645, + "id": 7636, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7643, + "id": 7634, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7637, + "referencedDeclaration": 7628, "src": "2544:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3572,11 +3572,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 7644, + "id": 7635, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7622, + "referencedDeclaration": 7613, "src": "2548:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3593,11 +3593,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 7646, + "id": 7637, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7624, + "referencedDeclaration": 7615, "src": "2553:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3613,7 +3613,7 @@ { "argumentTypes": null, "hexValue": "536166654d6174683a206d756c7469706c69636174696f6e206f766572666c6f77", - "id": 7648, + "id": 7639, "isConstant": false, "isLValue": false, "isPure": true, @@ -3640,21 +3640,21 @@ "typeString": "literal_string \"SafeMath: multiplication overflow\"" } ], - "id": 7642, + "id": 7633, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2536:7:32", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7649, + "id": 7640, "isConstant": false, "isLValue": false, "isPure": false, @@ -3668,48 +3668,48 @@ "typeString": "tuple()" } }, - "id": 7650, + "id": 7641, "nodeType": "ExpressionStatement", "src": "2536:56:32" }, { "expression": { "argumentTypes": null, - "id": 7651, + "id": 7642, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7637, + "referencedDeclaration": 7628, "src": "2610:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 7628, - "id": 7652, + "functionReturnParameters": 7619, + "id": 7643, "nodeType": "Return", "src": "2603:8:32" } ] }, "documentation": "@dev Returns the multiplication of two unsigned integers, reverting on\noverflow.\n * Counterpart to Solidity's `*` operator.\n * Requirements:\n- Multiplication cannot overflow.", - "id": 7654, + "id": 7645, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 7625, + "id": 7616, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7622, + "id": 7613, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7654, + "scope": 7645, "src": "2172:9:32", "stateVariable": false, "storageLocation": "default", @@ -3718,7 +3718,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7621, + "id": 7612, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2172:7:32", @@ -3732,10 +3732,10 @@ }, { "constant": false, - "id": 7624, + "id": 7615, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7654, + "scope": 7645, "src": "2183:9:32", "stateVariable": false, "storageLocation": "default", @@ -3744,7 +3744,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7623, + "id": 7614, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2183:7:32", @@ -3760,15 +3760,15 @@ "src": "2171:22:32" }, "returnParameters": { - "id": 7628, + "id": 7619, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7627, + "id": 7618, "name": "", "nodeType": "VariableDeclaration", - "scope": 7654, + "scope": 7645, "src": "2217:7:32", "stateVariable": false, "storageLocation": "default", @@ -3777,7 +3777,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7626, + "id": 7617, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2217:7:32", @@ -3792,7 +3792,7 @@ ], "src": "2216:9:32" }, - "scope": 7737, + "scope": 7728, "src": "2159:459:32", "stateMutability": "pure", "superFunction": null, @@ -3800,7 +3800,7 @@ }, { "body": { - "id": 7669, + "id": 7660, "nodeType": "Block", "src": "3140:63:32", "statements": [ @@ -3810,11 +3810,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7664, + "id": 7655, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7656, + "referencedDeclaration": 7647, "src": "3161:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3823,11 +3823,11 @@ }, { "argumentTypes": null, - "id": 7665, + "id": 7656, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7658, + "referencedDeclaration": 7649, "src": "3164:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3837,7 +3837,7 @@ { "argumentTypes": null, "hexValue": "536166654d6174683a206469766973696f6e206279207a65726f", - "id": 7666, + "id": 7657, "isConstant": false, "isLValue": false, "isPure": true, @@ -3868,21 +3868,21 @@ "typeString": "literal_string \"SafeMath: division by zero\"" } ], - "id": 7663, + "id": 7654, "name": "div", "nodeType": "Identifier", "overloadedDeclarations": [ - 7670, - 7697 + 7661, + 7688 ], - "referencedDeclaration": 7697, + "referencedDeclaration": 7688, "src": "3157:3:32", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,string memory) pure returns (uint256)" } }, - "id": 7667, + "id": 7658, "isConstant": false, "isLValue": false, "isPure": false, @@ -3896,30 +3896,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 7662, - "id": 7668, + "functionReturnParameters": 7653, + "id": 7659, "nodeType": "Return", "src": "3150:46:32" } ] }, "documentation": "@dev Returns the integer division of two unsigned integers. Reverts on\ndivision by zero. The result is rounded towards zero.\n * Counterpart to Solidity's `/` operator. Note: this function uses a\n`revert` opcode (which leaves remaining gas untouched) while Solidity\nuses an invalid opcode to revert (consuming all remaining gas).\n * Requirements:\n- The divisor cannot be zero.", - "id": 7670, + "id": 7661, "implemented": true, "kind": "function", "modifiers": [], "name": "div", "nodeType": "FunctionDefinition", "parameters": { - "id": 7659, + "id": 7650, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7656, + "id": 7647, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7670, + "scope": 7661, "src": "3086:9:32", "stateVariable": false, "storageLocation": "default", @@ -3928,7 +3928,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7655, + "id": 7646, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3086:7:32", @@ -3942,10 +3942,10 @@ }, { "constant": false, - "id": 7658, + "id": 7649, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7670, + "scope": 7661, "src": "3097:9:32", "stateVariable": false, "storageLocation": "default", @@ -3954,7 +3954,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7657, + "id": 7648, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3097:7:32", @@ -3970,15 +3970,15 @@ "src": "3085:22:32" }, "returnParameters": { - "id": 7662, + "id": 7653, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7661, + "id": 7652, "name": "", "nodeType": "VariableDeclaration", - "scope": 7670, + "scope": 7661, "src": "3131:7:32", "stateVariable": false, "storageLocation": "default", @@ -3987,7 +3987,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7660, + "id": 7651, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3131:7:32", @@ -4002,7 +4002,7 @@ ], "src": "3130:9:32" }, - "scope": 7737, + "scope": 7728, "src": "3073:130:32", "stateMutability": "pure", "superFunction": null, @@ -4010,7 +4010,7 @@ }, { "body": { - "id": 7696, + "id": 7687, "nodeType": "Block", "src": "3813:243:32", "statements": [ @@ -4024,18 +4024,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7684, + "id": 7675, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7682, + "id": 7673, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7674, + "referencedDeclaration": 7665, "src": "3897:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4047,7 +4047,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 7683, + "id": 7674, "isConstant": false, "isLValue": false, "isPure": true, @@ -4070,11 +4070,11 @@ }, { "argumentTypes": null, - "id": 7685, + "id": 7676, "name": "errorMessage", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7676, + "referencedDeclaration": 7667, "src": "3904:12:32", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", @@ -4093,21 +4093,21 @@ "typeString": "string memory" } ], - "id": 7681, + "id": 7672, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3889:7:32", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7686, + "id": 7677, "isConstant": false, "isLValue": false, "isPure": false, @@ -4121,21 +4121,21 @@ "typeString": "tuple()" } }, - "id": 7687, + "id": 7678, "nodeType": "ExpressionStatement", "src": "3889:28:32" }, { "assignments": [ - 7689 + 7680 ], "declarations": [ { "constant": false, - "id": 7689, + "id": 7680, "name": "c", "nodeType": "VariableDeclaration", - "scope": 7696, + "scope": 7687, "src": "3927:9:32", "stateVariable": false, "storageLocation": "default", @@ -4144,7 +4144,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7688, + "id": 7679, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3927:7:32", @@ -4157,25 +4157,25 @@ "visibility": "internal" } ], - "id": 7693, + "id": 7684, "initialValue": { "argumentTypes": null, "commonType": { "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7692, + "id": 7683, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7690, + "id": 7681, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7672, + "referencedDeclaration": 7663, "src": "3939:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4186,11 +4186,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 7691, + "id": 7682, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7674, + "referencedDeclaration": 7665, "src": "3943:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4209,41 +4209,41 @@ { "expression": { "argumentTypes": null, - "id": 7694, + "id": 7685, "name": "c", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7689, + "referencedDeclaration": 7680, "src": "4048:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "functionReturnParameters": 7680, - "id": 7695, + "functionReturnParameters": 7671, + "id": 7686, "nodeType": "Return", "src": "4041:8:32" } ] }, "documentation": "@dev Returns the integer division of two unsigned integers. Reverts with custom message on\ndivision by zero. The result is rounded towards zero.\n * Counterpart to Solidity's `/` operator. Note: this function uses a\n`revert` opcode (which leaves remaining gas untouched) while Solidity\nuses an invalid opcode to revert (consuming all remaining gas).\n * Requirements:\n- The divisor cannot be zero.\n * _Available since v2.4.0._", - "id": 7697, + "id": 7688, "implemented": true, "kind": "function", "modifiers": [], "name": "div", "nodeType": "FunctionDefinition", "parameters": { - "id": 7677, + "id": 7668, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7672, + "id": 7663, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7697, + "scope": 7688, "src": "3731:9:32", "stateVariable": false, "storageLocation": "default", @@ -4252,7 +4252,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7671, + "id": 7662, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3731:7:32", @@ -4266,10 +4266,10 @@ }, { "constant": false, - "id": 7674, + "id": 7665, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7697, + "scope": 7688, "src": "3742:9:32", "stateVariable": false, "storageLocation": "default", @@ -4278,7 +4278,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7673, + "id": 7664, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3742:7:32", @@ -4292,10 +4292,10 @@ }, { "constant": false, - "id": 7676, + "id": 7667, "name": "errorMessage", "nodeType": "VariableDeclaration", - "scope": 7697, + "scope": 7688, "src": "3753:26:32", "stateVariable": false, "storageLocation": "memory", @@ -4304,7 +4304,7 @@ "typeString": "string" }, "typeName": { - "id": 7675, + "id": 7666, "name": "string", "nodeType": "ElementaryTypeName", "src": "3753:6:32", @@ -4320,15 +4320,15 @@ "src": "3730:50:32" }, "returnParameters": { - "id": 7680, + "id": 7671, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7679, + "id": 7670, "name": "", "nodeType": "VariableDeclaration", - "scope": 7697, + "scope": 7688, "src": "3804:7:32", "stateVariable": false, "storageLocation": "default", @@ -4337,7 +4337,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7678, + "id": 7669, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3804:7:32", @@ -4352,7 +4352,7 @@ ], "src": "3803:9:32" }, - "scope": 7737, + "scope": 7728, "src": "3718:338:32", "stateMutability": "pure", "superFunction": null, @@ -4360,7 +4360,7 @@ }, { "body": { - "id": 7712, + "id": 7703, "nodeType": "Block", "src": "4567:61:32", "statements": [ @@ -4370,11 +4370,11 @@ "arguments": [ { "argumentTypes": null, - "id": 7707, + "id": 7698, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7699, + "referencedDeclaration": 7690, "src": "4588:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4383,11 +4383,11 @@ }, { "argumentTypes": null, - "id": 7708, + "id": 7699, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7701, + "referencedDeclaration": 7692, "src": "4591:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4397,7 +4397,7 @@ { "argumentTypes": null, "hexValue": "536166654d6174683a206d6f64756c6f206279207a65726f", - "id": 7709, + "id": 7700, "isConstant": false, "isLValue": false, "isPure": true, @@ -4428,21 +4428,21 @@ "typeString": "literal_string \"SafeMath: modulo by zero\"" } ], - "id": 7706, + "id": 7697, "name": "mod", "nodeType": "Identifier", "overloadedDeclarations": [ - 7713, - 7736 + 7704, + 7727 ], - "referencedDeclaration": 7736, + "referencedDeclaration": 7727, "src": "4584:3:32", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$_t_string_memory_ptr_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,string memory) pure returns (uint256)" } }, - "id": 7710, + "id": 7701, "isConstant": false, "isLValue": false, "isPure": false, @@ -4456,30 +4456,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 7705, - "id": 7711, + "functionReturnParameters": 7696, + "id": 7702, "nodeType": "Return", "src": "4577:44:32" } ] }, "documentation": "@dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo),\nReverts when dividing by zero.\n * Counterpart to Solidity's `%` operator. This function uses a `revert`\nopcode (which leaves remaining gas untouched) while Solidity uses an\ninvalid opcode to revert (consuming all remaining gas).\n * Requirements:\n- The divisor cannot be zero.", - "id": 7713, + "id": 7704, "implemented": true, "kind": "function", "modifiers": [], "name": "mod", "nodeType": "FunctionDefinition", "parameters": { - "id": 7702, + "id": 7693, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7699, + "id": 7690, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7713, + "scope": 7704, "src": "4513:9:32", "stateVariable": false, "storageLocation": "default", @@ -4488,7 +4488,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7698, + "id": 7689, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4513:7:32", @@ -4502,10 +4502,10 @@ }, { "constant": false, - "id": 7701, + "id": 7692, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7713, + "scope": 7704, "src": "4524:9:32", "stateVariable": false, "storageLocation": "default", @@ -4514,7 +4514,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7700, + "id": 7691, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4524:7:32", @@ -4530,15 +4530,15 @@ "src": "4512:22:32" }, "returnParameters": { - "id": 7705, + "id": 7696, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7704, + "id": 7695, "name": "", "nodeType": "VariableDeclaration", - "scope": 7713, + "scope": 7704, "src": "4558:7:32", "stateVariable": false, "storageLocation": "default", @@ -4547,7 +4547,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7703, + "id": 7694, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "4558:7:32", @@ -4562,7 +4562,7 @@ ], "src": "4557:9:32" }, - "scope": 7737, + "scope": 7728, "src": "4500:128:32", "stateMutability": "pure", "superFunction": null, @@ -4570,7 +4570,7 @@ }, { "body": { - "id": 7735, + "id": 7726, "nodeType": "Block", "src": "5227:68:32", "statements": [ @@ -4584,18 +4584,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7727, + "id": 7718, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7725, + "id": 7716, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7717, + "referencedDeclaration": 7708, "src": "5245:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4607,7 +4607,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 7726, + "id": 7717, "isConstant": false, "isLValue": false, "isPure": true, @@ -4630,11 +4630,11 @@ }, { "argumentTypes": null, - "id": 7728, + "id": 7719, "name": "errorMessage", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7719, + "referencedDeclaration": 7710, "src": "5253:12:32", "typeDescriptions": { "typeIdentifier": "t_string_memory_ptr", @@ -4653,21 +4653,21 @@ "typeString": "string memory" } ], - "id": 7724, + "id": 7715, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "5237:7:32", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 7729, + "id": 7720, "isConstant": false, "isLValue": false, "isPure": false, @@ -4681,7 +4681,7 @@ "typeString": "tuple()" } }, - "id": 7730, + "id": 7721, "nodeType": "ExpressionStatement", "src": "5237:29:32" }, @@ -4692,18 +4692,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 7733, + "id": 7724, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 7731, + "id": 7722, "name": "a", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7715, + "referencedDeclaration": 7706, "src": "5283:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4714,11 +4714,11 @@ "operator": "%", "rightExpression": { "argumentTypes": null, - "id": 7732, + "id": 7723, "name": "b", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7717, + "referencedDeclaration": 7708, "src": "5287:1:32", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4731,30 +4731,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 7723, - "id": 7734, + "functionReturnParameters": 7714, + "id": 7725, "nodeType": "Return", "src": "5276:12:32" } ] }, "documentation": "@dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo),\nReverts with custom message when dividing by zero.\n * Counterpart to Solidity's `%` operator. This function uses a `revert`\nopcode (which leaves remaining gas untouched) while Solidity uses an\ninvalid opcode to revert (consuming all remaining gas).\n * Requirements:\n- The divisor cannot be zero.\n * _Available since v2.4.0._", - "id": 7736, + "id": 7727, "implemented": true, "kind": "function", "modifiers": [], "name": "mod", "nodeType": "FunctionDefinition", "parameters": { - "id": 7720, + "id": 7711, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7715, + "id": 7706, "name": "a", "nodeType": "VariableDeclaration", - "scope": 7736, + "scope": 7727, "src": "5145:9:32", "stateVariable": false, "storageLocation": "default", @@ -4763,7 +4763,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7714, + "id": 7705, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5145:7:32", @@ -4777,10 +4777,10 @@ }, { "constant": false, - "id": 7717, + "id": 7708, "name": "b", "nodeType": "VariableDeclaration", - "scope": 7736, + "scope": 7727, "src": "5156:9:32", "stateVariable": false, "storageLocation": "default", @@ -4789,7 +4789,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7716, + "id": 7707, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5156:7:32", @@ -4803,10 +4803,10 @@ }, { "constant": false, - "id": 7719, + "id": 7710, "name": "errorMessage", "nodeType": "VariableDeclaration", - "scope": 7736, + "scope": 7727, "src": "5167:26:32", "stateVariable": false, "storageLocation": "memory", @@ -4815,7 +4815,7 @@ "typeString": "string" }, "typeName": { - "id": 7718, + "id": 7709, "name": "string", "nodeType": "ElementaryTypeName", "src": "5167:6:32", @@ -4831,15 +4831,15 @@ "src": "5144:50:32" }, "returnParameters": { - "id": 7723, + "id": 7714, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 7722, + "id": 7713, "name": "", "nodeType": "VariableDeclaration", - "scope": 7736, + "scope": 7727, "src": "5218:7:32", "stateVariable": false, "storageLocation": "default", @@ -4848,7 +4848,7 @@ "typeString": "uint256" }, "typeName": { - "id": 7721, + "id": 7712, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "5218:7:32", @@ -4863,14 +4863,14 @@ ], "src": "5217:9:32" }, - "scope": 7737, + "scope": 7728, "src": "5132:163:32", "stateMutability": "pure", "superFunction": null, "visibility": "internal" } ], - "scope": 7738, + "scope": 7729, "src": "589:4708:32" } ], @@ -4882,7 +4882,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.652Z", + "updatedAt": "2020-04-08T12:21:13.937Z", "devdoc": { "details": "Wrappers over Solidity's arithmetic operations with added overflow checks. * Arithmetic operations in Solidity wrap on overflow. This can easily result in bugs, because programmers usually assume that an overflow raises an error, which is the standard behavior in high level programming languages. `SafeMath` restores this intuition by reverting the transaction when an operation overflows. * Using this library instead of the unchecked operations eliminates an entire class of bugs, so it's recommended to use it always.", "methods": {} diff --git a/packages/smart-contracts/artifacts/UniswapBase.json b/packages/smart-contracts/artifacts/UniswapBase.json index ca2097a..cf05313 100644 --- a/packages/smart-contracts/artifacts/UniswapBase.json +++ b/packages/smart-contracts/artifacts/UniswapBase.json @@ -96,14 +96,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapBase.sol", "exportedSymbols": { "UniswapBase": [ - 4918 + 4970 ] }, - "id": 4919, + "id": 4971, "nodeType": "SourceUnit", "nodes": [ { - "id": 4713, + "id": 4765, "literals": [ "solidity", "0.5", @@ -115,10 +115,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol", "file": "../../interfaces/uniswap/IUniswapExchange.sol", - "id": 4714, + "id": 4766, "nodeType": "ImportDirective", - "scope": 4919, - "sourceUnit": 1910, + "scope": 4971, + "sourceUnit": 1936, "src": "25:55:23", "symbolAliases": [], "unitAlias": "" @@ -126,10 +126,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol", "file": "../../interfaces/uniswap/IUniswapFactory.sol", - "id": 4715, + "id": 4767, "nodeType": "ImportDirective", - "scope": 4919, - "sourceUnit": 1950, + "scope": 4971, + "sourceUnit": 1976, "src": "81:54:23", "symbolAliases": [], "unitAlias": "" @@ -137,9 +137,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 4716, + "id": 4768, "nodeType": "ImportDirective", - "scope": 4919, + "scope": 4971, "sourceUnit": 121, "src": "137:37:23", "symbolAliases": [], @@ -151,19 +151,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4918, + "id": 4970, "linearizedBaseContracts": [ - 4918 + 4970 ], "name": "UniswapBase", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4719, + "id": 4771, "name": "UniswapFactoryAddress", "nodeType": "VariableDeclaration", - "scope": 4918, + "scope": 4970, "src": "243:83:23", "stateVariable": true, "storageLocation": "default", @@ -172,7 +172,7 @@ "typeString": "address" }, "typeName": { - "id": 4717, + "id": 4769, "name": "address", "nodeType": "ElementaryTypeName", "src": "243:7:23", @@ -185,7 +185,7 @@ "value": { "argumentTypes": null, "hexValue": "307863306134376446653033344234303042343762446144354665634461323632316465366334643935", - "id": 4718, + "id": 4770, "isConstant": false, "isLValue": false, "isPure": true, @@ -204,7 +204,7 @@ }, { "body": { - "id": 4733, + "id": 4785, "nodeType": "Block", "src": "416:88:23", "statements": [ @@ -214,11 +214,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4730, + "id": 4782, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4721, + "referencedDeclaration": 4773, "src": "484:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -238,11 +238,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4727, + "id": 4779, "name": "UniswapFactoryAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4719, + "referencedDeclaration": 4771, "src": "449:21:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -257,18 +257,18 @@ "typeString": "address" } ], - "id": 4726, + "id": 4778, "name": "IUniswapFactory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1949, + "referencedDeclaration": 1975, "src": "433:15:23", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapFactory_$1949_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapFactory_$1975_$", "typeString": "type(contract IUniswapFactory)" } }, - "id": 4728, + "id": 4780, "isConstant": false, "isLValue": false, "isPure": true, @@ -278,25 +278,25 @@ "nodeType": "FunctionCall", "src": "433:38:23", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapFactory_$1949", + "typeIdentifier": "t_contract$_IUniswapFactory_$1975", "typeString": "contract IUniswapFactory" } }, - "id": 4729, + "id": 4781, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getExchange", "nodeType": "MemberAccess", - "referencedDeclaration": 1929, + "referencedDeclaration": 1955, "src": "433:50:23", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view external returns (address)" } }, - "id": 4731, + "id": 4783, "isConstant": false, "isLValue": false, "isPure": false, @@ -310,30 +310,30 @@ "typeString": "address" } }, - "functionReturnParameters": 4725, - "id": 4732, + "functionReturnParameters": 4777, + "id": 4784, "nodeType": "Return", "src": "426:71:23" } ] }, "documentation": null, - "id": 4734, + "id": 4786, "implemented": true, "kind": "function", "modifiers": [], "name": "_getUniswapExchange", "nodeType": "FunctionDefinition", "parameters": { - "id": 4722, + "id": 4774, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4721, + "id": 4773, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4734, + "scope": 4786, "src": "362:20:23", "stateVariable": false, "storageLocation": "default", @@ -342,7 +342,7 @@ "typeString": "address" }, "typeName": { - "id": 4720, + "id": 4772, "name": "address", "nodeType": "ElementaryTypeName", "src": "362:7:23", @@ -359,15 +359,15 @@ "src": "361:22:23" }, "returnParameters": { - "id": 4725, + "id": 4777, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4724, + "id": 4776, "name": "", "nodeType": "VariableDeclaration", - "scope": 4734, + "scope": 4786, "src": "407:7:23", "stateVariable": false, "storageLocation": "default", @@ -376,7 +376,7 @@ "typeString": "address" }, "typeName": { - "id": 4723, + "id": 4775, "name": "address", "nodeType": "ElementaryTypeName", "src": "407:7:23", @@ -392,7 +392,7 @@ ], "src": "406:9:23" }, - "scope": 4918, + "scope": 4970, "src": "333:171:23", "stateMutability": "view", "superFunction": null, @@ -400,7 +400,7 @@ }, { "body": { - "id": 4762, + "id": 4814, "nodeType": "Block", "src": "610:150:23", "statements": [ @@ -414,7 +414,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 4753, + "id": 4805, "isConstant": false, "isLValue": false, "isPure": true, @@ -437,7 +437,7 @@ "typeString": "int_const 1" } ], - "id": 4752, + "id": 4804, "isConstant": false, "isLValue": false, "isPure": true, @@ -450,7 +450,7 @@ }, "typeName": "uint" }, - "id": 4754, + "id": 4806, "isConstant": false, "isLValue": false, "isPure": true, @@ -473,18 +473,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4758, + "id": 4810, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4756, + "id": 4808, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7829, + "referencedDeclaration": 7820, "src": "743:3:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -496,7 +496,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3630", - "id": 4757, + "id": 4809, "isConstant": false, "isLValue": false, "isPure": true, @@ -525,7 +525,7 @@ "typeString": "uint256" } ], - "id": 4755, + "id": 4807, "isConstant": false, "isLValue": false, "isPure": true, @@ -538,7 +538,7 @@ }, "typeName": "uint" }, - "id": 4759, + "id": 4811, "isConstant": false, "isLValue": false, "isPure": false, @@ -567,11 +567,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4750, + "id": 4802, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4738, + "referencedDeclaration": 4790, "src": "718:9:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -596,11 +596,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4745, + "id": 4797, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4736, + "referencedDeclaration": 4788, "src": "664:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -615,18 +615,18 @@ "typeString": "address" } ], - "id": 4744, + "id": 4796, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4734, + "referencedDeclaration": 4786, "src": "644:19:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 4746, + "id": 4798, "isConstant": false, "isLValue": false, "isPure": false, @@ -648,18 +648,18 @@ "typeString": "address" } ], - "id": 4743, + "id": 4795, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "627:16:23", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 4747, + "id": 4799, "isConstant": false, "isLValue": false, "isPure": false, @@ -669,25 +669,25 @@ "nodeType": "FunctionCall", "src": "627:51:23", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 4748, + "id": 4800, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ethToTokenSwapInput", "nodeType": "MemberAccess", - "referencedDeclaration": 1640, + "referencedDeclaration": 1666, "src": "627:84:23", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) payable external returns (uint256)" } }, - "id": 4749, + "id": 4801, "isConstant": false, "isLValue": false, "isPure": false, @@ -701,7 +701,7 @@ "typeString": "function (uint256) pure returns (function (uint256,uint256) payable external returns (uint256))" } }, - "id": 4751, + "id": 4803, "isConstant": false, "isLValue": false, "isPure": false, @@ -715,7 +715,7 @@ "typeString": "function (uint256,uint256) payable external returns (uint256)" } }, - "id": 4760, + "id": 4812, "isConstant": false, "isLValue": false, "isPure": false, @@ -729,30 +729,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4742, - "id": 4761, + "functionReturnParameters": 4794, + "id": 4813, "nodeType": "Return", "src": "620:133:23" } ] }, "documentation": null, - "id": 4763, + "id": 4815, "implemented": true, "kind": "function", "modifiers": [], "name": "_buyTokensWithEthFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4739, + "id": 4791, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4736, + "id": 4788, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4763, + "scope": 4815, "src": "548:20:23", "stateVariable": false, "storageLocation": "default", @@ -761,7 +761,7 @@ "typeString": "address" }, "typeName": { - "id": 4735, + "id": 4787, "name": "address", "nodeType": "ElementaryTypeName", "src": "548:7:23", @@ -776,10 +776,10 @@ }, { "constant": false, - "id": 4738, + "id": 4790, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4763, + "scope": 4815, "src": "570:14:23", "stateVariable": false, "storageLocation": "default", @@ -788,7 +788,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4737, + "id": 4789, "name": "uint", "nodeType": "ElementaryTypeName", "src": "570:4:23", @@ -804,15 +804,15 @@ "src": "547:38:23" }, "returnParameters": { - "id": 4742, + "id": 4794, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4741, + "id": 4793, "name": "", "nodeType": "VariableDeclaration", - "scope": 4763, + "scope": 4815, "src": "604:4:23", "stateVariable": false, "storageLocation": "default", @@ -821,7 +821,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4740, + "id": 4792, "name": "uint", "nodeType": "ElementaryTypeName", "src": "604:4:23", @@ -836,7 +836,7 @@ ], "src": "603:6:23" }, - "scope": 4918, + "scope": 4970, "src": "510:250:23", "stateMutability": "nonpayable", "superFunction": null, @@ -844,7 +844,7 @@ }, { "body": { - "id": 4791, + "id": 4843, "nodeType": "Block", "src": "882:152:23", "statements": [ @@ -854,11 +854,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4783, + "id": 4835, "name": "minAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4769, + "referencedDeclaration": 4821, "src": "1001:9:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -874,18 +874,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4787, + "id": 4839, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4785, + "id": 4837, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7829, + "referencedDeclaration": 7820, "src": "1017:3:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -897,7 +897,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3630", - "id": 4786, + "id": 4838, "isConstant": false, "isLValue": false, "isPure": true, @@ -926,7 +926,7 @@ "typeString": "uint256" } ], - "id": 4784, + "id": 4836, "isConstant": false, "isLValue": false, "isPure": true, @@ -939,7 +939,7 @@ }, "typeName": "uint" }, - "id": 4788, + "id": 4840, "isConstant": false, "isLValue": false, "isPure": false, @@ -968,11 +968,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4781, + "id": 4833, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4767, + "referencedDeclaration": 4819, "src": "990:9:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -997,11 +997,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4776, + "id": 4828, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4765, + "referencedDeclaration": 4817, "src": "936:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1016,18 +1016,18 @@ "typeString": "address" } ], - "id": 4775, + "id": 4827, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4734, + "referencedDeclaration": 4786, "src": "916:19:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 4777, + "id": 4829, "isConstant": false, "isLValue": false, "isPure": false, @@ -1049,18 +1049,18 @@ "typeString": "address" } ], - "id": 4774, + "id": 4826, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "899:16:23", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 4778, + "id": 4830, "isConstant": false, "isLValue": false, "isPure": false, @@ -1070,25 +1070,25 @@ "nodeType": "FunctionCall", "src": "899:51:23", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 4779, + "id": 4831, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ethToTokenSwapInput", "nodeType": "MemberAccess", - "referencedDeclaration": 1640, + "referencedDeclaration": 1666, "src": "899:84:23", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) payable external returns (uint256)" } }, - "id": 4780, + "id": 4832, "isConstant": false, "isLValue": false, "isPure": false, @@ -1102,7 +1102,7 @@ "typeString": "function (uint256) pure returns (function (uint256,uint256) payable external returns (uint256))" } }, - "id": 4782, + "id": 4834, "isConstant": false, "isLValue": false, "isPure": false, @@ -1116,7 +1116,7 @@ "typeString": "function (uint256,uint256) payable external returns (uint256)" } }, - "id": 4789, + "id": 4841, "isConstant": false, "isLValue": false, "isPure": false, @@ -1130,30 +1130,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4773, - "id": 4790, + "functionReturnParameters": 4825, + "id": 4842, "nodeType": "Return", "src": "892:135:23" } ] }, "documentation": null, - "id": 4792, + "id": 4844, "implemented": true, "kind": "function", "modifiers": [], "name": "_buyTokensWithEthFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4770, + "id": 4822, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4765, + "id": 4817, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4792, + "scope": 4844, "src": "804:20:23", "stateVariable": false, "storageLocation": "default", @@ -1162,7 +1162,7 @@ "typeString": "address" }, "typeName": { - "id": 4764, + "id": 4816, "name": "address", "nodeType": "ElementaryTypeName", "src": "804:7:23", @@ -1177,10 +1177,10 @@ }, { "constant": false, - "id": 4767, + "id": 4819, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4792, + "scope": 4844, "src": "826:14:23", "stateVariable": false, "storageLocation": "default", @@ -1189,7 +1189,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4766, + "id": 4818, "name": "uint", "nodeType": "ElementaryTypeName", "src": "826:4:23", @@ -1203,10 +1203,10 @@ }, { "constant": false, - "id": 4769, + "id": 4821, "name": "minAmount", "nodeType": "VariableDeclaration", - "scope": 4792, + "scope": 4844, "src": "842:14:23", "stateVariable": false, "storageLocation": "default", @@ -1215,7 +1215,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4768, + "id": 4820, "name": "uint", "nodeType": "ElementaryTypeName", "src": "842:4:23", @@ -1231,15 +1231,15 @@ "src": "803:54:23" }, "returnParameters": { - "id": 4773, + "id": 4825, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4772, + "id": 4824, "name": "", "nodeType": "VariableDeclaration", - "scope": 4792, + "scope": 4844, "src": "876:4:23", "stateVariable": false, "storageLocation": "default", @@ -1248,7 +1248,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4771, + "id": 4823, "name": "uint", "nodeType": "ElementaryTypeName", "src": "876:4:23", @@ -1263,7 +1263,7 @@ ], "src": "875:6:23" }, - "scope": 4918, + "scope": 4970, "src": "766:268:23", "stateMutability": "nonpayable", "superFunction": null, @@ -1271,21 +1271,21 @@ }, { "body": { - "id": 4830, + "id": 4882, "nodeType": "Block", "src": "1142:246:23", "statements": [ { "assignments": [ - 4802 + 4854 ], "declarations": [ { "constant": false, - "id": 4802, + "id": 4854, "name": "exchange", "nodeType": "VariableDeclaration", - "scope": 4830, + "scope": 4882, "src": "1152:16:23", "stateVariable": false, "storageLocation": "default", @@ -1294,7 +1294,7 @@ "typeString": "address" }, "typeName": { - "id": 4801, + "id": 4853, "name": "address", "nodeType": "ElementaryTypeName", "src": "1152:7:23", @@ -1308,17 +1308,17 @@ "visibility": "internal" } ], - "id": 4806, + "id": 4858, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4804, + "id": 4856, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4794, + "referencedDeclaration": 4846, "src": "1191:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1333,18 +1333,18 @@ "typeString": "address" } ], - "id": 4803, + "id": 4855, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4734, + "referencedDeclaration": 4786, "src": "1171:19:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 4805, + "id": 4857, "isConstant": false, "isLValue": false, "isPure": false, @@ -1367,11 +1367,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4811, + "id": 4863, "name": "exchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4802, + "referencedDeclaration": 4854, "src": "1244:8:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1380,11 +1380,11 @@ }, { "argumentTypes": null, - "id": 4812, + "id": 4864, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4796, + "referencedDeclaration": 4848, "src": "1254:11:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1408,11 +1408,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4808, + "id": 4860, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4794, + "referencedDeclaration": 4846, "src": "1222:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1427,7 +1427,7 @@ "typeString": "address" } ], - "id": 4807, + "id": 4859, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1438,7 +1438,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 4809, + "id": 4861, "isConstant": false, "isLValue": false, "isPure": false, @@ -1452,7 +1452,7 @@ "typeString": "contract IERC20" } }, - "id": 4810, + "id": 4862, "isConstant": false, "isLValue": false, "isPure": false, @@ -1466,7 +1466,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 4813, + "id": 4865, "isConstant": false, "isLValue": false, "isPure": false, @@ -1480,7 +1480,7 @@ "typeString": "bool" } }, - "id": 4814, + "id": 4866, "nodeType": "ExpressionStatement", "src": "1215:51:23" }, @@ -1490,11 +1490,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4819, + "id": 4871, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4796, + "referencedDeclaration": 4848, "src": "1344:11:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1507,7 +1507,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 4821, + "id": 4873, "isConstant": false, "isLValue": false, "isPure": true, @@ -1530,7 +1530,7 @@ "typeString": "int_const 1" } ], - "id": 4820, + "id": 4872, "isConstant": false, "isLValue": false, "isPure": true, @@ -1543,7 +1543,7 @@ }, "typeName": "uint" }, - "id": 4822, + "id": 4874, "isConstant": false, "isLValue": false, "isPure": true, @@ -1566,18 +1566,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4826, + "id": 4878, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4824, + "id": 4876, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7829, + "referencedDeclaration": 7820, "src": "1371:3:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1589,7 +1589,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3630", - "id": 4825, + "id": 4877, "isConstant": false, "isLValue": false, "isPure": true, @@ -1618,7 +1618,7 @@ "typeString": "uint256" } ], - "id": 4823, + "id": 4875, "isConstant": false, "isLValue": false, "isPure": true, @@ -1631,7 +1631,7 @@ }, "typeName": "uint" }, - "id": 4827, + "id": 4879, "isConstant": false, "isLValue": false, "isPure": false, @@ -1666,11 +1666,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4816, + "id": 4868, "name": "exchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4802, + "referencedDeclaration": 4854, "src": "1301:8:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1685,18 +1685,18 @@ "typeString": "address" } ], - "id": 4815, + "id": 4867, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "1284:16:23", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 4817, + "id": 4869, "isConstant": false, "isLValue": false, "isPure": false, @@ -1706,25 +1706,25 @@ "nodeType": "FunctionCall", "src": "1284:26:23", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 4818, + "id": 4870, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "tokenToEthSwapInput", "nodeType": "MemberAccess", - "referencedDeclaration": 1682, + "referencedDeclaration": 1708, "src": "1284:59:23", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,uint256) external returns (uint256)" } }, - "id": 4828, + "id": 4880, "isConstant": false, "isLValue": false, "isPure": false, @@ -1738,30 +1738,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4800, - "id": 4829, + "functionReturnParameters": 4852, + "id": 4881, "nodeType": "Return", "src": "1277:104:23" } ] }, "documentation": null, - "id": 4831, + "id": 4883, "implemented": true, "kind": "function", "modifiers": [], "name": "_sellTokensForEthFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4797, + "id": 4849, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4794, + "id": 4846, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4831, + "scope": 4883, "src": "1078:20:23", "stateVariable": false, "storageLocation": "default", @@ -1770,7 +1770,7 @@ "typeString": "address" }, "typeName": { - "id": 4793, + "id": 4845, "name": "address", "nodeType": "ElementaryTypeName", "src": "1078:7:23", @@ -1785,10 +1785,10 @@ }, { "constant": false, - "id": 4796, + "id": 4848, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 4831, + "scope": 4883, "src": "1100:16:23", "stateVariable": false, "storageLocation": "default", @@ -1797,7 +1797,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4795, + "id": 4847, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1100:4:23", @@ -1813,15 +1813,15 @@ "src": "1077:40:23" }, "returnParameters": { - "id": 4800, + "id": 4852, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4799, + "id": 4851, "name": "", "nodeType": "VariableDeclaration", - "scope": 4831, + "scope": 4883, "src": "1136:4:23", "stateVariable": false, "storageLocation": "default", @@ -1830,7 +1830,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4798, + "id": 4850, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1136:4:23", @@ -1845,7 +1845,7 @@ ], "src": "1135:6:23" }, - "scope": 4918, + "scope": 4970, "src": "1040:348:23", "stateMutability": "nonpayable", "superFunction": null, @@ -1853,21 +1853,21 @@ }, { "body": { - "id": 4854, + "id": 4906, "nodeType": "Block", "src": "1503:141:23", "statements": [ { "assignments": [ - 4843 + 4895 ], "declarations": [ { "constant": false, - "id": 4843, + "id": 4895, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4854, + "scope": 4906, "src": "1513:14:23", "stateVariable": false, "storageLocation": "default", @@ -1876,7 +1876,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4842, + "id": 4894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1513:4:23", @@ -1889,17 +1889,17 @@ "visibility": "internal" } ], - "id": 4848, + "id": 4900, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4845, + "id": 4897, "name": "from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4833, + "referencedDeclaration": 4885, "src": "1559:4:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1908,11 +1908,11 @@ }, { "argumentTypes": null, - "id": 4846, + "id": 4898, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4837, + "referencedDeclaration": 4889, "src": "1565:11:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1931,18 +1931,18 @@ "typeString": "uint256" } ], - "id": 4844, + "id": 4896, "name": "_sellTokensForEthFromUniswap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4831, + "referencedDeclaration": 4883, "src": "1530:28:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4847, + "id": 4899, "isConstant": false, "isLValue": false, "isPure": false, @@ -1965,11 +1965,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4850, + "id": 4902, "name": "to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4835, + "referencedDeclaration": 4887, "src": "1623:2:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1978,11 +1978,11 @@ }, { "argumentTypes": null, - "id": 4851, + "id": 4903, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4843, + "referencedDeclaration": 4895, "src": "1627:9:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2001,21 +2001,21 @@ "typeString": "uint256" } ], - "id": 4849, + "id": 4901, "name": "_buyTokensWithEthFromUniswap", "nodeType": "Identifier", "overloadedDeclarations": [ - 4763, - 4792 + 4815, + 4844 ], - "referencedDeclaration": 4763, + "referencedDeclaration": 4815, "src": "1594:28:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4852, + "id": 4904, "isConstant": false, "isLValue": false, "isPure": false, @@ -2029,30 +2029,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4841, - "id": 4853, + "functionReturnParameters": 4893, + "id": 4905, "nodeType": "Return", "src": "1587:50:23" } ] }, "documentation": null, - "id": 4855, + "id": 4907, "implemented": true, "kind": "function", "modifiers": [], "name": "_sellTokensForTokensFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4838, + "id": 4890, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4833, + "id": 4885, "name": "from", "nodeType": "VariableDeclaration", - "scope": 4855, + "scope": 4907, "src": "1435:12:23", "stateVariable": false, "storageLocation": "default", @@ -2061,7 +2061,7 @@ "typeString": "address" }, "typeName": { - "id": 4832, + "id": 4884, "name": "address", "nodeType": "ElementaryTypeName", "src": "1435:7:23", @@ -2076,10 +2076,10 @@ }, { "constant": false, - "id": 4835, + "id": 4887, "name": "to", "nodeType": "VariableDeclaration", - "scope": 4855, + "scope": 4907, "src": "1449:10:23", "stateVariable": false, "storageLocation": "default", @@ -2088,7 +2088,7 @@ "typeString": "address" }, "typeName": { - "id": 4834, + "id": 4886, "name": "address", "nodeType": "ElementaryTypeName", "src": "1449:7:23", @@ -2103,10 +2103,10 @@ }, { "constant": false, - "id": 4837, + "id": 4889, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 4855, + "scope": 4907, "src": "1461:16:23", "stateVariable": false, "storageLocation": "default", @@ -2115,7 +2115,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4836, + "id": 4888, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1461:4:23", @@ -2131,15 +2131,15 @@ "src": "1434:44:23" }, "returnParameters": { - "id": 4841, + "id": 4893, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4840, + "id": 4892, "name": "", "nodeType": "VariableDeclaration", - "scope": 4855, + "scope": 4907, "src": "1497:4:23", "stateVariable": false, "storageLocation": "default", @@ -2148,7 +2148,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4839, + "id": 4891, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1497:4:23", @@ -2163,7 +2163,7 @@ ], "src": "1496:6:23" }, - "scope": 4918, + "scope": 4970, "src": "1394:250:23", "stateMutability": "nonpayable", "superFunction": null, @@ -2171,7 +2171,7 @@ }, { "body": { - "id": 4873, + "id": 4925, "nodeType": "Block", "src": "1761:112:23", "statements": [ @@ -2181,11 +2181,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4870, + "id": 4922, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4859, + "referencedDeclaration": 4911, "src": "1854:11:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2208,11 +2208,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4866, + "id": 4918, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4857, + "referencedDeclaration": 4909, "src": "1815:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2227,18 +2227,18 @@ "typeString": "address" } ], - "id": 4865, + "id": 4917, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4734, + "referencedDeclaration": 4786, "src": "1795:19:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 4867, + "id": 4919, "isConstant": false, "isLValue": false, "isPure": false, @@ -2260,18 +2260,18 @@ "typeString": "address" } ], - "id": 4864, + "id": 4916, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "1778:16:23", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 4868, + "id": 4920, "isConstant": false, "isLValue": false, "isPure": false, @@ -2281,25 +2281,25 @@ "nodeType": "FunctionCall", "src": "1778:51:23", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 4869, + "id": 4921, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTokenToEthInputPrice", "nodeType": "MemberAccess", - "referencedDeclaration": 1624, + "referencedDeclaration": 1650, "src": "1778:75:23", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 4871, + "id": 4923, "isConstant": false, "isLValue": false, "isPure": false, @@ -2313,30 +2313,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4863, - "id": 4872, + "functionReturnParameters": 4915, + "id": 4924, "nodeType": "Return", "src": "1771:95:23" } ] }, "documentation": null, - "id": 4874, + "id": 4926, "implemented": true, "kind": "function", "modifiers": [], "name": "getTokenToEthInputPriceFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4860, + "id": 4912, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4857, + "id": 4909, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4874, + "scope": 4926, "src": "1694:20:23", "stateVariable": false, "storageLocation": "default", @@ -2345,7 +2345,7 @@ "typeString": "address" }, "typeName": { - "id": 4856, + "id": 4908, "name": "address", "nodeType": "ElementaryTypeName", "src": "1694:7:23", @@ -2360,10 +2360,10 @@ }, { "constant": false, - "id": 4859, + "id": 4911, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 4874, + "scope": 4926, "src": "1716:16:23", "stateVariable": false, "storageLocation": "default", @@ -2372,7 +2372,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4858, + "id": 4910, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1716:4:23", @@ -2388,15 +2388,15 @@ "src": "1693:40:23" }, "returnParameters": { - "id": 4863, + "id": 4915, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4862, + "id": 4914, "name": "", "nodeType": "VariableDeclaration", - "scope": 4874, + "scope": 4926, "src": "1755:4:23", "stateVariable": false, "storageLocation": "default", @@ -2405,7 +2405,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4861, + "id": 4913, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1755:4:23", @@ -2420,7 +2420,7 @@ ], "src": "1754:6:23" }, - "scope": 4918, + "scope": 4970, "src": "1650:223:23", "stateMutability": "view", "superFunction": null, @@ -2428,7 +2428,7 @@ }, { "body": { - "id": 4892, + "id": 4944, "nodeType": "Block", "src": "1988:110:23", "statements": [ @@ -2438,11 +2438,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4889, + "id": 4941, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4878, + "referencedDeclaration": 4930, "src": "2081:9:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2465,11 +2465,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4885, + "id": 4937, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4876, + "referencedDeclaration": 4928, "src": "2042:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2484,18 +2484,18 @@ "typeString": "address" } ], - "id": 4884, + "id": 4936, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4734, + "referencedDeclaration": 4786, "src": "2022:19:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 4886, + "id": 4938, "isConstant": false, "isLValue": false, "isPure": false, @@ -2517,18 +2517,18 @@ "typeString": "address" } ], - "id": 4883, + "id": 4935, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "2005:16:23", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 4887, + "id": 4939, "isConstant": false, "isLValue": false, "isPure": false, @@ -2538,25 +2538,25 @@ "nodeType": "FunctionCall", "src": "2005:51:23", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 4888, + "id": 4940, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getEthToTokenInputPrice", "nodeType": "MemberAccess", - "referencedDeclaration": 1610, + "referencedDeclaration": 1636, "src": "2005:75:23", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 4890, + "id": 4942, "isConstant": false, "isLValue": false, "isPure": false, @@ -2570,30 +2570,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4882, - "id": 4891, + "functionReturnParameters": 4934, + "id": 4943, "nodeType": "Return", "src": "1998:93:23" } ] }, "documentation": null, - "id": 4893, + "id": 4945, "implemented": true, "kind": "function", "modifiers": [], "name": "getEthToTokenInputPriceFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4879, + "id": 4931, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4876, + "id": 4928, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4893, + "scope": 4945, "src": "1923:20:23", "stateVariable": false, "storageLocation": "default", @@ -2602,7 +2602,7 @@ "typeString": "address" }, "typeName": { - "id": 4875, + "id": 4927, "name": "address", "nodeType": "ElementaryTypeName", "src": "1923:7:23", @@ -2617,10 +2617,10 @@ }, { "constant": false, - "id": 4878, + "id": 4930, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4893, + "scope": 4945, "src": "1945:14:23", "stateVariable": false, "storageLocation": "default", @@ -2629,7 +2629,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4877, + "id": 4929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1945:4:23", @@ -2645,15 +2645,15 @@ "src": "1922:38:23" }, "returnParameters": { - "id": 4882, + "id": 4934, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4881, + "id": 4933, "name": "", "nodeType": "VariableDeclaration", - "scope": 4893, + "scope": 4945, "src": "1982:4:23", "stateVariable": false, "storageLocation": "default", @@ -2662,7 +2662,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4880, + "id": 4932, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1982:4:23", @@ -2677,7 +2677,7 @@ ], "src": "1981:6:23" }, - "scope": 4918, + "scope": 4970, "src": "1879:219:23", "stateMutability": "view", "superFunction": null, @@ -2685,21 +2685,21 @@ }, { "body": { - "id": 4916, + "id": 4968, "nodeType": "Block", "src": "2215:152:23", "statements": [ { "assignments": [ - 4905 + 4957 ], "declarations": [ { "constant": false, - "id": 4905, + "id": 4957, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4916, + "scope": 4968, "src": "2225:14:23", "stateVariable": false, "storageLocation": "default", @@ -2708,7 +2708,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4904, + "id": 4956, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2225:4:23", @@ -2721,17 +2721,17 @@ "visibility": "internal" } ], - "id": 4910, + "id": 4962, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4907, + "id": 4959, "name": "from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4895, + "referencedDeclaration": 4947, "src": "2277:4:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2740,11 +2740,11 @@ }, { "argumentTypes": null, - "id": 4908, + "id": 4960, "name": "fromAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4899, + "referencedDeclaration": 4951, "src": "2283:10:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2763,18 +2763,18 @@ "typeString": "uint256" } ], - "id": 4906, + "id": 4958, "name": "getTokenToEthInputPriceFromUniswap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4874, + "referencedDeclaration": 4926, "src": "2242:34:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 4909, + "id": 4961, "isConstant": false, "isLValue": false, "isPure": false, @@ -2797,11 +2797,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4912, + "id": 4964, "name": "to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4897, + "referencedDeclaration": 4949, "src": "2346:2:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2810,11 +2810,11 @@ }, { "argumentTypes": null, - "id": 4913, + "id": 4965, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4905, + "referencedDeclaration": 4957, "src": "2350:9:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2833,18 +2833,18 @@ "typeString": "uint256" } ], - "id": 4911, + "id": 4963, "name": "getEthToTokenInputPriceFromUniswap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4893, + "referencedDeclaration": 4945, "src": "2311:34:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 4914, + "id": 4966, "isConstant": false, "isLValue": false, "isPure": false, @@ -2858,30 +2858,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4903, - "id": 4915, + "functionReturnParameters": 4955, + "id": 4967, "nodeType": "Return", "src": "2304:56:23" } ] }, "documentation": null, - "id": 4917, + "id": 4969, "implemented": true, "kind": "function", "modifiers": [], "name": "getTokenToTokenPriceFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4900, + "id": 4952, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4895, + "id": 4947, "name": "from", "nodeType": "VariableDeclaration", - "scope": 4917, + "scope": 4969, "src": "2145:12:23", "stateVariable": false, "storageLocation": "default", @@ -2890,7 +2890,7 @@ "typeString": "address" }, "typeName": { - "id": 4894, + "id": 4946, "name": "address", "nodeType": "ElementaryTypeName", "src": "2145:7:23", @@ -2905,10 +2905,10 @@ }, { "constant": false, - "id": 4897, + "id": 4949, "name": "to", "nodeType": "VariableDeclaration", - "scope": 4917, + "scope": 4969, "src": "2159:10:23", "stateVariable": false, "storageLocation": "default", @@ -2917,7 +2917,7 @@ "typeString": "address" }, "typeName": { - "id": 4896, + "id": 4948, "name": "address", "nodeType": "ElementaryTypeName", "src": "2159:7:23", @@ -2932,10 +2932,10 @@ }, { "constant": false, - "id": 4899, + "id": 4951, "name": "fromAmount", "nodeType": "VariableDeclaration", - "scope": 4917, + "scope": 4969, "src": "2171:15:23", "stateVariable": false, "storageLocation": "default", @@ -2944,7 +2944,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4898, + "id": 4950, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2171:4:23", @@ -2960,15 +2960,15 @@ "src": "2144:43:23" }, "returnParameters": { - "id": 4903, + "id": 4955, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4902, + "id": 4954, "name": "", "nodeType": "VariableDeclaration", - "scope": 4917, + "scope": 4969, "src": "2209:4:23", "stateVariable": false, "storageLocation": "default", @@ -2977,7 +2977,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4901, + "id": 4953, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2209:4:23", @@ -2992,14 +2992,14 @@ ], "src": "2208:6:23" }, - "scope": 4918, + "scope": 4970, "src": "2104:263:23", "stateMutability": "view", "superFunction": null, "visibility": "public" } ], - "scope": 4919, + "scope": 4971, "src": "177:2192:23" } ], @@ -3009,14 +3009,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapBase.sol", "exportedSymbols": { "UniswapBase": [ - 4918 + 4970 ] }, - "id": 4919, + "id": 4971, "nodeType": "SourceUnit", "nodes": [ { - "id": 4713, + "id": 4765, "literals": [ "solidity", "0.5", @@ -3028,10 +3028,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol", "file": "../../interfaces/uniswap/IUniswapExchange.sol", - "id": 4714, + "id": 4766, "nodeType": "ImportDirective", - "scope": 4919, - "sourceUnit": 1910, + "scope": 4971, + "sourceUnit": 1936, "src": "25:55:23", "symbolAliases": [], "unitAlias": "" @@ -3039,10 +3039,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol", "file": "../../interfaces/uniswap/IUniswapFactory.sol", - "id": 4715, + "id": 4767, "nodeType": "ImportDirective", - "scope": 4919, - "sourceUnit": 1950, + "scope": 4971, + "sourceUnit": 1976, "src": "81:54:23", "symbolAliases": [], "unitAlias": "" @@ -3050,9 +3050,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 4716, + "id": 4768, "nodeType": "ImportDirective", - "scope": 4919, + "scope": 4971, "sourceUnit": 121, "src": "137:37:23", "symbolAliases": [], @@ -3064,19 +3064,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4918, + "id": 4970, "linearizedBaseContracts": [ - 4918 + 4970 ], "name": "UniswapBase", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4719, + "id": 4771, "name": "UniswapFactoryAddress", "nodeType": "VariableDeclaration", - "scope": 4918, + "scope": 4970, "src": "243:83:23", "stateVariable": true, "storageLocation": "default", @@ -3085,7 +3085,7 @@ "typeString": "address" }, "typeName": { - "id": 4717, + "id": 4769, "name": "address", "nodeType": "ElementaryTypeName", "src": "243:7:23", @@ -3098,7 +3098,7 @@ "value": { "argumentTypes": null, "hexValue": "307863306134376446653033344234303042343762446144354665634461323632316465366334643935", - "id": 4718, + "id": 4770, "isConstant": false, "isLValue": false, "isPure": true, @@ -3117,7 +3117,7 @@ }, { "body": { - "id": 4733, + "id": 4785, "nodeType": "Block", "src": "416:88:23", "statements": [ @@ -3127,11 +3127,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4730, + "id": 4782, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4721, + "referencedDeclaration": 4773, "src": "484:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3151,11 +3151,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4727, + "id": 4779, "name": "UniswapFactoryAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4719, + "referencedDeclaration": 4771, "src": "449:21:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3170,18 +3170,18 @@ "typeString": "address" } ], - "id": 4726, + "id": 4778, "name": "IUniswapFactory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1949, + "referencedDeclaration": 1975, "src": "433:15:23", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapFactory_$1949_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapFactory_$1975_$", "typeString": "type(contract IUniswapFactory)" } }, - "id": 4728, + "id": 4780, "isConstant": false, "isLValue": false, "isPure": true, @@ -3191,25 +3191,25 @@ "nodeType": "FunctionCall", "src": "433:38:23", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapFactory_$1949", + "typeIdentifier": "t_contract$_IUniswapFactory_$1975", "typeString": "contract IUniswapFactory" } }, - "id": 4729, + "id": 4781, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getExchange", "nodeType": "MemberAccess", - "referencedDeclaration": 1929, + "referencedDeclaration": 1955, "src": "433:50:23", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view external returns (address)" } }, - "id": 4731, + "id": 4783, "isConstant": false, "isLValue": false, "isPure": false, @@ -3223,30 +3223,30 @@ "typeString": "address" } }, - "functionReturnParameters": 4725, - "id": 4732, + "functionReturnParameters": 4777, + "id": 4784, "nodeType": "Return", "src": "426:71:23" } ] }, "documentation": null, - "id": 4734, + "id": 4786, "implemented": true, "kind": "function", "modifiers": [], "name": "_getUniswapExchange", "nodeType": "FunctionDefinition", "parameters": { - "id": 4722, + "id": 4774, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4721, + "id": 4773, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4734, + "scope": 4786, "src": "362:20:23", "stateVariable": false, "storageLocation": "default", @@ -3255,7 +3255,7 @@ "typeString": "address" }, "typeName": { - "id": 4720, + "id": 4772, "name": "address", "nodeType": "ElementaryTypeName", "src": "362:7:23", @@ -3272,15 +3272,15 @@ "src": "361:22:23" }, "returnParameters": { - "id": 4725, + "id": 4777, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4724, + "id": 4776, "name": "", "nodeType": "VariableDeclaration", - "scope": 4734, + "scope": 4786, "src": "407:7:23", "stateVariable": false, "storageLocation": "default", @@ -3289,7 +3289,7 @@ "typeString": "address" }, "typeName": { - "id": 4723, + "id": 4775, "name": "address", "nodeType": "ElementaryTypeName", "src": "407:7:23", @@ -3305,7 +3305,7 @@ ], "src": "406:9:23" }, - "scope": 4918, + "scope": 4970, "src": "333:171:23", "stateMutability": "view", "superFunction": null, @@ -3313,7 +3313,7 @@ }, { "body": { - "id": 4762, + "id": 4814, "nodeType": "Block", "src": "610:150:23", "statements": [ @@ -3327,7 +3327,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 4753, + "id": 4805, "isConstant": false, "isLValue": false, "isPure": true, @@ -3350,7 +3350,7 @@ "typeString": "int_const 1" } ], - "id": 4752, + "id": 4804, "isConstant": false, "isLValue": false, "isPure": true, @@ -3363,7 +3363,7 @@ }, "typeName": "uint" }, - "id": 4754, + "id": 4806, "isConstant": false, "isLValue": false, "isPure": true, @@ -3386,18 +3386,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4758, + "id": 4810, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4756, + "id": 4808, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7829, + "referencedDeclaration": 7820, "src": "743:3:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3409,7 +3409,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3630", - "id": 4757, + "id": 4809, "isConstant": false, "isLValue": false, "isPure": true, @@ -3438,7 +3438,7 @@ "typeString": "uint256" } ], - "id": 4755, + "id": 4807, "isConstant": false, "isLValue": false, "isPure": true, @@ -3451,7 +3451,7 @@ }, "typeName": "uint" }, - "id": 4759, + "id": 4811, "isConstant": false, "isLValue": false, "isPure": false, @@ -3480,11 +3480,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4750, + "id": 4802, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4738, + "referencedDeclaration": 4790, "src": "718:9:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3509,11 +3509,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4745, + "id": 4797, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4736, + "referencedDeclaration": 4788, "src": "664:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3528,18 +3528,18 @@ "typeString": "address" } ], - "id": 4744, + "id": 4796, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4734, + "referencedDeclaration": 4786, "src": "644:19:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 4746, + "id": 4798, "isConstant": false, "isLValue": false, "isPure": false, @@ -3561,18 +3561,18 @@ "typeString": "address" } ], - "id": 4743, + "id": 4795, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "627:16:23", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 4747, + "id": 4799, "isConstant": false, "isLValue": false, "isPure": false, @@ -3582,25 +3582,25 @@ "nodeType": "FunctionCall", "src": "627:51:23", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 4748, + "id": 4800, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ethToTokenSwapInput", "nodeType": "MemberAccess", - "referencedDeclaration": 1640, + "referencedDeclaration": 1666, "src": "627:84:23", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) payable external returns (uint256)" } }, - "id": 4749, + "id": 4801, "isConstant": false, "isLValue": false, "isPure": false, @@ -3614,7 +3614,7 @@ "typeString": "function (uint256) pure returns (function (uint256,uint256) payable external returns (uint256))" } }, - "id": 4751, + "id": 4803, "isConstant": false, "isLValue": false, "isPure": false, @@ -3628,7 +3628,7 @@ "typeString": "function (uint256,uint256) payable external returns (uint256)" } }, - "id": 4760, + "id": 4812, "isConstant": false, "isLValue": false, "isPure": false, @@ -3642,30 +3642,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4742, - "id": 4761, + "functionReturnParameters": 4794, + "id": 4813, "nodeType": "Return", "src": "620:133:23" } ] }, "documentation": null, - "id": 4763, + "id": 4815, "implemented": true, "kind": "function", "modifiers": [], "name": "_buyTokensWithEthFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4739, + "id": 4791, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4736, + "id": 4788, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4763, + "scope": 4815, "src": "548:20:23", "stateVariable": false, "storageLocation": "default", @@ -3674,7 +3674,7 @@ "typeString": "address" }, "typeName": { - "id": 4735, + "id": 4787, "name": "address", "nodeType": "ElementaryTypeName", "src": "548:7:23", @@ -3689,10 +3689,10 @@ }, { "constant": false, - "id": 4738, + "id": 4790, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4763, + "scope": 4815, "src": "570:14:23", "stateVariable": false, "storageLocation": "default", @@ -3701,7 +3701,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4737, + "id": 4789, "name": "uint", "nodeType": "ElementaryTypeName", "src": "570:4:23", @@ -3717,15 +3717,15 @@ "src": "547:38:23" }, "returnParameters": { - "id": 4742, + "id": 4794, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4741, + "id": 4793, "name": "", "nodeType": "VariableDeclaration", - "scope": 4763, + "scope": 4815, "src": "604:4:23", "stateVariable": false, "storageLocation": "default", @@ -3734,7 +3734,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4740, + "id": 4792, "name": "uint", "nodeType": "ElementaryTypeName", "src": "604:4:23", @@ -3749,7 +3749,7 @@ ], "src": "603:6:23" }, - "scope": 4918, + "scope": 4970, "src": "510:250:23", "stateMutability": "nonpayable", "superFunction": null, @@ -3757,7 +3757,7 @@ }, { "body": { - "id": 4791, + "id": 4843, "nodeType": "Block", "src": "882:152:23", "statements": [ @@ -3767,11 +3767,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4783, + "id": 4835, "name": "minAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4769, + "referencedDeclaration": 4821, "src": "1001:9:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3787,18 +3787,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4787, + "id": 4839, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4785, + "id": 4837, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7829, + "referencedDeclaration": 7820, "src": "1017:3:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3810,7 +3810,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3630", - "id": 4786, + "id": 4838, "isConstant": false, "isLValue": false, "isPure": true, @@ -3839,7 +3839,7 @@ "typeString": "uint256" } ], - "id": 4784, + "id": 4836, "isConstant": false, "isLValue": false, "isPure": true, @@ -3852,7 +3852,7 @@ }, "typeName": "uint" }, - "id": 4788, + "id": 4840, "isConstant": false, "isLValue": false, "isPure": false, @@ -3881,11 +3881,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4781, + "id": 4833, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4767, + "referencedDeclaration": 4819, "src": "990:9:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3910,11 +3910,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4776, + "id": 4828, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4765, + "referencedDeclaration": 4817, "src": "936:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3929,18 +3929,18 @@ "typeString": "address" } ], - "id": 4775, + "id": 4827, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4734, + "referencedDeclaration": 4786, "src": "916:19:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 4777, + "id": 4829, "isConstant": false, "isLValue": false, "isPure": false, @@ -3962,18 +3962,18 @@ "typeString": "address" } ], - "id": 4774, + "id": 4826, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "899:16:23", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 4778, + "id": 4830, "isConstant": false, "isLValue": false, "isPure": false, @@ -3983,25 +3983,25 @@ "nodeType": "FunctionCall", "src": "899:51:23", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 4779, + "id": 4831, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ethToTokenSwapInput", "nodeType": "MemberAccess", - "referencedDeclaration": 1640, + "referencedDeclaration": 1666, "src": "899:84:23", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) payable external returns (uint256)" } }, - "id": 4780, + "id": 4832, "isConstant": false, "isLValue": false, "isPure": false, @@ -4015,7 +4015,7 @@ "typeString": "function (uint256) pure returns (function (uint256,uint256) payable external returns (uint256))" } }, - "id": 4782, + "id": 4834, "isConstant": false, "isLValue": false, "isPure": false, @@ -4029,7 +4029,7 @@ "typeString": "function (uint256,uint256) payable external returns (uint256)" } }, - "id": 4789, + "id": 4841, "isConstant": false, "isLValue": false, "isPure": false, @@ -4043,30 +4043,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4773, - "id": 4790, + "functionReturnParameters": 4825, + "id": 4842, "nodeType": "Return", "src": "892:135:23" } ] }, "documentation": null, - "id": 4792, + "id": 4844, "implemented": true, "kind": "function", "modifiers": [], "name": "_buyTokensWithEthFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4770, + "id": 4822, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4765, + "id": 4817, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4792, + "scope": 4844, "src": "804:20:23", "stateVariable": false, "storageLocation": "default", @@ -4075,7 +4075,7 @@ "typeString": "address" }, "typeName": { - "id": 4764, + "id": 4816, "name": "address", "nodeType": "ElementaryTypeName", "src": "804:7:23", @@ -4090,10 +4090,10 @@ }, { "constant": false, - "id": 4767, + "id": 4819, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4792, + "scope": 4844, "src": "826:14:23", "stateVariable": false, "storageLocation": "default", @@ -4102,7 +4102,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4766, + "id": 4818, "name": "uint", "nodeType": "ElementaryTypeName", "src": "826:4:23", @@ -4116,10 +4116,10 @@ }, { "constant": false, - "id": 4769, + "id": 4821, "name": "minAmount", "nodeType": "VariableDeclaration", - "scope": 4792, + "scope": 4844, "src": "842:14:23", "stateVariable": false, "storageLocation": "default", @@ -4128,7 +4128,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4768, + "id": 4820, "name": "uint", "nodeType": "ElementaryTypeName", "src": "842:4:23", @@ -4144,15 +4144,15 @@ "src": "803:54:23" }, "returnParameters": { - "id": 4773, + "id": 4825, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4772, + "id": 4824, "name": "", "nodeType": "VariableDeclaration", - "scope": 4792, + "scope": 4844, "src": "876:4:23", "stateVariable": false, "storageLocation": "default", @@ -4161,7 +4161,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4771, + "id": 4823, "name": "uint", "nodeType": "ElementaryTypeName", "src": "876:4:23", @@ -4176,7 +4176,7 @@ ], "src": "875:6:23" }, - "scope": 4918, + "scope": 4970, "src": "766:268:23", "stateMutability": "nonpayable", "superFunction": null, @@ -4184,21 +4184,21 @@ }, { "body": { - "id": 4830, + "id": 4882, "nodeType": "Block", "src": "1142:246:23", "statements": [ { "assignments": [ - 4802 + 4854 ], "declarations": [ { "constant": false, - "id": 4802, + "id": 4854, "name": "exchange", "nodeType": "VariableDeclaration", - "scope": 4830, + "scope": 4882, "src": "1152:16:23", "stateVariable": false, "storageLocation": "default", @@ -4207,7 +4207,7 @@ "typeString": "address" }, "typeName": { - "id": 4801, + "id": 4853, "name": "address", "nodeType": "ElementaryTypeName", "src": "1152:7:23", @@ -4221,17 +4221,17 @@ "visibility": "internal" } ], - "id": 4806, + "id": 4858, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4804, + "id": 4856, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4794, + "referencedDeclaration": 4846, "src": "1191:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4246,18 +4246,18 @@ "typeString": "address" } ], - "id": 4803, + "id": 4855, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4734, + "referencedDeclaration": 4786, "src": "1171:19:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 4805, + "id": 4857, "isConstant": false, "isLValue": false, "isPure": false, @@ -4280,11 +4280,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4811, + "id": 4863, "name": "exchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4802, + "referencedDeclaration": 4854, "src": "1244:8:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4293,11 +4293,11 @@ }, { "argumentTypes": null, - "id": 4812, + "id": 4864, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4796, + "referencedDeclaration": 4848, "src": "1254:11:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4321,11 +4321,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4808, + "id": 4860, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4794, + "referencedDeclaration": 4846, "src": "1222:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4340,7 +4340,7 @@ "typeString": "address" } ], - "id": 4807, + "id": 4859, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -4351,7 +4351,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 4809, + "id": 4861, "isConstant": false, "isLValue": false, "isPure": false, @@ -4365,7 +4365,7 @@ "typeString": "contract IERC20" } }, - "id": 4810, + "id": 4862, "isConstant": false, "isLValue": false, "isPure": false, @@ -4379,7 +4379,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 4813, + "id": 4865, "isConstant": false, "isLValue": false, "isPure": false, @@ -4393,7 +4393,7 @@ "typeString": "bool" } }, - "id": 4814, + "id": 4866, "nodeType": "ExpressionStatement", "src": "1215:51:23" }, @@ -4403,11 +4403,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4819, + "id": 4871, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4796, + "referencedDeclaration": 4848, "src": "1344:11:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4420,7 +4420,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 4821, + "id": 4873, "isConstant": false, "isLValue": false, "isPure": true, @@ -4443,7 +4443,7 @@ "typeString": "int_const 1" } ], - "id": 4820, + "id": 4872, "isConstant": false, "isLValue": false, "isPure": true, @@ -4456,7 +4456,7 @@ }, "typeName": "uint" }, - "id": 4822, + "id": 4874, "isConstant": false, "isLValue": false, "isPure": true, @@ -4479,18 +4479,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4826, + "id": 4878, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4824, + "id": 4876, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7829, + "referencedDeclaration": 7820, "src": "1371:3:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4502,7 +4502,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3630", - "id": 4825, + "id": 4877, "isConstant": false, "isLValue": false, "isPure": true, @@ -4531,7 +4531,7 @@ "typeString": "uint256" } ], - "id": 4823, + "id": 4875, "isConstant": false, "isLValue": false, "isPure": true, @@ -4544,7 +4544,7 @@ }, "typeName": "uint" }, - "id": 4827, + "id": 4879, "isConstant": false, "isLValue": false, "isPure": false, @@ -4579,11 +4579,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4816, + "id": 4868, "name": "exchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4802, + "referencedDeclaration": 4854, "src": "1301:8:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4598,18 +4598,18 @@ "typeString": "address" } ], - "id": 4815, + "id": 4867, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "1284:16:23", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 4817, + "id": 4869, "isConstant": false, "isLValue": false, "isPure": false, @@ -4619,25 +4619,25 @@ "nodeType": "FunctionCall", "src": "1284:26:23", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 4818, + "id": 4870, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "tokenToEthSwapInput", "nodeType": "MemberAccess", - "referencedDeclaration": 1682, + "referencedDeclaration": 1708, "src": "1284:59:23", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,uint256) external returns (uint256)" } }, - "id": 4828, + "id": 4880, "isConstant": false, "isLValue": false, "isPure": false, @@ -4651,30 +4651,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4800, - "id": 4829, + "functionReturnParameters": 4852, + "id": 4881, "nodeType": "Return", "src": "1277:104:23" } ] }, "documentation": null, - "id": 4831, + "id": 4883, "implemented": true, "kind": "function", "modifiers": [], "name": "_sellTokensForEthFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4797, + "id": 4849, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4794, + "id": 4846, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4831, + "scope": 4883, "src": "1078:20:23", "stateVariable": false, "storageLocation": "default", @@ -4683,7 +4683,7 @@ "typeString": "address" }, "typeName": { - "id": 4793, + "id": 4845, "name": "address", "nodeType": "ElementaryTypeName", "src": "1078:7:23", @@ -4698,10 +4698,10 @@ }, { "constant": false, - "id": 4796, + "id": 4848, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 4831, + "scope": 4883, "src": "1100:16:23", "stateVariable": false, "storageLocation": "default", @@ -4710,7 +4710,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4795, + "id": 4847, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1100:4:23", @@ -4726,15 +4726,15 @@ "src": "1077:40:23" }, "returnParameters": { - "id": 4800, + "id": 4852, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4799, + "id": 4851, "name": "", "nodeType": "VariableDeclaration", - "scope": 4831, + "scope": 4883, "src": "1136:4:23", "stateVariable": false, "storageLocation": "default", @@ -4743,7 +4743,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4798, + "id": 4850, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1136:4:23", @@ -4758,7 +4758,7 @@ ], "src": "1135:6:23" }, - "scope": 4918, + "scope": 4970, "src": "1040:348:23", "stateMutability": "nonpayable", "superFunction": null, @@ -4766,21 +4766,21 @@ }, { "body": { - "id": 4854, + "id": 4906, "nodeType": "Block", "src": "1503:141:23", "statements": [ { "assignments": [ - 4843 + 4895 ], "declarations": [ { "constant": false, - "id": 4843, + "id": 4895, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4854, + "scope": 4906, "src": "1513:14:23", "stateVariable": false, "storageLocation": "default", @@ -4789,7 +4789,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4842, + "id": 4894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1513:4:23", @@ -4802,17 +4802,17 @@ "visibility": "internal" } ], - "id": 4848, + "id": 4900, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4845, + "id": 4897, "name": "from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4833, + "referencedDeclaration": 4885, "src": "1559:4:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4821,11 +4821,11 @@ }, { "argumentTypes": null, - "id": 4846, + "id": 4898, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4837, + "referencedDeclaration": 4889, "src": "1565:11:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4844,18 +4844,18 @@ "typeString": "uint256" } ], - "id": 4844, + "id": 4896, "name": "_sellTokensForEthFromUniswap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4831, + "referencedDeclaration": 4883, "src": "1530:28:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4847, + "id": 4899, "isConstant": false, "isLValue": false, "isPure": false, @@ -4878,11 +4878,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4850, + "id": 4902, "name": "to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4835, + "referencedDeclaration": 4887, "src": "1623:2:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4891,11 +4891,11 @@ }, { "argumentTypes": null, - "id": 4851, + "id": 4903, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4843, + "referencedDeclaration": 4895, "src": "1627:9:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4914,21 +4914,21 @@ "typeString": "uint256" } ], - "id": 4849, + "id": 4901, "name": "_buyTokensWithEthFromUniswap", "nodeType": "Identifier", "overloadedDeclarations": [ - 4763, - 4792 + 4815, + 4844 ], - "referencedDeclaration": 4763, + "referencedDeclaration": 4815, "src": "1594:28:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4852, + "id": 4904, "isConstant": false, "isLValue": false, "isPure": false, @@ -4942,30 +4942,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4841, - "id": 4853, + "functionReturnParameters": 4893, + "id": 4905, "nodeType": "Return", "src": "1587:50:23" } ] }, "documentation": null, - "id": 4855, + "id": 4907, "implemented": true, "kind": "function", "modifiers": [], "name": "_sellTokensForTokensFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4838, + "id": 4890, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4833, + "id": 4885, "name": "from", "nodeType": "VariableDeclaration", - "scope": 4855, + "scope": 4907, "src": "1435:12:23", "stateVariable": false, "storageLocation": "default", @@ -4974,7 +4974,7 @@ "typeString": "address" }, "typeName": { - "id": 4832, + "id": 4884, "name": "address", "nodeType": "ElementaryTypeName", "src": "1435:7:23", @@ -4989,10 +4989,10 @@ }, { "constant": false, - "id": 4835, + "id": 4887, "name": "to", "nodeType": "VariableDeclaration", - "scope": 4855, + "scope": 4907, "src": "1449:10:23", "stateVariable": false, "storageLocation": "default", @@ -5001,7 +5001,7 @@ "typeString": "address" }, "typeName": { - "id": 4834, + "id": 4886, "name": "address", "nodeType": "ElementaryTypeName", "src": "1449:7:23", @@ -5016,10 +5016,10 @@ }, { "constant": false, - "id": 4837, + "id": 4889, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 4855, + "scope": 4907, "src": "1461:16:23", "stateVariable": false, "storageLocation": "default", @@ -5028,7 +5028,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4836, + "id": 4888, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1461:4:23", @@ -5044,15 +5044,15 @@ "src": "1434:44:23" }, "returnParameters": { - "id": 4841, + "id": 4893, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4840, + "id": 4892, "name": "", "nodeType": "VariableDeclaration", - "scope": 4855, + "scope": 4907, "src": "1497:4:23", "stateVariable": false, "storageLocation": "default", @@ -5061,7 +5061,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4839, + "id": 4891, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1497:4:23", @@ -5076,7 +5076,7 @@ ], "src": "1496:6:23" }, - "scope": 4918, + "scope": 4970, "src": "1394:250:23", "stateMutability": "nonpayable", "superFunction": null, @@ -5084,7 +5084,7 @@ }, { "body": { - "id": 4873, + "id": 4925, "nodeType": "Block", "src": "1761:112:23", "statements": [ @@ -5094,11 +5094,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4870, + "id": 4922, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4859, + "referencedDeclaration": 4911, "src": "1854:11:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5121,11 +5121,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4866, + "id": 4918, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4857, + "referencedDeclaration": 4909, "src": "1815:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5140,18 +5140,18 @@ "typeString": "address" } ], - "id": 4865, + "id": 4917, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4734, + "referencedDeclaration": 4786, "src": "1795:19:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 4867, + "id": 4919, "isConstant": false, "isLValue": false, "isPure": false, @@ -5173,18 +5173,18 @@ "typeString": "address" } ], - "id": 4864, + "id": 4916, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "1778:16:23", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 4868, + "id": 4920, "isConstant": false, "isLValue": false, "isPure": false, @@ -5194,25 +5194,25 @@ "nodeType": "FunctionCall", "src": "1778:51:23", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 4869, + "id": 4921, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTokenToEthInputPrice", "nodeType": "MemberAccess", - "referencedDeclaration": 1624, + "referencedDeclaration": 1650, "src": "1778:75:23", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 4871, + "id": 4923, "isConstant": false, "isLValue": false, "isPure": false, @@ -5226,30 +5226,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4863, - "id": 4872, + "functionReturnParameters": 4915, + "id": 4924, "nodeType": "Return", "src": "1771:95:23" } ] }, "documentation": null, - "id": 4874, + "id": 4926, "implemented": true, "kind": "function", "modifiers": [], "name": "getTokenToEthInputPriceFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4860, + "id": 4912, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4857, + "id": 4909, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4874, + "scope": 4926, "src": "1694:20:23", "stateVariable": false, "storageLocation": "default", @@ -5258,7 +5258,7 @@ "typeString": "address" }, "typeName": { - "id": 4856, + "id": 4908, "name": "address", "nodeType": "ElementaryTypeName", "src": "1694:7:23", @@ -5273,10 +5273,10 @@ }, { "constant": false, - "id": 4859, + "id": 4911, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 4874, + "scope": 4926, "src": "1716:16:23", "stateVariable": false, "storageLocation": "default", @@ -5285,7 +5285,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4858, + "id": 4910, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1716:4:23", @@ -5301,15 +5301,15 @@ "src": "1693:40:23" }, "returnParameters": { - "id": 4863, + "id": 4915, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4862, + "id": 4914, "name": "", "nodeType": "VariableDeclaration", - "scope": 4874, + "scope": 4926, "src": "1755:4:23", "stateVariable": false, "storageLocation": "default", @@ -5318,7 +5318,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4861, + "id": 4913, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1755:4:23", @@ -5333,7 +5333,7 @@ ], "src": "1754:6:23" }, - "scope": 4918, + "scope": 4970, "src": "1650:223:23", "stateMutability": "view", "superFunction": null, @@ -5341,7 +5341,7 @@ }, { "body": { - "id": 4892, + "id": 4944, "nodeType": "Block", "src": "1988:110:23", "statements": [ @@ -5351,11 +5351,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4889, + "id": 4941, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4878, + "referencedDeclaration": 4930, "src": "2081:9:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5378,11 +5378,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4885, + "id": 4937, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4876, + "referencedDeclaration": 4928, "src": "2042:12:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5397,18 +5397,18 @@ "typeString": "address" } ], - "id": 4884, + "id": 4936, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4734, + "referencedDeclaration": 4786, "src": "2022:19:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 4886, + "id": 4938, "isConstant": false, "isLValue": false, "isPure": false, @@ -5430,18 +5430,18 @@ "typeString": "address" } ], - "id": 4883, + "id": 4935, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "2005:16:23", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 4887, + "id": 4939, "isConstant": false, "isLValue": false, "isPure": false, @@ -5451,25 +5451,25 @@ "nodeType": "FunctionCall", "src": "2005:51:23", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 4888, + "id": 4940, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getEthToTokenInputPrice", "nodeType": "MemberAccess", - "referencedDeclaration": 1610, + "referencedDeclaration": 1636, "src": "2005:75:23", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 4890, + "id": 4942, "isConstant": false, "isLValue": false, "isPure": false, @@ -5483,30 +5483,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4882, - "id": 4891, + "functionReturnParameters": 4934, + "id": 4943, "nodeType": "Return", "src": "1998:93:23" } ] }, "documentation": null, - "id": 4893, + "id": 4945, "implemented": true, "kind": "function", "modifiers": [], "name": "getEthToTokenInputPriceFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4879, + "id": 4931, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4876, + "id": 4928, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4893, + "scope": 4945, "src": "1923:20:23", "stateVariable": false, "storageLocation": "default", @@ -5515,7 +5515,7 @@ "typeString": "address" }, "typeName": { - "id": 4875, + "id": 4927, "name": "address", "nodeType": "ElementaryTypeName", "src": "1923:7:23", @@ -5530,10 +5530,10 @@ }, { "constant": false, - "id": 4878, + "id": 4930, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4893, + "scope": 4945, "src": "1945:14:23", "stateVariable": false, "storageLocation": "default", @@ -5542,7 +5542,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4877, + "id": 4929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1945:4:23", @@ -5558,15 +5558,15 @@ "src": "1922:38:23" }, "returnParameters": { - "id": 4882, + "id": 4934, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4881, + "id": 4933, "name": "", "nodeType": "VariableDeclaration", - "scope": 4893, + "scope": 4945, "src": "1982:4:23", "stateVariable": false, "storageLocation": "default", @@ -5575,7 +5575,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4880, + "id": 4932, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1982:4:23", @@ -5590,7 +5590,7 @@ ], "src": "1981:6:23" }, - "scope": 4918, + "scope": 4970, "src": "1879:219:23", "stateMutability": "view", "superFunction": null, @@ -5598,21 +5598,21 @@ }, { "body": { - "id": 4916, + "id": 4968, "nodeType": "Block", "src": "2215:152:23", "statements": [ { "assignments": [ - 4905 + 4957 ], "declarations": [ { "constant": false, - "id": 4905, + "id": 4957, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4916, + "scope": 4968, "src": "2225:14:23", "stateVariable": false, "storageLocation": "default", @@ -5621,7 +5621,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4904, + "id": 4956, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2225:4:23", @@ -5634,17 +5634,17 @@ "visibility": "internal" } ], - "id": 4910, + "id": 4962, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4907, + "id": 4959, "name": "from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4895, + "referencedDeclaration": 4947, "src": "2277:4:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5653,11 +5653,11 @@ }, { "argumentTypes": null, - "id": 4908, + "id": 4960, "name": "fromAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4899, + "referencedDeclaration": 4951, "src": "2283:10:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5676,18 +5676,18 @@ "typeString": "uint256" } ], - "id": 4906, + "id": 4958, "name": "getTokenToEthInputPriceFromUniswap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4874, + "referencedDeclaration": 4926, "src": "2242:34:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 4909, + "id": 4961, "isConstant": false, "isLValue": false, "isPure": false, @@ -5710,11 +5710,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4912, + "id": 4964, "name": "to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4897, + "referencedDeclaration": 4949, "src": "2346:2:23", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5723,11 +5723,11 @@ }, { "argumentTypes": null, - "id": 4913, + "id": 4965, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4905, + "referencedDeclaration": 4957, "src": "2350:9:23", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5746,18 +5746,18 @@ "typeString": "uint256" } ], - "id": 4911, + "id": 4963, "name": "getEthToTokenInputPriceFromUniswap", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4893, + "referencedDeclaration": 4945, "src": "2311:34:23", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 4914, + "id": 4966, "isConstant": false, "isLValue": false, "isPure": false, @@ -5771,30 +5771,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4903, - "id": 4915, + "functionReturnParameters": 4955, + "id": 4967, "nodeType": "Return", "src": "2304:56:23" } ] }, "documentation": null, - "id": 4917, + "id": 4969, "implemented": true, "kind": "function", "modifiers": [], "name": "getTokenToTokenPriceFromUniswap", "nodeType": "FunctionDefinition", "parameters": { - "id": 4900, + "id": 4952, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4895, + "id": 4947, "name": "from", "nodeType": "VariableDeclaration", - "scope": 4917, + "scope": 4969, "src": "2145:12:23", "stateVariable": false, "storageLocation": "default", @@ -5803,7 +5803,7 @@ "typeString": "address" }, "typeName": { - "id": 4894, + "id": 4946, "name": "address", "nodeType": "ElementaryTypeName", "src": "2145:7:23", @@ -5818,10 +5818,10 @@ }, { "constant": false, - "id": 4897, + "id": 4949, "name": "to", "nodeType": "VariableDeclaration", - "scope": 4917, + "scope": 4969, "src": "2159:10:23", "stateVariable": false, "storageLocation": "default", @@ -5830,7 +5830,7 @@ "typeString": "address" }, "typeName": { - "id": 4896, + "id": 4948, "name": "address", "nodeType": "ElementaryTypeName", "src": "2159:7:23", @@ -5845,10 +5845,10 @@ }, { "constant": false, - "id": 4899, + "id": 4951, "name": "fromAmount", "nodeType": "VariableDeclaration", - "scope": 4917, + "scope": 4969, "src": "2171:15:23", "stateVariable": false, "storageLocation": "default", @@ -5857,7 +5857,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4898, + "id": 4950, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2171:4:23", @@ -5873,15 +5873,15 @@ "src": "2144:43:23" }, "returnParameters": { - "id": 4903, + "id": 4955, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4902, + "id": 4954, "name": "", "nodeType": "VariableDeclaration", - "scope": 4917, + "scope": 4969, "src": "2209:4:23", "stateVariable": false, "storageLocation": "default", @@ -5890,7 +5890,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4901, + "id": 4953, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2209:4:23", @@ -5905,14 +5905,14 @@ ], "src": "2208:6:23" }, - "scope": 4918, + "scope": 4970, "src": "2104:263:23", "stateMutability": "view", "superFunction": null, "visibility": "public" } ], - "scope": 4919, + "scope": 4971, "src": "177:2192:23" } ], @@ -5924,7 +5924,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.616Z", + "updatedAt": "2020-04-08T12:21:13.880Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/UniswapLiteBase.json b/packages/smart-contracts/artifacts/UniswapLiteBase.json index 34bff09..58798cf 100644 --- a/packages/smart-contracts/artifacts/UniswapLiteBase.json +++ b/packages/smart-contracts/artifacts/UniswapLiteBase.json @@ -12,14 +12,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapLiteBase.sol", "exportedSymbols": { "UniswapLiteBase": [ - 5194 + 5246 ] }, - "id": 5195, + "id": 5247, "nodeType": "SourceUnit", "nodes": [ { - "id": 4920, + "id": 4972, "literals": [ "solidity", "0.5", @@ -31,10 +31,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol", "file": "../../interfaces/uniswap/IUniswapExchange.sol", - "id": 4921, + "id": 4973, "nodeType": "ImportDirective", - "scope": 5195, - "sourceUnit": 1910, + "scope": 5247, + "sourceUnit": 1936, "src": "25:55:24", "symbolAliases": [], "unitAlias": "" @@ -42,10 +42,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol", "file": "../../interfaces/uniswap/IUniswapFactory.sol", - "id": 4922, + "id": 4974, "nodeType": "ImportDirective", - "scope": 5195, - "sourceUnit": 1950, + "scope": 5247, + "sourceUnit": 1976, "src": "81:54:24", "symbolAliases": [], "unitAlias": "" @@ -53,9 +53,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 4923, + "id": 4975, "nodeType": "ImportDirective", - "scope": 5195, + "scope": 5247, "sourceUnit": 121, "src": "137:37:24", "symbolAliases": [], @@ -67,19 +67,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 5194, + "id": 5246, "linearizedBaseContracts": [ - 5194 + 5246 ], "name": "UniswapLiteBase", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4926, + "id": 4978, "name": "UniswapFactoryAddress", "nodeType": "VariableDeclaration", - "scope": 5194, + "scope": 5246, "src": "247:83:24", "stateVariable": true, "storageLocation": "default", @@ -88,7 +88,7 @@ "typeString": "address" }, "typeName": { - "id": 4924, + "id": 4976, "name": "address", "nodeType": "ElementaryTypeName", "src": "247:7:24", @@ -101,7 +101,7 @@ "value": { "argumentTypes": null, "hexValue": "307863306134376446653033344234303042343762446144354665634461323632316465366334643935", - "id": 4925, + "id": 4977, "isConstant": false, "isLValue": false, "isPure": true, @@ -120,7 +120,7 @@ }, { "body": { - "id": 4940, + "id": 4992, "nodeType": "Block", "src": "420:88:24", "statements": [ @@ -130,11 +130,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4937, + "id": 4989, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4928, + "referencedDeclaration": 4980, "src": "488:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -154,11 +154,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4934, + "id": 4986, "name": "UniswapFactoryAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4926, + "referencedDeclaration": 4978, "src": "453:21:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -173,18 +173,18 @@ "typeString": "address" } ], - "id": 4933, + "id": 4985, "name": "IUniswapFactory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1949, + "referencedDeclaration": 1975, "src": "437:15:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapFactory_$1949_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapFactory_$1975_$", "typeString": "type(contract IUniswapFactory)" } }, - "id": 4935, + "id": 4987, "isConstant": false, "isLValue": false, "isPure": true, @@ -194,25 +194,25 @@ "nodeType": "FunctionCall", "src": "437:38:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapFactory_$1949", + "typeIdentifier": "t_contract$_IUniswapFactory_$1975", "typeString": "contract IUniswapFactory" } }, - "id": 4936, + "id": 4988, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getExchange", "nodeType": "MemberAccess", - "referencedDeclaration": 1929, + "referencedDeclaration": 1955, "src": "437:50:24", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view external returns (address)" } }, - "id": 4938, + "id": 4990, "isConstant": false, "isLValue": false, "isPure": false, @@ -226,30 +226,30 @@ "typeString": "address" } }, - "functionReturnParameters": 4932, - "id": 4939, + "functionReturnParameters": 4984, + "id": 4991, "nodeType": "Return", "src": "430:71:24" } ] }, "documentation": null, - "id": 4941, + "id": 4993, "implemented": true, "kind": "function", "modifiers": [], "name": "_getUniswapExchange", "nodeType": "FunctionDefinition", "parameters": { - "id": 4929, + "id": 4981, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4928, + "id": 4980, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4941, + "scope": 4993, "src": "366:20:24", "stateVariable": false, "storageLocation": "default", @@ -258,7 +258,7 @@ "typeString": "address" }, "typeName": { - "id": 4927, + "id": 4979, "name": "address", "nodeType": "ElementaryTypeName", "src": "366:7:24", @@ -275,15 +275,15 @@ "src": "365:22:24" }, "returnParameters": { - "id": 4932, + "id": 4984, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4931, + "id": 4983, "name": "", "nodeType": "VariableDeclaration", - "scope": 4941, + "scope": 4993, "src": "411:7:24", "stateVariable": false, "storageLocation": "default", @@ -292,7 +292,7 @@ "typeString": "address" }, "typeName": { - "id": 4930, + "id": 4982, "name": "address", "nodeType": "ElementaryTypeName", "src": "411:7:24", @@ -308,7 +308,7 @@ ], "src": "410:9:24" }, - "scope": 5194, + "scope": 5246, "src": "337:171:24", "stateMutability": "view", "superFunction": null, @@ -316,7 +316,7 @@ }, { "body": { - "id": 4958, + "id": 5010, "nodeType": "Block", "src": "605:69:24", "statements": [ @@ -326,11 +326,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4951, + "id": 5003, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4943, + "referencedDeclaration": 4995, "src": "634:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -339,11 +339,11 @@ }, { "argumentTypes": null, - "id": 4952, + "id": 5004, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4945, + "referencedDeclaration": 4997, "src": "648:9:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -356,7 +356,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 4954, + "id": 5006, "isConstant": false, "isLValue": false, "isPure": true, @@ -379,7 +379,7 @@ "typeString": "int_const 1" } ], - "id": 4953, + "id": 5005, "isConstant": false, "isLValue": false, "isPure": true, @@ -392,7 +392,7 @@ }, "typeName": "uint" }, - "id": 4955, + "id": 5007, "isConstant": false, "isLValue": false, "isPure": true, @@ -422,21 +422,21 @@ "typeString": "uint256" } ], - "id": 4950, + "id": 5002, "name": "_ethToToken", "nodeType": "Identifier", "overloadedDeclarations": [ - 4959, - 4988 + 5011, + 5040 ], - "referencedDeclaration": 4988, + "referencedDeclaration": 5040, "src": "622:11:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) returns (uint256)" } }, - "id": 4956, + "id": 5008, "isConstant": false, "isLValue": false, "isPure": false, @@ -450,30 +450,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4949, - "id": 4957, + "functionReturnParameters": 5001, + "id": 5009, "nodeType": "Return", "src": "615:52:24" } ] }, "documentation": null, - "id": 4959, + "id": 5011, "implemented": true, "kind": "function", "modifiers": [], "name": "_ethToToken", "nodeType": "FunctionDefinition", "parameters": { - "id": 4946, + "id": 4998, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4943, + "id": 4995, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4959, + "scope": 5011, "src": "535:20:24", "stateVariable": false, "storageLocation": "default", @@ -482,7 +482,7 @@ "typeString": "address" }, "typeName": { - "id": 4942, + "id": 4994, "name": "address", "nodeType": "ElementaryTypeName", "src": "535:7:24", @@ -497,10 +497,10 @@ }, { "constant": false, - "id": 4945, + "id": 4997, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4959, + "scope": 5011, "src": "557:14:24", "stateVariable": false, "storageLocation": "default", @@ -509,7 +509,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4944, + "id": 4996, "name": "uint", "nodeType": "ElementaryTypeName", "src": "557:4:24", @@ -525,15 +525,15 @@ "src": "534:38:24" }, "returnParameters": { - "id": 4949, + "id": 5001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4948, + "id": 5000, "name": "", "nodeType": "VariableDeclaration", - "scope": 4959, + "scope": 5011, "src": "599:4:24", "stateVariable": false, "storageLocation": "default", @@ -542,7 +542,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4947, + "id": 4999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "599:4:24", @@ -557,7 +557,7 @@ ], "src": "598:6:24" }, - "scope": 5194, + "scope": 5246, "src": "514:160:24", "stateMutability": "nonpayable", "superFunction": null, @@ -565,7 +565,7 @@ }, { "body": { - "id": 4987, + "id": 5039, "nodeType": "Block", "src": "792:157:24", "statements": [ @@ -575,11 +575,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4979, + "id": 5031, "name": "minTokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4965, + "referencedDeclaration": 5017, "src": "911:14:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -595,18 +595,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4983, + "id": 5035, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4981, + "id": 5033, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7829, + "referencedDeclaration": 7820, "src": "932:3:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -618,7 +618,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3630", - "id": 4982, + "id": 5034, "isConstant": false, "isLValue": false, "isPure": true, @@ -647,7 +647,7 @@ "typeString": "uint256" } ], - "id": 4980, + "id": 5032, "isConstant": false, "isLValue": false, "isPure": true, @@ -660,7 +660,7 @@ }, "typeName": "uint" }, - "id": 4984, + "id": 5036, "isConstant": false, "isLValue": false, "isPure": false, @@ -689,11 +689,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4977, + "id": 5029, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4963, + "referencedDeclaration": 5015, "src": "900:9:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -718,11 +718,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4972, + "id": 5024, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4961, + "referencedDeclaration": 5013, "src": "846:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -737,18 +737,18 @@ "typeString": "address" } ], - "id": 4971, + "id": 5023, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4941, + "referencedDeclaration": 4993, "src": "826:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 4973, + "id": 5025, "isConstant": false, "isLValue": false, "isPure": false, @@ -770,18 +770,18 @@ "typeString": "address" } ], - "id": 4970, + "id": 5022, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "809:16:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 4974, + "id": 5026, "isConstant": false, "isLValue": false, "isPure": false, @@ -791,25 +791,25 @@ "nodeType": "FunctionCall", "src": "809:51:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 4975, + "id": 5027, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ethToTokenSwapInput", "nodeType": "MemberAccess", - "referencedDeclaration": 1640, + "referencedDeclaration": 1666, "src": "809:84:24", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) payable external returns (uint256)" } }, - "id": 4976, + "id": 5028, "isConstant": false, "isLValue": false, "isPure": false, @@ -823,7 +823,7 @@ "typeString": "function (uint256) pure returns (function (uint256,uint256) payable external returns (uint256))" } }, - "id": 4978, + "id": 5030, "isConstant": false, "isLValue": false, "isPure": false, @@ -837,7 +837,7 @@ "typeString": "function (uint256,uint256) payable external returns (uint256)" } }, - "id": 4985, + "id": 5037, "isConstant": false, "isLValue": false, "isPure": false, @@ -851,30 +851,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4969, - "id": 4986, + "functionReturnParameters": 5021, + "id": 5038, "nodeType": "Return", "src": "802:140:24" } ] }, "documentation": null, - "id": 4988, + "id": 5040, "implemented": true, "kind": "function", "modifiers": [], "name": "_ethToToken", "nodeType": "FunctionDefinition", "parameters": { - "id": 4966, + "id": 5018, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4961, + "id": 5013, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4988, + "scope": 5040, "src": "701:20:24", "stateVariable": false, "storageLocation": "default", @@ -883,7 +883,7 @@ "typeString": "address" }, "typeName": { - "id": 4960, + "id": 5012, "name": "address", "nodeType": "ElementaryTypeName", "src": "701:7:24", @@ -898,10 +898,10 @@ }, { "constant": false, - "id": 4963, + "id": 5015, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4988, + "scope": 5040, "src": "723:14:24", "stateVariable": false, "storageLocation": "default", @@ -910,7 +910,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4962, + "id": 5014, "name": "uint", "nodeType": "ElementaryTypeName", "src": "723:4:24", @@ -924,10 +924,10 @@ }, { "constant": false, - "id": 4965, + "id": 5017, "name": "minTokenAmount", "nodeType": "VariableDeclaration", - "scope": 4988, + "scope": 5040, "src": "739:19:24", "stateVariable": false, "storageLocation": "default", @@ -936,7 +936,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4964, + "id": 5016, "name": "uint", "nodeType": "ElementaryTypeName", "src": "739:4:24", @@ -952,15 +952,15 @@ "src": "700:59:24" }, "returnParameters": { - "id": 4969, + "id": 5021, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4968, + "id": 5020, "name": "", "nodeType": "VariableDeclaration", - "scope": 4988, + "scope": 5040, "src": "786:4:24", "stateVariable": false, "storageLocation": "default", @@ -969,7 +969,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4967, + "id": 5019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "786:4:24", @@ -984,7 +984,7 @@ ], "src": "785:6:24" }, - "scope": 5194, + "scope": 5246, "src": "680:269:24", "stateMutability": "nonpayable", "superFunction": null, @@ -992,7 +992,7 @@ }, { "body": { - "id": 5005, + "id": 5057, "nodeType": "Block", "src": "1040:71:24", "statements": [ @@ -1002,11 +1002,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4998, + "id": 5050, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4990, + "referencedDeclaration": 5042, "src": "1069:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1015,11 +1015,11 @@ }, { "argumentTypes": null, - "id": 4999, + "id": 5051, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4992, + "referencedDeclaration": 5044, "src": "1083:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1032,7 +1032,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 5001, + "id": 5053, "isConstant": false, "isLValue": false, "isPure": true, @@ -1055,7 +1055,7 @@ "typeString": "int_const 1" } ], - "id": 5000, + "id": 5052, "isConstant": false, "isLValue": false, "isPure": true, @@ -1068,7 +1068,7 @@ }, "typeName": "uint" }, - "id": 5002, + "id": 5054, "isConstant": false, "isLValue": false, "isPure": true, @@ -1098,21 +1098,21 @@ "typeString": "uint256" } ], - "id": 4997, + "id": 5049, "name": "_tokenToEth", "nodeType": "Identifier", "overloadedDeclarations": [ - 5006, - 5045 + 5058, + 5097 ], - "referencedDeclaration": 5045, + "referencedDeclaration": 5097, "src": "1057:11:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) returns (uint256)" } }, - "id": 5003, + "id": 5055, "isConstant": false, "isLValue": false, "isPure": false, @@ -1126,30 +1126,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4996, - "id": 5004, + "functionReturnParameters": 5048, + "id": 5056, "nodeType": "Return", "src": "1050:54:24" } ] }, "documentation": null, - "id": 5006, + "id": 5058, "implemented": true, "kind": "function", "modifiers": [], "name": "_tokenToEth", "nodeType": "FunctionDefinition", "parameters": { - "id": 4993, + "id": 5045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4990, + "id": 5042, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 5006, + "scope": 5058, "src": "976:20:24", "stateVariable": false, "storageLocation": "default", @@ -1158,7 +1158,7 @@ "typeString": "address" }, "typeName": { - "id": 4989, + "id": 5041, "name": "address", "nodeType": "ElementaryTypeName", "src": "976:7:24", @@ -1173,10 +1173,10 @@ }, { "constant": false, - "id": 4992, + "id": 5044, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 5006, + "scope": 5058, "src": "998:16:24", "stateVariable": false, "storageLocation": "default", @@ -1185,7 +1185,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4991, + "id": 5043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "998:4:24", @@ -1201,15 +1201,15 @@ "src": "975:40:24" }, "returnParameters": { - "id": 4996, + "id": 5048, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4995, + "id": 5047, "name": "", "nodeType": "VariableDeclaration", - "scope": 5006, + "scope": 5058, "src": "1034:4:24", "stateVariable": false, "storageLocation": "default", @@ -1218,7 +1218,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4994, + "id": 5046, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1034:4:24", @@ -1233,7 +1233,7 @@ ], "src": "1033:6:24" }, - "scope": 5194, + "scope": 5246, "src": "955:156:24", "stateMutability": "nonpayable", "superFunction": null, @@ -1241,21 +1241,21 @@ }, { "body": { - "id": 5044, + "id": 5096, "nodeType": "Block", "src": "1221:251:24", "statements": [ { "assignments": [ - 5018 + 5070 ], "declarations": [ { "constant": false, - "id": 5018, + "id": 5070, "name": "exchange", "nodeType": "VariableDeclaration", - "scope": 5044, + "scope": 5096, "src": "1231:16:24", "stateVariable": false, "storageLocation": "default", @@ -1264,7 +1264,7 @@ "typeString": "address" }, "typeName": { - "id": 5017, + "id": 5069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1231:7:24", @@ -1278,17 +1278,17 @@ "visibility": "internal" } ], - "id": 5022, + "id": 5074, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5020, + "id": 5072, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5008, + "referencedDeclaration": 5060, "src": "1270:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1303,18 +1303,18 @@ "typeString": "address" } ], - "id": 5019, + "id": 5071, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4941, + "referencedDeclaration": 4993, "src": "1250:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 5021, + "id": 5073, "isConstant": false, "isLValue": false, "isPure": false, @@ -1337,11 +1337,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5027, + "id": 5079, "name": "exchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5018, + "referencedDeclaration": 5070, "src": "1323:8:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1350,11 +1350,11 @@ }, { "argumentTypes": null, - "id": 5028, + "id": 5080, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5010, + "referencedDeclaration": 5062, "src": "1333:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1378,11 +1378,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5024, + "id": 5076, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5008, + "referencedDeclaration": 5060, "src": "1301:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1397,7 +1397,7 @@ "typeString": "address" } ], - "id": 5023, + "id": 5075, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -1408,7 +1408,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 5025, + "id": 5077, "isConstant": false, "isLValue": false, "isPure": false, @@ -1422,7 +1422,7 @@ "typeString": "contract IERC20" } }, - "id": 5026, + "id": 5078, "isConstant": false, "isLValue": false, "isPure": false, @@ -1436,7 +1436,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 5029, + "id": 5081, "isConstant": false, "isLValue": false, "isPure": false, @@ -1450,7 +1450,7 @@ "typeString": "bool" } }, - "id": 5030, + "id": 5082, "nodeType": "ExpressionStatement", "src": "1294:51:24" }, @@ -1460,11 +1460,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5035, + "id": 5087, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5010, + "referencedDeclaration": 5062, "src": "1423:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1473,11 +1473,11 @@ }, { "argumentTypes": null, - "id": 5036, + "id": 5088, "name": "minEthAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5012, + "referencedDeclaration": 5064, "src": "1436:12:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1493,18 +1493,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 5040, + "id": 5092, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5038, + "id": 5090, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7829, + "referencedDeclaration": 7820, "src": "1455:3:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1516,7 +1516,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3630", - "id": 5039, + "id": 5091, "isConstant": false, "isLValue": false, "isPure": true, @@ -1545,7 +1545,7 @@ "typeString": "uint256" } ], - "id": 5037, + "id": 5089, "isConstant": false, "isLValue": false, "isPure": true, @@ -1558,7 +1558,7 @@ }, "typeName": "uint" }, - "id": 5041, + "id": 5093, "isConstant": false, "isLValue": false, "isPure": false, @@ -1593,11 +1593,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5032, + "id": 5084, "name": "exchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5018, + "referencedDeclaration": 5070, "src": "1380:8:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1612,18 +1612,18 @@ "typeString": "address" } ], - "id": 5031, + "id": 5083, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "1363:16:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 5033, + "id": 5085, "isConstant": false, "isLValue": false, "isPure": false, @@ -1633,25 +1633,25 @@ "nodeType": "FunctionCall", "src": "1363:26:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 5034, + "id": 5086, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "tokenToEthSwapInput", "nodeType": "MemberAccess", - "referencedDeclaration": 1682, + "referencedDeclaration": 1708, "src": "1363:59:24", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,uint256) external returns (uint256)" } }, - "id": 5042, + "id": 5094, "isConstant": false, "isLValue": false, "isPure": false, @@ -1665,30 +1665,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5016, - "id": 5043, + "functionReturnParameters": 5068, + "id": 5095, "nodeType": "Return", "src": "1356:109:24" } ] }, "documentation": null, - "id": 5045, + "id": 5097, "implemented": true, "kind": "function", "modifiers": [], "name": "_tokenToEth", "nodeType": "FunctionDefinition", "parameters": { - "id": 5013, + "id": 5065, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5008, + "id": 5060, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 5045, + "scope": 5097, "src": "1138:20:24", "stateVariable": false, "storageLocation": "default", @@ -1697,7 +1697,7 @@ "typeString": "address" }, "typeName": { - "id": 5007, + "id": 5059, "name": "address", "nodeType": "ElementaryTypeName", "src": "1138:7:24", @@ -1712,10 +1712,10 @@ }, { "constant": false, - "id": 5010, + "id": 5062, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 5045, + "scope": 5097, "src": "1160:16:24", "stateVariable": false, "storageLocation": "default", @@ -1724,7 +1724,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5009, + "id": 5061, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1160:4:24", @@ -1738,10 +1738,10 @@ }, { "constant": false, - "id": 5012, + "id": 5064, "name": "minEthAmount", "nodeType": "VariableDeclaration", - "scope": 5045, + "scope": 5097, "src": "1178:17:24", "stateVariable": false, "storageLocation": "default", @@ -1750,7 +1750,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5011, + "id": 5063, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1178:4:24", @@ -1766,15 +1766,15 @@ "src": "1137:59:24" }, "returnParameters": { - "id": 5016, + "id": 5068, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5015, + "id": 5067, "name": "", "nodeType": "VariableDeclaration", - "scope": 5045, + "scope": 5097, "src": "1215:4:24", "stateVariable": false, "storageLocation": "default", @@ -1783,7 +1783,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5014, + "id": 5066, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1215:4:24", @@ -1798,7 +1798,7 @@ ], "src": "1214:6:24" }, - "scope": 5194, + "scope": 5246, "src": "1117:355:24", "stateMutability": "nonpayable", "superFunction": null, @@ -1806,21 +1806,21 @@ }, { "body": { - "id": 5071, + "id": 5123, "nodeType": "Block", "src": "1589:122:24", "statements": [ { "assignments": [ - 5059 + 5111 ], "declarations": [ { "constant": false, - "id": 5059, + "id": 5111, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 5071, + "scope": 5123, "src": "1599:14:24", "stateVariable": false, "storageLocation": "default", @@ -1829,7 +1829,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5058, + "id": 5110, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1599:4:24", @@ -1842,17 +1842,17 @@ "visibility": "internal" } ], - "id": 5064, + "id": 5116, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5061, + "id": 5113, "name": "from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5047, + "referencedDeclaration": 5099, "src": "1628:4:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1861,11 +1861,11 @@ }, { "argumentTypes": null, - "id": 5062, + "id": 5114, "name": "tokenInAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5051, + "referencedDeclaration": 5103, "src": "1634:13:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1884,21 +1884,21 @@ "typeString": "uint256" } ], - "id": 5060, + "id": 5112, "name": "_tokenToEth", "nodeType": "Identifier", "overloadedDeclarations": [ - 5006, - 5045 + 5058, + 5097 ], - "referencedDeclaration": 5006, + "referencedDeclaration": 5058, "src": "1616:11:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 5063, + "id": 5115, "isConstant": false, "isLValue": false, "isPure": false, @@ -1921,11 +1921,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5066, + "id": 5118, "name": "to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5049, + "referencedDeclaration": 5101, "src": "1677:2:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1934,11 +1934,11 @@ }, { "argumentTypes": null, - "id": 5067, + "id": 5119, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5059, + "referencedDeclaration": 5111, "src": "1681:9:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1947,11 +1947,11 @@ }, { "argumentTypes": null, - "id": 5068, + "id": 5120, "name": "minTokenOut", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5053, + "referencedDeclaration": 5105, "src": "1692:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1974,21 +1974,21 @@ "typeString": "uint256" } ], - "id": 5065, + "id": 5117, "name": "_ethToToken", "nodeType": "Identifier", "overloadedDeclarations": [ - 4959, - 4988 + 5011, + 5040 ], - "referencedDeclaration": 4988, + "referencedDeclaration": 5040, "src": "1665:11:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) returns (uint256)" } }, - "id": 5069, + "id": 5121, "isConstant": false, "isLValue": false, "isPure": false, @@ -2002,30 +2002,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5057, - "id": 5070, + "functionReturnParameters": 5109, + "id": 5122, "nodeType": "Return", "src": "1658:46:24" } ] }, "documentation": null, - "id": 5072, + "id": 5124, "implemented": true, "kind": "function", "modifiers": [], "name": "_tokenToToken", "nodeType": "FunctionDefinition", "parameters": { - "id": 5054, + "id": 5106, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5047, + "id": 5099, "name": "from", "nodeType": "VariableDeclaration", - "scope": 5072, + "scope": 5124, "src": "1501:12:24", "stateVariable": false, "storageLocation": "default", @@ -2034,7 +2034,7 @@ "typeString": "address" }, "typeName": { - "id": 5046, + "id": 5098, "name": "address", "nodeType": "ElementaryTypeName", "src": "1501:7:24", @@ -2049,10 +2049,10 @@ }, { "constant": false, - "id": 5049, + "id": 5101, "name": "to", "nodeType": "VariableDeclaration", - "scope": 5072, + "scope": 5124, "src": "1515:10:24", "stateVariable": false, "storageLocation": "default", @@ -2061,7 +2061,7 @@ "typeString": "address" }, "typeName": { - "id": 5048, + "id": 5100, "name": "address", "nodeType": "ElementaryTypeName", "src": "1515:7:24", @@ -2076,10 +2076,10 @@ }, { "constant": false, - "id": 5051, + "id": 5103, "name": "tokenInAmount", "nodeType": "VariableDeclaration", - "scope": 5072, + "scope": 5124, "src": "1527:18:24", "stateVariable": false, "storageLocation": "default", @@ -2088,7 +2088,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5050, + "id": 5102, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1527:4:24", @@ -2102,10 +2102,10 @@ }, { "constant": false, - "id": 5053, + "id": 5105, "name": "minTokenOut", "nodeType": "VariableDeclaration", - "scope": 5072, + "scope": 5124, "src": "1547:16:24", "stateVariable": false, "storageLocation": "default", @@ -2114,7 +2114,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5052, + "id": 5104, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1547:4:24", @@ -2130,15 +2130,15 @@ "src": "1500:64:24" }, "returnParameters": { - "id": 5057, + "id": 5109, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5056, + "id": 5108, "name": "", "nodeType": "VariableDeclaration", - "scope": 5072, + "scope": 5124, "src": "1583:4:24", "stateVariable": false, "storageLocation": "default", @@ -2147,7 +2147,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5055, + "id": 5107, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1583:4:24", @@ -2162,7 +2162,7 @@ ], "src": "1582:6:24" }, - "scope": 5194, + "scope": 5246, "src": "1478:233:24", "stateMutability": "nonpayable", "superFunction": null, @@ -2170,7 +2170,7 @@ }, { "body": { - "id": 5092, + "id": 5144, "nodeType": "Block", "src": "1808:69:24", "statements": [ @@ -2180,11 +2180,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5084, + "id": 5136, "name": "from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5074, + "referencedDeclaration": 5126, "src": "1839:4:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2193,11 +2193,11 @@ }, { "argumentTypes": null, - "id": 5085, + "id": 5137, "name": "to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5076, + "referencedDeclaration": 5128, "src": "1845:2:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2206,11 +2206,11 @@ }, { "argumentTypes": null, - "id": 5086, + "id": 5138, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5078, + "referencedDeclaration": 5130, "src": "1849:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2223,7 +2223,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 5088, + "id": 5140, "isConstant": false, "isLValue": false, "isPure": true, @@ -2246,7 +2246,7 @@ "typeString": "int_const 1" } ], - "id": 5087, + "id": 5139, "isConstant": false, "isLValue": false, "isPure": true, @@ -2259,7 +2259,7 @@ }, "typeName": "uint" }, - "id": 5089, + "id": 5141, "isConstant": false, "isLValue": false, "isPure": true, @@ -2293,21 +2293,21 @@ "typeString": "uint256" } ], - "id": 5083, + "id": 5135, "name": "_tokenToToken", "nodeType": "Identifier", "overloadedDeclarations": [ - 5072, - 5093 + 5124, + 5145 ], - "referencedDeclaration": 5072, + "referencedDeclaration": 5124, "src": "1825:13:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,address,uint256,uint256) returns (uint256)" } }, - "id": 5090, + "id": 5142, "isConstant": false, "isLValue": false, "isPure": false, @@ -2321,30 +2321,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5082, - "id": 5091, + "functionReturnParameters": 5134, + "id": 5143, "nodeType": "Return", "src": "1818:52:24" } ] }, "documentation": null, - "id": 5093, + "id": 5145, "implemented": true, "kind": "function", "modifiers": [], "name": "_tokenToToken", "nodeType": "FunctionDefinition", "parameters": { - "id": 5079, + "id": 5131, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5074, + "id": 5126, "name": "from", "nodeType": "VariableDeclaration", - "scope": 5093, + "scope": 5145, "src": "1740:12:24", "stateVariable": false, "storageLocation": "default", @@ -2353,7 +2353,7 @@ "typeString": "address" }, "typeName": { - "id": 5073, + "id": 5125, "name": "address", "nodeType": "ElementaryTypeName", "src": "1740:7:24", @@ -2368,10 +2368,10 @@ }, { "constant": false, - "id": 5076, + "id": 5128, "name": "to", "nodeType": "VariableDeclaration", - "scope": 5093, + "scope": 5145, "src": "1754:10:24", "stateVariable": false, "storageLocation": "default", @@ -2380,7 +2380,7 @@ "typeString": "address" }, "typeName": { - "id": 5075, + "id": 5127, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:24", @@ -2395,10 +2395,10 @@ }, { "constant": false, - "id": 5078, + "id": 5130, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 5093, + "scope": 5145, "src": "1766:16:24", "stateVariable": false, "storageLocation": "default", @@ -2407,7 +2407,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5077, + "id": 5129, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1766:4:24", @@ -2423,15 +2423,15 @@ "src": "1739:44:24" }, "returnParameters": { - "id": 5082, + "id": 5134, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5081, + "id": 5133, "name": "", "nodeType": "VariableDeclaration", - "scope": 5093, + "scope": 5145, "src": "1802:4:24", "stateVariable": false, "storageLocation": "default", @@ -2440,7 +2440,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5080, + "id": 5132, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1802:4:24", @@ -2455,7 +2455,7 @@ ], "src": "1801:6:24" }, - "scope": 5194, + "scope": 5246, "src": "1717:160:24", "stateMutability": "nonpayable", "superFunction": null, @@ -2463,7 +2463,7 @@ }, { "body": { - "id": 5111, + "id": 5163, "nodeType": "Block", "src": "1981:112:24", "statements": [ @@ -2473,11 +2473,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5108, + "id": 5160, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5097, + "referencedDeclaration": 5149, "src": "2074:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2500,11 +2500,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5104, + "id": 5156, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5095, + "referencedDeclaration": 5147, "src": "2035:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2519,18 +2519,18 @@ "typeString": "address" } ], - "id": 5103, + "id": 5155, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4941, + "referencedDeclaration": 4993, "src": "2015:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 5105, + "id": 5157, "isConstant": false, "isLValue": false, "isPure": false, @@ -2552,18 +2552,18 @@ "typeString": "address" } ], - "id": 5102, + "id": 5154, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "1998:16:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 5106, + "id": 5158, "isConstant": false, "isLValue": false, "isPure": false, @@ -2573,25 +2573,25 @@ "nodeType": "FunctionCall", "src": "1998:51:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 5107, + "id": 5159, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTokenToEthInputPrice", "nodeType": "MemberAccess", - "referencedDeclaration": 1624, + "referencedDeclaration": 1650, "src": "1998:75:24", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 5109, + "id": 5161, "isConstant": false, "isLValue": false, "isPure": false, @@ -2605,30 +2605,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5101, - "id": 5110, + "functionReturnParameters": 5153, + "id": 5162, "nodeType": "Return", "src": "1991:95:24" } ] }, "documentation": null, - "id": 5112, + "id": 5164, "implemented": true, "kind": "function", "modifiers": [], "name": "_getTokenToEthInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 5098, + "id": 5150, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5095, + "id": 5147, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 5112, + "scope": 5164, "src": "1912:20:24", "stateVariable": false, "storageLocation": "default", @@ -2637,7 +2637,7 @@ "typeString": "address" }, "typeName": { - "id": 5094, + "id": 5146, "name": "address", "nodeType": "ElementaryTypeName", "src": "1912:7:24", @@ -2652,10 +2652,10 @@ }, { "constant": false, - "id": 5097, + "id": 5149, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 5112, + "scope": 5164, "src": "1934:16:24", "stateVariable": false, "storageLocation": "default", @@ -2664,7 +2664,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5096, + "id": 5148, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1934:4:24", @@ -2680,15 +2680,15 @@ "src": "1911:40:24" }, "returnParameters": { - "id": 5101, + "id": 5153, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5100, + "id": 5152, "name": "", "nodeType": "VariableDeclaration", - "scope": 5112, + "scope": 5164, "src": "1975:4:24", "stateVariable": false, "storageLocation": "default", @@ -2697,7 +2697,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5099, + "id": 5151, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1975:4:24", @@ -2712,7 +2712,7 @@ ], "src": "1974:6:24" }, - "scope": 5194, + "scope": 5246, "src": "1883:210:24", "stateMutability": "view", "superFunction": null, @@ -2720,7 +2720,7 @@ }, { "body": { - "id": 5130, + "id": 5182, "nodeType": "Block", "src": "2195:110:24", "statements": [ @@ -2730,11 +2730,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5127, + "id": 5179, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5116, + "referencedDeclaration": 5168, "src": "2288:9:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2757,11 +2757,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5123, + "id": 5175, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5114, + "referencedDeclaration": 5166, "src": "2249:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -2776,18 +2776,18 @@ "typeString": "address" } ], - "id": 5122, + "id": 5174, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4941, + "referencedDeclaration": 4993, "src": "2229:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 5124, + "id": 5176, "isConstant": false, "isLValue": false, "isPure": false, @@ -2809,18 +2809,18 @@ "typeString": "address" } ], - "id": 5121, + "id": 5173, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "2212:16:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 5125, + "id": 5177, "isConstant": false, "isLValue": false, "isPure": false, @@ -2830,25 +2830,25 @@ "nodeType": "FunctionCall", "src": "2212:51:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 5126, + "id": 5178, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getEthToTokenInputPrice", "nodeType": "MemberAccess", - "referencedDeclaration": 1610, + "referencedDeclaration": 1636, "src": "2212:75:24", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 5128, + "id": 5180, "isConstant": false, "isLValue": false, "isPure": false, @@ -2862,30 +2862,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5120, - "id": 5129, + "functionReturnParameters": 5172, + "id": 5181, "nodeType": "Return", "src": "2205:93:24" } ] }, "documentation": null, - "id": 5131, + "id": 5183, "implemented": true, "kind": "function", "modifiers": [], "name": "_getEthToTokenInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 5117, + "id": 5169, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5114, + "id": 5166, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 5131, + "scope": 5183, "src": "2128:20:24", "stateVariable": false, "storageLocation": "default", @@ -2894,7 +2894,7 @@ "typeString": "address" }, "typeName": { - "id": 5113, + "id": 5165, "name": "address", "nodeType": "ElementaryTypeName", "src": "2128:7:24", @@ -2909,10 +2909,10 @@ }, { "constant": false, - "id": 5116, + "id": 5168, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 5131, + "scope": 5183, "src": "2150:14:24", "stateVariable": false, "storageLocation": "default", @@ -2921,7 +2921,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5115, + "id": 5167, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2150:4:24", @@ -2937,15 +2937,15 @@ "src": "2127:38:24" }, "returnParameters": { - "id": 5120, + "id": 5172, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5119, + "id": 5171, "name": "", "nodeType": "VariableDeclaration", - "scope": 5131, + "scope": 5183, "src": "2189:4:24", "stateVariable": false, "storageLocation": "default", @@ -2954,7 +2954,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5118, + "id": 5170, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2189:4:24", @@ -2969,7 +2969,7 @@ ], "src": "2188:6:24" }, - "scope": 5194, + "scope": 5246, "src": "2099:206:24", "stateMutability": "view", "superFunction": null, @@ -2977,7 +2977,7 @@ }, { "body": { - "id": 5149, + "id": 5201, "nodeType": "Block", "src": "2408:111:24", "statements": [ @@ -2987,11 +2987,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5146, + "id": 5198, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5135, + "referencedDeclaration": 5187, "src": "2502:9:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3014,11 +3014,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5142, + "id": 5194, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5133, + "referencedDeclaration": 5185, "src": "2462:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3033,18 +3033,18 @@ "typeString": "address" } ], - "id": 5141, + "id": 5193, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4941, + "referencedDeclaration": 4993, "src": "2442:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 5143, + "id": 5195, "isConstant": false, "isLValue": false, "isPure": false, @@ -3066,18 +3066,18 @@ "typeString": "address" } ], - "id": 5140, + "id": 5192, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "2425:16:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 5144, + "id": 5196, "isConstant": false, "isLValue": false, "isPure": false, @@ -3087,25 +3087,25 @@ "nodeType": "FunctionCall", "src": "2425:51:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 5145, + "id": 5197, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTokenToEthOutputPrice", "nodeType": "MemberAccess", - "referencedDeclaration": 1631, + "referencedDeclaration": 1657, "src": "2425:76:24", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 5147, + "id": 5199, "isConstant": false, "isLValue": false, "isPure": false, @@ -3119,30 +3119,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5139, - "id": 5148, + "functionReturnParameters": 5191, + "id": 5200, "nodeType": "Return", "src": "2418:94:24" } ] }, "documentation": null, - "id": 5150, + "id": 5202, "implemented": true, "kind": "function", "modifiers": [], "name": "_getTokenToEthOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 5136, + "id": 5188, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5133, + "id": 5185, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 5150, + "scope": 5202, "src": "2341:20:24", "stateVariable": false, "storageLocation": "default", @@ -3151,7 +3151,7 @@ "typeString": "address" }, "typeName": { - "id": 5132, + "id": 5184, "name": "address", "nodeType": "ElementaryTypeName", "src": "2341:7:24", @@ -3166,10 +3166,10 @@ }, { "constant": false, - "id": 5135, + "id": 5187, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 5150, + "scope": 5202, "src": "2363:14:24", "stateVariable": false, "storageLocation": "default", @@ -3178,7 +3178,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5134, + "id": 5186, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2363:4:24", @@ -3194,15 +3194,15 @@ "src": "2340:38:24" }, "returnParameters": { - "id": 5139, + "id": 5191, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5138, + "id": 5190, "name": "", "nodeType": "VariableDeclaration", - "scope": 5150, + "scope": 5202, "src": "2402:4:24", "stateVariable": false, "storageLocation": "default", @@ -3211,7 +3211,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5137, + "id": 5189, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2402:4:24", @@ -3226,7 +3226,7 @@ ], "src": "2401:6:24" }, - "scope": 5194, + "scope": 5246, "src": "2311:208:24", "stateMutability": "view", "superFunction": null, @@ -3234,7 +3234,7 @@ }, { "body": { - "id": 5168, + "id": 5220, "nodeType": "Block", "src": "2624:113:24", "statements": [ @@ -3244,11 +3244,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5165, + "id": 5217, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5154, + "referencedDeclaration": 5206, "src": "2718:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3271,11 +3271,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5161, + "id": 5213, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5152, + "referencedDeclaration": 5204, "src": "2678:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3290,18 +3290,18 @@ "typeString": "address" } ], - "id": 5160, + "id": 5212, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4941, + "referencedDeclaration": 4993, "src": "2658:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 5162, + "id": 5214, "isConstant": false, "isLValue": false, "isPure": false, @@ -3323,18 +3323,18 @@ "typeString": "address" } ], - "id": 5159, + "id": 5211, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "2641:16:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 5163, + "id": 5215, "isConstant": false, "isLValue": false, "isPure": false, @@ -3344,25 +3344,25 @@ "nodeType": "FunctionCall", "src": "2641:51:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 5164, + "id": 5216, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getEthToTokenOutputPrice", "nodeType": "MemberAccess", - "referencedDeclaration": 1617, + "referencedDeclaration": 1643, "src": "2641:76:24", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 5166, + "id": 5218, "isConstant": false, "isLValue": false, "isPure": false, @@ -3376,30 +3376,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5158, - "id": 5167, + "functionReturnParameters": 5210, + "id": 5219, "nodeType": "Return", "src": "2634:96:24" } ] }, "documentation": null, - "id": 5169, + "id": 5221, "implemented": true, "kind": "function", "modifiers": [], "name": "_getEthToTokenOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 5155, + "id": 5207, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5152, + "id": 5204, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 5169, + "scope": 5221, "src": "2555:20:24", "stateVariable": false, "storageLocation": "default", @@ -3408,7 +3408,7 @@ "typeString": "address" }, "typeName": { - "id": 5151, + "id": 5203, "name": "address", "nodeType": "ElementaryTypeName", "src": "2555:7:24", @@ -3423,10 +3423,10 @@ }, { "constant": false, - "id": 5154, + "id": 5206, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 5169, + "scope": 5221, "src": "2577:16:24", "stateVariable": false, "storageLocation": "default", @@ -3435,7 +3435,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5153, + "id": 5205, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2577:4:24", @@ -3451,15 +3451,15 @@ "src": "2554:40:24" }, "returnParameters": { - "id": 5158, + "id": 5210, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5157, + "id": 5209, "name": "", "nodeType": "VariableDeclaration", - "scope": 5169, + "scope": 5221, "src": "2618:4:24", "stateVariable": false, "storageLocation": "default", @@ -3468,7 +3468,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5156, + "id": 5208, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2618:4:24", @@ -3483,7 +3483,7 @@ ], "src": "2617:6:24" }, - "scope": 5194, + "scope": 5246, "src": "2525:212:24", "stateMutability": "view", "superFunction": null, @@ -3491,21 +3491,21 @@ }, { "body": { - "id": 5192, + "id": 5244, "nodeType": "Block", "src": "2846:122:24", "statements": [ { "assignments": [ - 5181 + 5233 ], "declarations": [ { "constant": false, - "id": 5181, + "id": 5233, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 5192, + "scope": 5244, "src": "2856:14:24", "stateVariable": false, "storageLocation": "default", @@ -3514,7 +3514,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5180, + "id": 5232, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2856:4:24", @@ -3527,17 +3527,17 @@ "visibility": "internal" } ], - "id": 5186, + "id": 5238, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5183, + "id": 5235, "name": "from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5171, + "referencedDeclaration": 5223, "src": "2893:4:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3546,11 +3546,11 @@ }, { "argumentTypes": null, - "id": 5184, + "id": 5236, "name": "fromAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5175, + "referencedDeclaration": 5227, "src": "2899:10:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3569,18 +3569,18 @@ "typeString": "uint256" } ], - "id": 5182, + "id": 5234, "name": "_getTokenToEthInput", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5112, + "referencedDeclaration": 5164, "src": "2873:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 5185, + "id": 5237, "isConstant": false, "isLValue": false, "isPure": false, @@ -3603,11 +3603,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5188, + "id": 5240, "name": "to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5173, + "referencedDeclaration": 5225, "src": "2947:2:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3616,11 +3616,11 @@ }, { "argumentTypes": null, - "id": 5189, + "id": 5241, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5181, + "referencedDeclaration": 5233, "src": "2951:9:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3639,18 +3639,18 @@ "typeString": "uint256" } ], - "id": 5187, + "id": 5239, "name": "_getEthToTokenInput", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5131, + "referencedDeclaration": 5183, "src": "2927:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 5190, + "id": 5242, "isConstant": false, "isLValue": false, "isPure": false, @@ -3664,30 +3664,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5179, - "id": 5191, + "functionReturnParameters": 5231, + "id": 5243, "nodeType": "Return", "src": "2920:41:24" } ] }, "documentation": null, - "id": 5193, + "id": 5245, "implemented": true, "kind": "function", "modifiers": [], "name": "_getTokenToTokenInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 5176, + "id": 5228, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5171, + "id": 5223, "name": "from", "nodeType": "VariableDeclaration", - "scope": 5193, + "scope": 5245, "src": "2774:12:24", "stateVariable": false, "storageLocation": "default", @@ -3696,7 +3696,7 @@ "typeString": "address" }, "typeName": { - "id": 5170, + "id": 5222, "name": "address", "nodeType": "ElementaryTypeName", "src": "2774:7:24", @@ -3711,10 +3711,10 @@ }, { "constant": false, - "id": 5173, + "id": 5225, "name": "to", "nodeType": "VariableDeclaration", - "scope": 5193, + "scope": 5245, "src": "2788:10:24", "stateVariable": false, "storageLocation": "default", @@ -3723,7 +3723,7 @@ "typeString": "address" }, "typeName": { - "id": 5172, + "id": 5224, "name": "address", "nodeType": "ElementaryTypeName", "src": "2788:7:24", @@ -3738,10 +3738,10 @@ }, { "constant": false, - "id": 5175, + "id": 5227, "name": "fromAmount", "nodeType": "VariableDeclaration", - "scope": 5193, + "scope": 5245, "src": "2800:15:24", "stateVariable": false, "storageLocation": "default", @@ -3750,7 +3750,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5174, + "id": 5226, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2800:4:24", @@ -3766,15 +3766,15 @@ "src": "2773:43:24" }, "returnParameters": { - "id": 5179, + "id": 5231, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5178, + "id": 5230, "name": "", "nodeType": "VariableDeclaration", - "scope": 5193, + "scope": 5245, "src": "2840:4:24", "stateVariable": false, "storageLocation": "default", @@ -3783,7 +3783,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5177, + "id": 5229, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2840:4:24", @@ -3798,14 +3798,14 @@ ], "src": "2839:6:24" }, - "scope": 5194, + "scope": 5246, "src": "2743:225:24", "stateMutability": "view", "superFunction": null, "visibility": "internal" } ], - "scope": 5195, + "scope": 5247, "src": "177:2793:24" } ], @@ -3815,14 +3815,14 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/uniswap/UniswapLiteBase.sol", "exportedSymbols": { "UniswapLiteBase": [ - 5194 + 5246 ] }, - "id": 5195, + "id": 5247, "nodeType": "SourceUnit", "nodes": [ { - "id": 4920, + "id": 4972, "literals": [ "solidity", "0.5", @@ -3834,10 +3834,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapExchange.sol", "file": "../../interfaces/uniswap/IUniswapExchange.sol", - "id": 4921, + "id": 4973, "nodeType": "ImportDirective", - "scope": 5195, - "sourceUnit": 1910, + "scope": 5247, + "sourceUnit": 1936, "src": "25:55:24", "symbolAliases": [], "unitAlias": "" @@ -3845,10 +3845,10 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/uniswap/IUniswapFactory.sol", "file": "../../interfaces/uniswap/IUniswapFactory.sol", - "id": 4922, + "id": 4974, "nodeType": "ImportDirective", - "scope": 5195, - "sourceUnit": 1950, + "scope": 5247, + "sourceUnit": 1976, "src": "81:54:24", "symbolAliases": [], "unitAlias": "" @@ -3856,9 +3856,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 4923, + "id": 4975, "nodeType": "ImportDirective", - "scope": 5195, + "scope": 5247, "sourceUnit": 121, "src": "137:37:24", "symbolAliases": [], @@ -3870,19 +3870,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 5194, + "id": 5246, "linearizedBaseContracts": [ - 5194 + 5246 ], "name": "UniswapLiteBase", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4926, + "id": 4978, "name": "UniswapFactoryAddress", "nodeType": "VariableDeclaration", - "scope": 5194, + "scope": 5246, "src": "247:83:24", "stateVariable": true, "storageLocation": "default", @@ -3891,7 +3891,7 @@ "typeString": "address" }, "typeName": { - "id": 4924, + "id": 4976, "name": "address", "nodeType": "ElementaryTypeName", "src": "247:7:24", @@ -3904,7 +3904,7 @@ "value": { "argumentTypes": null, "hexValue": "307863306134376446653033344234303042343762446144354665634461323632316465366334643935", - "id": 4925, + "id": 4977, "isConstant": false, "isLValue": false, "isPure": true, @@ -3923,7 +3923,7 @@ }, { "body": { - "id": 4940, + "id": 4992, "nodeType": "Block", "src": "420:88:24", "statements": [ @@ -3933,11 +3933,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4937, + "id": 4989, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4928, + "referencedDeclaration": 4980, "src": "488:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3957,11 +3957,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4934, + "id": 4986, "name": "UniswapFactoryAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4926, + "referencedDeclaration": 4978, "src": "453:21:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3976,18 +3976,18 @@ "typeString": "address" } ], - "id": 4933, + "id": 4985, "name": "IUniswapFactory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1949, + "referencedDeclaration": 1975, "src": "437:15:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapFactory_$1949_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapFactory_$1975_$", "typeString": "type(contract IUniswapFactory)" } }, - "id": 4935, + "id": 4987, "isConstant": false, "isLValue": false, "isPure": true, @@ -3997,25 +3997,25 @@ "nodeType": "FunctionCall", "src": "437:38:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapFactory_$1949", + "typeIdentifier": "t_contract$_IUniswapFactory_$1975", "typeString": "contract IUniswapFactory" } }, - "id": 4936, + "id": 4988, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getExchange", "nodeType": "MemberAccess", - "referencedDeclaration": 1929, + "referencedDeclaration": 1955, "src": "437:50:24", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view external returns (address)" } }, - "id": 4938, + "id": 4990, "isConstant": false, "isLValue": false, "isPure": false, @@ -4029,30 +4029,30 @@ "typeString": "address" } }, - "functionReturnParameters": 4932, - "id": 4939, + "functionReturnParameters": 4984, + "id": 4991, "nodeType": "Return", "src": "430:71:24" } ] }, "documentation": null, - "id": 4941, + "id": 4993, "implemented": true, "kind": "function", "modifiers": [], "name": "_getUniswapExchange", "nodeType": "FunctionDefinition", "parameters": { - "id": 4929, + "id": 4981, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4928, + "id": 4980, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4941, + "scope": 4993, "src": "366:20:24", "stateVariable": false, "storageLocation": "default", @@ -4061,7 +4061,7 @@ "typeString": "address" }, "typeName": { - "id": 4927, + "id": 4979, "name": "address", "nodeType": "ElementaryTypeName", "src": "366:7:24", @@ -4078,15 +4078,15 @@ "src": "365:22:24" }, "returnParameters": { - "id": 4932, + "id": 4984, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4931, + "id": 4983, "name": "", "nodeType": "VariableDeclaration", - "scope": 4941, + "scope": 4993, "src": "411:7:24", "stateVariable": false, "storageLocation": "default", @@ -4095,7 +4095,7 @@ "typeString": "address" }, "typeName": { - "id": 4930, + "id": 4982, "name": "address", "nodeType": "ElementaryTypeName", "src": "411:7:24", @@ -4111,7 +4111,7 @@ ], "src": "410:9:24" }, - "scope": 5194, + "scope": 5246, "src": "337:171:24", "stateMutability": "view", "superFunction": null, @@ -4119,7 +4119,7 @@ }, { "body": { - "id": 4958, + "id": 5010, "nodeType": "Block", "src": "605:69:24", "statements": [ @@ -4129,11 +4129,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4951, + "id": 5003, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4943, + "referencedDeclaration": 4995, "src": "634:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4142,11 +4142,11 @@ }, { "argumentTypes": null, - "id": 4952, + "id": 5004, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4945, + "referencedDeclaration": 4997, "src": "648:9:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4159,7 +4159,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 4954, + "id": 5006, "isConstant": false, "isLValue": false, "isPure": true, @@ -4182,7 +4182,7 @@ "typeString": "int_const 1" } ], - "id": 4953, + "id": 5005, "isConstant": false, "isLValue": false, "isPure": true, @@ -4195,7 +4195,7 @@ }, "typeName": "uint" }, - "id": 4955, + "id": 5007, "isConstant": false, "isLValue": false, "isPure": true, @@ -4225,21 +4225,21 @@ "typeString": "uint256" } ], - "id": 4950, + "id": 5002, "name": "_ethToToken", "nodeType": "Identifier", "overloadedDeclarations": [ - 4959, - 4988 + 5011, + 5040 ], - "referencedDeclaration": 4988, + "referencedDeclaration": 5040, "src": "622:11:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) returns (uint256)" } }, - "id": 4956, + "id": 5008, "isConstant": false, "isLValue": false, "isPure": false, @@ -4253,30 +4253,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4949, - "id": 4957, + "functionReturnParameters": 5001, + "id": 5009, "nodeType": "Return", "src": "615:52:24" } ] }, "documentation": null, - "id": 4959, + "id": 5011, "implemented": true, "kind": "function", "modifiers": [], "name": "_ethToToken", "nodeType": "FunctionDefinition", "parameters": { - "id": 4946, + "id": 4998, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4943, + "id": 4995, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4959, + "scope": 5011, "src": "535:20:24", "stateVariable": false, "storageLocation": "default", @@ -4285,7 +4285,7 @@ "typeString": "address" }, "typeName": { - "id": 4942, + "id": 4994, "name": "address", "nodeType": "ElementaryTypeName", "src": "535:7:24", @@ -4300,10 +4300,10 @@ }, { "constant": false, - "id": 4945, + "id": 4997, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4959, + "scope": 5011, "src": "557:14:24", "stateVariable": false, "storageLocation": "default", @@ -4312,7 +4312,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4944, + "id": 4996, "name": "uint", "nodeType": "ElementaryTypeName", "src": "557:4:24", @@ -4328,15 +4328,15 @@ "src": "534:38:24" }, "returnParameters": { - "id": 4949, + "id": 5001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4948, + "id": 5000, "name": "", "nodeType": "VariableDeclaration", - "scope": 4959, + "scope": 5011, "src": "599:4:24", "stateVariable": false, "storageLocation": "default", @@ -4345,7 +4345,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4947, + "id": 4999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "599:4:24", @@ -4360,7 +4360,7 @@ ], "src": "598:6:24" }, - "scope": 5194, + "scope": 5246, "src": "514:160:24", "stateMutability": "nonpayable", "superFunction": null, @@ -4368,7 +4368,7 @@ }, { "body": { - "id": 4987, + "id": 5039, "nodeType": "Block", "src": "792:157:24", "statements": [ @@ -4378,11 +4378,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4979, + "id": 5031, "name": "minTokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4965, + "referencedDeclaration": 5017, "src": "911:14:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4398,18 +4398,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4983, + "id": 5035, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4981, + "id": 5033, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7829, + "referencedDeclaration": 7820, "src": "932:3:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4421,7 +4421,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3630", - "id": 4982, + "id": 5034, "isConstant": false, "isLValue": false, "isPure": true, @@ -4450,7 +4450,7 @@ "typeString": "uint256" } ], - "id": 4980, + "id": 5032, "isConstant": false, "isLValue": false, "isPure": true, @@ -4463,7 +4463,7 @@ }, "typeName": "uint" }, - "id": 4984, + "id": 5036, "isConstant": false, "isLValue": false, "isPure": false, @@ -4492,11 +4492,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4977, + "id": 5029, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4963, + "referencedDeclaration": 5015, "src": "900:9:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4521,11 +4521,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4972, + "id": 5024, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4961, + "referencedDeclaration": 5013, "src": "846:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4540,18 +4540,18 @@ "typeString": "address" } ], - "id": 4971, + "id": 5023, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4941, + "referencedDeclaration": 4993, "src": "826:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 4973, + "id": 5025, "isConstant": false, "isLValue": false, "isPure": false, @@ -4573,18 +4573,18 @@ "typeString": "address" } ], - "id": 4970, + "id": 5022, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "809:16:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 4974, + "id": 5026, "isConstant": false, "isLValue": false, "isPure": false, @@ -4594,25 +4594,25 @@ "nodeType": "FunctionCall", "src": "809:51:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 4975, + "id": 5027, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ethToTokenSwapInput", "nodeType": "MemberAccess", - "referencedDeclaration": 1640, + "referencedDeclaration": 1666, "src": "809:84:24", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) payable external returns (uint256)" } }, - "id": 4976, + "id": 5028, "isConstant": false, "isLValue": false, "isPure": false, @@ -4626,7 +4626,7 @@ "typeString": "function (uint256) pure returns (function (uint256,uint256) payable external returns (uint256))" } }, - "id": 4978, + "id": 5030, "isConstant": false, "isLValue": false, "isPure": false, @@ -4640,7 +4640,7 @@ "typeString": "function (uint256,uint256) payable external returns (uint256)" } }, - "id": 4985, + "id": 5037, "isConstant": false, "isLValue": false, "isPure": false, @@ -4654,30 +4654,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4969, - "id": 4986, + "functionReturnParameters": 5021, + "id": 5038, "nodeType": "Return", "src": "802:140:24" } ] }, "documentation": null, - "id": 4988, + "id": 5040, "implemented": true, "kind": "function", "modifiers": [], "name": "_ethToToken", "nodeType": "FunctionDefinition", "parameters": { - "id": 4966, + "id": 5018, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4961, + "id": 5013, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 4988, + "scope": 5040, "src": "701:20:24", "stateVariable": false, "storageLocation": "default", @@ -4686,7 +4686,7 @@ "typeString": "address" }, "typeName": { - "id": 4960, + "id": 5012, "name": "address", "nodeType": "ElementaryTypeName", "src": "701:7:24", @@ -4701,10 +4701,10 @@ }, { "constant": false, - "id": 4963, + "id": 5015, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 4988, + "scope": 5040, "src": "723:14:24", "stateVariable": false, "storageLocation": "default", @@ -4713,7 +4713,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4962, + "id": 5014, "name": "uint", "nodeType": "ElementaryTypeName", "src": "723:4:24", @@ -4727,10 +4727,10 @@ }, { "constant": false, - "id": 4965, + "id": 5017, "name": "minTokenAmount", "nodeType": "VariableDeclaration", - "scope": 4988, + "scope": 5040, "src": "739:19:24", "stateVariable": false, "storageLocation": "default", @@ -4739,7 +4739,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4964, + "id": 5016, "name": "uint", "nodeType": "ElementaryTypeName", "src": "739:4:24", @@ -4755,15 +4755,15 @@ "src": "700:59:24" }, "returnParameters": { - "id": 4969, + "id": 5021, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4968, + "id": 5020, "name": "", "nodeType": "VariableDeclaration", - "scope": 4988, + "scope": 5040, "src": "786:4:24", "stateVariable": false, "storageLocation": "default", @@ -4772,7 +4772,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4967, + "id": 5019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "786:4:24", @@ -4787,7 +4787,7 @@ ], "src": "785:6:24" }, - "scope": 5194, + "scope": 5246, "src": "680:269:24", "stateMutability": "nonpayable", "superFunction": null, @@ -4795,7 +4795,7 @@ }, { "body": { - "id": 5005, + "id": 5057, "nodeType": "Block", "src": "1040:71:24", "statements": [ @@ -4805,11 +4805,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4998, + "id": 5050, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4990, + "referencedDeclaration": 5042, "src": "1069:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4818,11 +4818,11 @@ }, { "argumentTypes": null, - "id": 4999, + "id": 5051, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4992, + "referencedDeclaration": 5044, "src": "1083:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4835,7 +4835,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 5001, + "id": 5053, "isConstant": false, "isLValue": false, "isPure": true, @@ -4858,7 +4858,7 @@ "typeString": "int_const 1" } ], - "id": 5000, + "id": 5052, "isConstant": false, "isLValue": false, "isPure": true, @@ -4871,7 +4871,7 @@ }, "typeName": "uint" }, - "id": 5002, + "id": 5054, "isConstant": false, "isLValue": false, "isPure": true, @@ -4901,21 +4901,21 @@ "typeString": "uint256" } ], - "id": 4997, + "id": 5049, "name": "_tokenToEth", "nodeType": "Identifier", "overloadedDeclarations": [ - 5006, - 5045 + 5058, + 5097 ], - "referencedDeclaration": 5045, + "referencedDeclaration": 5097, "src": "1057:11:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) returns (uint256)" } }, - "id": 5003, + "id": 5055, "isConstant": false, "isLValue": false, "isPure": false, @@ -4929,30 +4929,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 4996, - "id": 5004, + "functionReturnParameters": 5048, + "id": 5056, "nodeType": "Return", "src": "1050:54:24" } ] }, "documentation": null, - "id": 5006, + "id": 5058, "implemented": true, "kind": "function", "modifiers": [], "name": "_tokenToEth", "nodeType": "FunctionDefinition", "parameters": { - "id": 4993, + "id": 5045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4990, + "id": 5042, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 5006, + "scope": 5058, "src": "976:20:24", "stateVariable": false, "storageLocation": "default", @@ -4961,7 +4961,7 @@ "typeString": "address" }, "typeName": { - "id": 4989, + "id": 5041, "name": "address", "nodeType": "ElementaryTypeName", "src": "976:7:24", @@ -4976,10 +4976,10 @@ }, { "constant": false, - "id": 4992, + "id": 5044, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 5006, + "scope": 5058, "src": "998:16:24", "stateVariable": false, "storageLocation": "default", @@ -4988,7 +4988,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4991, + "id": 5043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "998:4:24", @@ -5004,15 +5004,15 @@ "src": "975:40:24" }, "returnParameters": { - "id": 4996, + "id": 5048, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4995, + "id": 5047, "name": "", "nodeType": "VariableDeclaration", - "scope": 5006, + "scope": 5058, "src": "1034:4:24", "stateVariable": false, "storageLocation": "default", @@ -5021,7 +5021,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4994, + "id": 5046, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1034:4:24", @@ -5036,7 +5036,7 @@ ], "src": "1033:6:24" }, - "scope": 5194, + "scope": 5246, "src": "955:156:24", "stateMutability": "nonpayable", "superFunction": null, @@ -5044,21 +5044,21 @@ }, { "body": { - "id": 5044, + "id": 5096, "nodeType": "Block", "src": "1221:251:24", "statements": [ { "assignments": [ - 5018 + 5070 ], "declarations": [ { "constant": false, - "id": 5018, + "id": 5070, "name": "exchange", "nodeType": "VariableDeclaration", - "scope": 5044, + "scope": 5096, "src": "1231:16:24", "stateVariable": false, "storageLocation": "default", @@ -5067,7 +5067,7 @@ "typeString": "address" }, "typeName": { - "id": 5017, + "id": 5069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1231:7:24", @@ -5081,17 +5081,17 @@ "visibility": "internal" } ], - "id": 5022, + "id": 5074, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5020, + "id": 5072, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5008, + "referencedDeclaration": 5060, "src": "1270:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5106,18 +5106,18 @@ "typeString": "address" } ], - "id": 5019, + "id": 5071, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4941, + "referencedDeclaration": 4993, "src": "1250:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 5021, + "id": 5073, "isConstant": false, "isLValue": false, "isPure": false, @@ -5140,11 +5140,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5027, + "id": 5079, "name": "exchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5018, + "referencedDeclaration": 5070, "src": "1323:8:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5153,11 +5153,11 @@ }, { "argumentTypes": null, - "id": 5028, + "id": 5080, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5010, + "referencedDeclaration": 5062, "src": "1333:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5181,11 +5181,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5024, + "id": 5076, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5008, + "referencedDeclaration": 5060, "src": "1301:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5200,7 +5200,7 @@ "typeString": "address" } ], - "id": 5023, + "id": 5075, "name": "IERC20", "nodeType": "Identifier", "overloadedDeclarations": [], @@ -5211,7 +5211,7 @@ "typeString": "type(contract IERC20)" } }, - "id": 5025, + "id": 5077, "isConstant": false, "isLValue": false, "isPure": false, @@ -5225,7 +5225,7 @@ "typeString": "contract IERC20" } }, - "id": 5026, + "id": 5078, "isConstant": false, "isLValue": false, "isPure": false, @@ -5239,7 +5239,7 @@ "typeString": "function (address,uint256) external returns (bool)" } }, - "id": 5029, + "id": 5081, "isConstant": false, "isLValue": false, "isPure": false, @@ -5253,7 +5253,7 @@ "typeString": "bool" } }, - "id": 5030, + "id": 5082, "nodeType": "ExpressionStatement", "src": "1294:51:24" }, @@ -5263,11 +5263,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5035, + "id": 5087, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5010, + "referencedDeclaration": 5062, "src": "1423:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5276,11 +5276,11 @@ }, { "argumentTypes": null, - "id": 5036, + "id": 5088, "name": "minEthAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5012, + "referencedDeclaration": 5064, "src": "1436:12:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5296,18 +5296,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 5040, + "id": 5092, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 5038, + "id": 5090, "name": "now", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7829, + "referencedDeclaration": 7820, "src": "1455:3:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5319,7 +5319,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3630", - "id": 5039, + "id": 5091, "isConstant": false, "isLValue": false, "isPure": true, @@ -5348,7 +5348,7 @@ "typeString": "uint256" } ], - "id": 5037, + "id": 5089, "isConstant": false, "isLValue": false, "isPure": true, @@ -5361,7 +5361,7 @@ }, "typeName": "uint" }, - "id": 5041, + "id": 5093, "isConstant": false, "isLValue": false, "isPure": false, @@ -5396,11 +5396,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5032, + "id": 5084, "name": "exchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5018, + "referencedDeclaration": 5070, "src": "1380:8:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5415,18 +5415,18 @@ "typeString": "address" } ], - "id": 5031, + "id": 5083, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "1363:16:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 5033, + "id": 5085, "isConstant": false, "isLValue": false, "isPure": false, @@ -5436,25 +5436,25 @@ "nodeType": "FunctionCall", "src": "1363:26:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 5034, + "id": 5086, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "tokenToEthSwapInput", "nodeType": "MemberAccess", - "referencedDeclaration": 1682, + "referencedDeclaration": 1708, "src": "1363:59:24", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256,uint256) external returns (uint256)" } }, - "id": 5042, + "id": 5094, "isConstant": false, "isLValue": false, "isPure": false, @@ -5468,30 +5468,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5016, - "id": 5043, + "functionReturnParameters": 5068, + "id": 5095, "nodeType": "Return", "src": "1356:109:24" } ] }, "documentation": null, - "id": 5045, + "id": 5097, "implemented": true, "kind": "function", "modifiers": [], "name": "_tokenToEth", "nodeType": "FunctionDefinition", "parameters": { - "id": 5013, + "id": 5065, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5008, + "id": 5060, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 5045, + "scope": 5097, "src": "1138:20:24", "stateVariable": false, "storageLocation": "default", @@ -5500,7 +5500,7 @@ "typeString": "address" }, "typeName": { - "id": 5007, + "id": 5059, "name": "address", "nodeType": "ElementaryTypeName", "src": "1138:7:24", @@ -5515,10 +5515,10 @@ }, { "constant": false, - "id": 5010, + "id": 5062, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 5045, + "scope": 5097, "src": "1160:16:24", "stateVariable": false, "storageLocation": "default", @@ -5527,7 +5527,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5009, + "id": 5061, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1160:4:24", @@ -5541,10 +5541,10 @@ }, { "constant": false, - "id": 5012, + "id": 5064, "name": "minEthAmount", "nodeType": "VariableDeclaration", - "scope": 5045, + "scope": 5097, "src": "1178:17:24", "stateVariable": false, "storageLocation": "default", @@ -5553,7 +5553,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5011, + "id": 5063, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1178:4:24", @@ -5569,15 +5569,15 @@ "src": "1137:59:24" }, "returnParameters": { - "id": 5016, + "id": 5068, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5015, + "id": 5067, "name": "", "nodeType": "VariableDeclaration", - "scope": 5045, + "scope": 5097, "src": "1215:4:24", "stateVariable": false, "storageLocation": "default", @@ -5586,7 +5586,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5014, + "id": 5066, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1215:4:24", @@ -5601,7 +5601,7 @@ ], "src": "1214:6:24" }, - "scope": 5194, + "scope": 5246, "src": "1117:355:24", "stateMutability": "nonpayable", "superFunction": null, @@ -5609,21 +5609,21 @@ }, { "body": { - "id": 5071, + "id": 5123, "nodeType": "Block", "src": "1589:122:24", "statements": [ { "assignments": [ - 5059 + 5111 ], "declarations": [ { "constant": false, - "id": 5059, + "id": 5111, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 5071, + "scope": 5123, "src": "1599:14:24", "stateVariable": false, "storageLocation": "default", @@ -5632,7 +5632,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5058, + "id": 5110, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1599:4:24", @@ -5645,17 +5645,17 @@ "visibility": "internal" } ], - "id": 5064, + "id": 5116, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5061, + "id": 5113, "name": "from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5047, + "referencedDeclaration": 5099, "src": "1628:4:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5664,11 +5664,11 @@ }, { "argumentTypes": null, - "id": 5062, + "id": 5114, "name": "tokenInAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5051, + "referencedDeclaration": 5103, "src": "1634:13:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5687,21 +5687,21 @@ "typeString": "uint256" } ], - "id": 5060, + "id": 5112, "name": "_tokenToEth", "nodeType": "Identifier", "overloadedDeclarations": [ - 5006, - 5045 + 5058, + 5097 ], - "referencedDeclaration": 5006, + "referencedDeclaration": 5058, "src": "1616:11:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 5063, + "id": 5115, "isConstant": false, "isLValue": false, "isPure": false, @@ -5724,11 +5724,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5066, + "id": 5118, "name": "to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5049, + "referencedDeclaration": 5101, "src": "1677:2:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5737,11 +5737,11 @@ }, { "argumentTypes": null, - "id": 5067, + "id": 5119, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5059, + "referencedDeclaration": 5111, "src": "1681:9:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5750,11 +5750,11 @@ }, { "argumentTypes": null, - "id": 5068, + "id": 5120, "name": "minTokenOut", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5053, + "referencedDeclaration": 5105, "src": "1692:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5777,21 +5777,21 @@ "typeString": "uint256" } ], - "id": 5065, + "id": 5117, "name": "_ethToToken", "nodeType": "Identifier", "overloadedDeclarations": [ - 4959, - 4988 + 5011, + 5040 ], - "referencedDeclaration": 4988, + "referencedDeclaration": 5040, "src": "1665:11:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256,uint256) returns (uint256)" } }, - "id": 5069, + "id": 5121, "isConstant": false, "isLValue": false, "isPure": false, @@ -5805,30 +5805,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5057, - "id": 5070, + "functionReturnParameters": 5109, + "id": 5122, "nodeType": "Return", "src": "1658:46:24" } ] }, "documentation": null, - "id": 5072, + "id": 5124, "implemented": true, "kind": "function", "modifiers": [], "name": "_tokenToToken", "nodeType": "FunctionDefinition", "parameters": { - "id": 5054, + "id": 5106, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5047, + "id": 5099, "name": "from", "nodeType": "VariableDeclaration", - "scope": 5072, + "scope": 5124, "src": "1501:12:24", "stateVariable": false, "storageLocation": "default", @@ -5837,7 +5837,7 @@ "typeString": "address" }, "typeName": { - "id": 5046, + "id": 5098, "name": "address", "nodeType": "ElementaryTypeName", "src": "1501:7:24", @@ -5852,10 +5852,10 @@ }, { "constant": false, - "id": 5049, + "id": 5101, "name": "to", "nodeType": "VariableDeclaration", - "scope": 5072, + "scope": 5124, "src": "1515:10:24", "stateVariable": false, "storageLocation": "default", @@ -5864,7 +5864,7 @@ "typeString": "address" }, "typeName": { - "id": 5048, + "id": 5100, "name": "address", "nodeType": "ElementaryTypeName", "src": "1515:7:24", @@ -5879,10 +5879,10 @@ }, { "constant": false, - "id": 5051, + "id": 5103, "name": "tokenInAmount", "nodeType": "VariableDeclaration", - "scope": 5072, + "scope": 5124, "src": "1527:18:24", "stateVariable": false, "storageLocation": "default", @@ -5891,7 +5891,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5050, + "id": 5102, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1527:4:24", @@ -5905,10 +5905,10 @@ }, { "constant": false, - "id": 5053, + "id": 5105, "name": "minTokenOut", "nodeType": "VariableDeclaration", - "scope": 5072, + "scope": 5124, "src": "1547:16:24", "stateVariable": false, "storageLocation": "default", @@ -5917,7 +5917,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5052, + "id": 5104, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1547:4:24", @@ -5933,15 +5933,15 @@ "src": "1500:64:24" }, "returnParameters": { - "id": 5057, + "id": 5109, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5056, + "id": 5108, "name": "", "nodeType": "VariableDeclaration", - "scope": 5072, + "scope": 5124, "src": "1583:4:24", "stateVariable": false, "storageLocation": "default", @@ -5950,7 +5950,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5055, + "id": 5107, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1583:4:24", @@ -5965,7 +5965,7 @@ ], "src": "1582:6:24" }, - "scope": 5194, + "scope": 5246, "src": "1478:233:24", "stateMutability": "nonpayable", "superFunction": null, @@ -5973,7 +5973,7 @@ }, { "body": { - "id": 5092, + "id": 5144, "nodeType": "Block", "src": "1808:69:24", "statements": [ @@ -5983,11 +5983,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5084, + "id": 5136, "name": "from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5074, + "referencedDeclaration": 5126, "src": "1839:4:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5996,11 +5996,11 @@ }, { "argumentTypes": null, - "id": 5085, + "id": 5137, "name": "to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5076, + "referencedDeclaration": 5128, "src": "1845:2:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6009,11 +6009,11 @@ }, { "argumentTypes": null, - "id": 5086, + "id": 5138, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5078, + "referencedDeclaration": 5130, "src": "1849:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6026,7 +6026,7 @@ { "argumentTypes": null, "hexValue": "31", - "id": 5088, + "id": 5140, "isConstant": false, "isLValue": false, "isPure": true, @@ -6049,7 +6049,7 @@ "typeString": "int_const 1" } ], - "id": 5087, + "id": 5139, "isConstant": false, "isLValue": false, "isPure": true, @@ -6062,7 +6062,7 @@ }, "typeName": "uint" }, - "id": 5089, + "id": 5141, "isConstant": false, "isLValue": false, "isPure": true, @@ -6096,21 +6096,21 @@ "typeString": "uint256" } ], - "id": 5083, + "id": 5135, "name": "_tokenToToken", "nodeType": "Identifier", "overloadedDeclarations": [ - 5072, - 5093 + 5124, + 5145 ], - "referencedDeclaration": 5072, + "referencedDeclaration": 5124, "src": "1825:13:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,address,uint256,uint256) returns (uint256)" } }, - "id": 5090, + "id": 5142, "isConstant": false, "isLValue": false, "isPure": false, @@ -6124,30 +6124,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5082, - "id": 5091, + "functionReturnParameters": 5134, + "id": 5143, "nodeType": "Return", "src": "1818:52:24" } ] }, "documentation": null, - "id": 5093, + "id": 5145, "implemented": true, "kind": "function", "modifiers": [], "name": "_tokenToToken", "nodeType": "FunctionDefinition", "parameters": { - "id": 5079, + "id": 5131, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5074, + "id": 5126, "name": "from", "nodeType": "VariableDeclaration", - "scope": 5093, + "scope": 5145, "src": "1740:12:24", "stateVariable": false, "storageLocation": "default", @@ -6156,7 +6156,7 @@ "typeString": "address" }, "typeName": { - "id": 5073, + "id": 5125, "name": "address", "nodeType": "ElementaryTypeName", "src": "1740:7:24", @@ -6171,10 +6171,10 @@ }, { "constant": false, - "id": 5076, + "id": 5128, "name": "to", "nodeType": "VariableDeclaration", - "scope": 5093, + "scope": 5145, "src": "1754:10:24", "stateVariable": false, "storageLocation": "default", @@ -6183,7 +6183,7 @@ "typeString": "address" }, "typeName": { - "id": 5075, + "id": 5127, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:24", @@ -6198,10 +6198,10 @@ }, { "constant": false, - "id": 5078, + "id": 5130, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 5093, + "scope": 5145, "src": "1766:16:24", "stateVariable": false, "storageLocation": "default", @@ -6210,7 +6210,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5077, + "id": 5129, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1766:4:24", @@ -6226,15 +6226,15 @@ "src": "1739:44:24" }, "returnParameters": { - "id": 5082, + "id": 5134, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5081, + "id": 5133, "name": "", "nodeType": "VariableDeclaration", - "scope": 5093, + "scope": 5145, "src": "1802:4:24", "stateVariable": false, "storageLocation": "default", @@ -6243,7 +6243,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5080, + "id": 5132, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1802:4:24", @@ -6258,7 +6258,7 @@ ], "src": "1801:6:24" }, - "scope": 5194, + "scope": 5246, "src": "1717:160:24", "stateMutability": "nonpayable", "superFunction": null, @@ -6266,7 +6266,7 @@ }, { "body": { - "id": 5111, + "id": 5163, "nodeType": "Block", "src": "1981:112:24", "statements": [ @@ -6276,11 +6276,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5108, + "id": 5160, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5097, + "referencedDeclaration": 5149, "src": "2074:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6303,11 +6303,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5104, + "id": 5156, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5095, + "referencedDeclaration": 5147, "src": "2035:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6322,18 +6322,18 @@ "typeString": "address" } ], - "id": 5103, + "id": 5155, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4941, + "referencedDeclaration": 4993, "src": "2015:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 5105, + "id": 5157, "isConstant": false, "isLValue": false, "isPure": false, @@ -6355,18 +6355,18 @@ "typeString": "address" } ], - "id": 5102, + "id": 5154, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "1998:16:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 5106, + "id": 5158, "isConstant": false, "isLValue": false, "isPure": false, @@ -6376,25 +6376,25 @@ "nodeType": "FunctionCall", "src": "1998:51:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 5107, + "id": 5159, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTokenToEthInputPrice", "nodeType": "MemberAccess", - "referencedDeclaration": 1624, + "referencedDeclaration": 1650, "src": "1998:75:24", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 5109, + "id": 5161, "isConstant": false, "isLValue": false, "isPure": false, @@ -6408,30 +6408,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5101, - "id": 5110, + "functionReturnParameters": 5153, + "id": 5162, "nodeType": "Return", "src": "1991:95:24" } ] }, "documentation": null, - "id": 5112, + "id": 5164, "implemented": true, "kind": "function", "modifiers": [], "name": "_getTokenToEthInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 5098, + "id": 5150, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5095, + "id": 5147, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 5112, + "scope": 5164, "src": "1912:20:24", "stateVariable": false, "storageLocation": "default", @@ -6440,7 +6440,7 @@ "typeString": "address" }, "typeName": { - "id": 5094, + "id": 5146, "name": "address", "nodeType": "ElementaryTypeName", "src": "1912:7:24", @@ -6455,10 +6455,10 @@ }, { "constant": false, - "id": 5097, + "id": 5149, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 5112, + "scope": 5164, "src": "1934:16:24", "stateVariable": false, "storageLocation": "default", @@ -6467,7 +6467,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5096, + "id": 5148, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1934:4:24", @@ -6483,15 +6483,15 @@ "src": "1911:40:24" }, "returnParameters": { - "id": 5101, + "id": 5153, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5100, + "id": 5152, "name": "", "nodeType": "VariableDeclaration", - "scope": 5112, + "scope": 5164, "src": "1975:4:24", "stateVariable": false, "storageLocation": "default", @@ -6500,7 +6500,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5099, + "id": 5151, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1975:4:24", @@ -6515,7 +6515,7 @@ ], "src": "1974:6:24" }, - "scope": 5194, + "scope": 5246, "src": "1883:210:24", "stateMutability": "view", "superFunction": null, @@ -6523,7 +6523,7 @@ }, { "body": { - "id": 5130, + "id": 5182, "nodeType": "Block", "src": "2195:110:24", "statements": [ @@ -6533,11 +6533,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5127, + "id": 5179, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5116, + "referencedDeclaration": 5168, "src": "2288:9:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6560,11 +6560,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5123, + "id": 5175, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5114, + "referencedDeclaration": 5166, "src": "2249:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6579,18 +6579,18 @@ "typeString": "address" } ], - "id": 5122, + "id": 5174, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4941, + "referencedDeclaration": 4993, "src": "2229:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 5124, + "id": 5176, "isConstant": false, "isLValue": false, "isPure": false, @@ -6612,18 +6612,18 @@ "typeString": "address" } ], - "id": 5121, + "id": 5173, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "2212:16:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 5125, + "id": 5177, "isConstant": false, "isLValue": false, "isPure": false, @@ -6633,25 +6633,25 @@ "nodeType": "FunctionCall", "src": "2212:51:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 5126, + "id": 5178, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getEthToTokenInputPrice", "nodeType": "MemberAccess", - "referencedDeclaration": 1610, + "referencedDeclaration": 1636, "src": "2212:75:24", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 5128, + "id": 5180, "isConstant": false, "isLValue": false, "isPure": false, @@ -6665,30 +6665,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5120, - "id": 5129, + "functionReturnParameters": 5172, + "id": 5181, "nodeType": "Return", "src": "2205:93:24" } ] }, "documentation": null, - "id": 5131, + "id": 5183, "implemented": true, "kind": "function", "modifiers": [], "name": "_getEthToTokenInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 5117, + "id": 5169, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5114, + "id": 5166, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 5131, + "scope": 5183, "src": "2128:20:24", "stateVariable": false, "storageLocation": "default", @@ -6697,7 +6697,7 @@ "typeString": "address" }, "typeName": { - "id": 5113, + "id": 5165, "name": "address", "nodeType": "ElementaryTypeName", "src": "2128:7:24", @@ -6712,10 +6712,10 @@ }, { "constant": false, - "id": 5116, + "id": 5168, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 5131, + "scope": 5183, "src": "2150:14:24", "stateVariable": false, "storageLocation": "default", @@ -6724,7 +6724,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5115, + "id": 5167, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2150:4:24", @@ -6740,15 +6740,15 @@ "src": "2127:38:24" }, "returnParameters": { - "id": 5120, + "id": 5172, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5119, + "id": 5171, "name": "", "nodeType": "VariableDeclaration", - "scope": 5131, + "scope": 5183, "src": "2189:4:24", "stateVariable": false, "storageLocation": "default", @@ -6757,7 +6757,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5118, + "id": 5170, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2189:4:24", @@ -6772,7 +6772,7 @@ ], "src": "2188:6:24" }, - "scope": 5194, + "scope": 5246, "src": "2099:206:24", "stateMutability": "view", "superFunction": null, @@ -6780,7 +6780,7 @@ }, { "body": { - "id": 5149, + "id": 5201, "nodeType": "Block", "src": "2408:111:24", "statements": [ @@ -6790,11 +6790,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5146, + "id": 5198, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5135, + "referencedDeclaration": 5187, "src": "2502:9:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6817,11 +6817,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5142, + "id": 5194, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5133, + "referencedDeclaration": 5185, "src": "2462:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6836,18 +6836,18 @@ "typeString": "address" } ], - "id": 5141, + "id": 5193, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4941, + "referencedDeclaration": 4993, "src": "2442:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 5143, + "id": 5195, "isConstant": false, "isLValue": false, "isPure": false, @@ -6869,18 +6869,18 @@ "typeString": "address" } ], - "id": 5140, + "id": 5192, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "2425:16:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 5144, + "id": 5196, "isConstant": false, "isLValue": false, "isPure": false, @@ -6890,25 +6890,25 @@ "nodeType": "FunctionCall", "src": "2425:51:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 5145, + "id": 5197, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getTokenToEthOutputPrice", "nodeType": "MemberAccess", - "referencedDeclaration": 1631, + "referencedDeclaration": 1657, "src": "2425:76:24", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 5147, + "id": 5199, "isConstant": false, "isLValue": false, "isPure": false, @@ -6922,30 +6922,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5139, - "id": 5148, + "functionReturnParameters": 5191, + "id": 5200, "nodeType": "Return", "src": "2418:94:24" } ] }, "documentation": null, - "id": 5150, + "id": 5202, "implemented": true, "kind": "function", "modifiers": [], "name": "_getTokenToEthOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 5136, + "id": 5188, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5133, + "id": 5185, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 5150, + "scope": 5202, "src": "2341:20:24", "stateVariable": false, "storageLocation": "default", @@ -6954,7 +6954,7 @@ "typeString": "address" }, "typeName": { - "id": 5132, + "id": 5184, "name": "address", "nodeType": "ElementaryTypeName", "src": "2341:7:24", @@ -6969,10 +6969,10 @@ }, { "constant": false, - "id": 5135, + "id": 5187, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 5150, + "scope": 5202, "src": "2363:14:24", "stateVariable": false, "storageLocation": "default", @@ -6981,7 +6981,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5134, + "id": 5186, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2363:4:24", @@ -6997,15 +6997,15 @@ "src": "2340:38:24" }, "returnParameters": { - "id": 5139, + "id": 5191, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5138, + "id": 5190, "name": "", "nodeType": "VariableDeclaration", - "scope": 5150, + "scope": 5202, "src": "2402:4:24", "stateVariable": false, "storageLocation": "default", @@ -7014,7 +7014,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5137, + "id": 5189, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2402:4:24", @@ -7029,7 +7029,7 @@ ], "src": "2401:6:24" }, - "scope": 5194, + "scope": 5246, "src": "2311:208:24", "stateMutability": "view", "superFunction": null, @@ -7037,7 +7037,7 @@ }, { "body": { - "id": 5168, + "id": 5220, "nodeType": "Block", "src": "2624:113:24", "statements": [ @@ -7047,11 +7047,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5165, + "id": 5217, "name": "tokenAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5154, + "referencedDeclaration": 5206, "src": "2718:11:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7074,11 +7074,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5161, + "id": 5213, "name": "tokenAddress", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5152, + "referencedDeclaration": 5204, "src": "2678:12:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7093,18 +7093,18 @@ "typeString": "address" } ], - "id": 5160, + "id": 5212, "name": "_getUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4941, + "referencedDeclaration": 4993, "src": "2658:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$returns$_t_address_$", "typeString": "function (address) view returns (address)" } }, - "id": 5162, + "id": 5214, "isConstant": false, "isLValue": false, "isPure": false, @@ -7126,18 +7126,18 @@ "typeString": "address" } ], - "id": 5159, + "id": 5211, "name": "IUniswapExchange", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1909, + "referencedDeclaration": 1935, "src": "2641:16:24", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1909_$", + "typeIdentifier": "t_type$_t_contract$_IUniswapExchange_$1935_$", "typeString": "type(contract IUniswapExchange)" } }, - "id": 5163, + "id": 5215, "isConstant": false, "isLValue": false, "isPure": false, @@ -7147,25 +7147,25 @@ "nodeType": "FunctionCall", "src": "2641:51:24", "typeDescriptions": { - "typeIdentifier": "t_contract$_IUniswapExchange_$1909", + "typeIdentifier": "t_contract$_IUniswapExchange_$1935", "typeString": "contract IUniswapExchange" } }, - "id": 5164, + "id": 5216, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "getEthToTokenOutputPrice", "nodeType": "MemberAccess", - "referencedDeclaration": 1617, + "referencedDeclaration": 1643, "src": "2641:76:24", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256) view external returns (uint256)" } }, - "id": 5166, + "id": 5218, "isConstant": false, "isLValue": false, "isPure": false, @@ -7179,30 +7179,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5158, - "id": 5167, + "functionReturnParameters": 5210, + "id": 5219, "nodeType": "Return", "src": "2634:96:24" } ] }, "documentation": null, - "id": 5169, + "id": 5221, "implemented": true, "kind": "function", "modifiers": [], "name": "_getEthToTokenOutput", "nodeType": "FunctionDefinition", "parameters": { - "id": 5155, + "id": 5207, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5152, + "id": 5204, "name": "tokenAddress", "nodeType": "VariableDeclaration", - "scope": 5169, + "scope": 5221, "src": "2555:20:24", "stateVariable": false, "storageLocation": "default", @@ -7211,7 +7211,7 @@ "typeString": "address" }, "typeName": { - "id": 5151, + "id": 5203, "name": "address", "nodeType": "ElementaryTypeName", "src": "2555:7:24", @@ -7226,10 +7226,10 @@ }, { "constant": false, - "id": 5154, + "id": 5206, "name": "tokenAmount", "nodeType": "VariableDeclaration", - "scope": 5169, + "scope": 5221, "src": "2577:16:24", "stateVariable": false, "storageLocation": "default", @@ -7238,7 +7238,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5153, + "id": 5205, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2577:4:24", @@ -7254,15 +7254,15 @@ "src": "2554:40:24" }, "returnParameters": { - "id": 5158, + "id": 5210, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5157, + "id": 5209, "name": "", "nodeType": "VariableDeclaration", - "scope": 5169, + "scope": 5221, "src": "2618:4:24", "stateVariable": false, "storageLocation": "default", @@ -7271,7 +7271,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5156, + "id": 5208, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2618:4:24", @@ -7286,7 +7286,7 @@ ], "src": "2617:6:24" }, - "scope": 5194, + "scope": 5246, "src": "2525:212:24", "stateMutability": "view", "superFunction": null, @@ -7294,21 +7294,21 @@ }, { "body": { - "id": 5192, + "id": 5244, "nodeType": "Block", "src": "2846:122:24", "statements": [ { "assignments": [ - 5181 + 5233 ], "declarations": [ { "constant": false, - "id": 5181, + "id": 5233, "name": "ethAmount", "nodeType": "VariableDeclaration", - "scope": 5192, + "scope": 5244, "src": "2856:14:24", "stateVariable": false, "storageLocation": "default", @@ -7317,7 +7317,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5180, + "id": 5232, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2856:4:24", @@ -7330,17 +7330,17 @@ "visibility": "internal" } ], - "id": 5186, + "id": 5238, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 5183, + "id": 5235, "name": "from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5171, + "referencedDeclaration": 5223, "src": "2893:4:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7349,11 +7349,11 @@ }, { "argumentTypes": null, - "id": 5184, + "id": 5236, "name": "fromAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5175, + "referencedDeclaration": 5227, "src": "2899:10:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7372,18 +7372,18 @@ "typeString": "uint256" } ], - "id": 5182, + "id": 5234, "name": "_getTokenToEthInput", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5112, + "referencedDeclaration": 5164, "src": "2873:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 5185, + "id": 5237, "isConstant": false, "isLValue": false, "isPure": false, @@ -7406,11 +7406,11 @@ "arguments": [ { "argumentTypes": null, - "id": 5188, + "id": 5240, "name": "to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5173, + "referencedDeclaration": 5225, "src": "2947:2:24", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7419,11 +7419,11 @@ }, { "argumentTypes": null, - "id": 5189, + "id": 5241, "name": "ethAmount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5181, + "referencedDeclaration": 5233, "src": "2951:9:24", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7442,18 +7442,18 @@ "typeString": "uint256" } ], - "id": 5187, + "id": 5239, "name": "_getEthToTokenInput", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 5131, + "referencedDeclaration": 5183, "src": "2927:19:24", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) view returns (uint256)" } }, - "id": 5190, + "id": 5242, "isConstant": false, "isLValue": false, "isPure": false, @@ -7467,30 +7467,30 @@ "typeString": "uint256" } }, - "functionReturnParameters": 5179, - "id": 5191, + "functionReturnParameters": 5231, + "id": 5243, "nodeType": "Return", "src": "2920:41:24" } ] }, "documentation": null, - "id": 5193, + "id": 5245, "implemented": true, "kind": "function", "modifiers": [], "name": "_getTokenToTokenInput", "nodeType": "FunctionDefinition", "parameters": { - "id": 5176, + "id": 5228, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5171, + "id": 5223, "name": "from", "nodeType": "VariableDeclaration", - "scope": 5193, + "scope": 5245, "src": "2774:12:24", "stateVariable": false, "storageLocation": "default", @@ -7499,7 +7499,7 @@ "typeString": "address" }, "typeName": { - "id": 5170, + "id": 5222, "name": "address", "nodeType": "ElementaryTypeName", "src": "2774:7:24", @@ -7514,10 +7514,10 @@ }, { "constant": false, - "id": 5173, + "id": 5225, "name": "to", "nodeType": "VariableDeclaration", - "scope": 5193, + "scope": 5245, "src": "2788:10:24", "stateVariable": false, "storageLocation": "default", @@ -7526,7 +7526,7 @@ "typeString": "address" }, "typeName": { - "id": 5172, + "id": 5224, "name": "address", "nodeType": "ElementaryTypeName", "src": "2788:7:24", @@ -7541,10 +7541,10 @@ }, { "constant": false, - "id": 5175, + "id": 5227, "name": "fromAmount", "nodeType": "VariableDeclaration", - "scope": 5193, + "scope": 5245, "src": "2800:15:24", "stateVariable": false, "storageLocation": "default", @@ -7553,7 +7553,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5174, + "id": 5226, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2800:4:24", @@ -7569,15 +7569,15 @@ "src": "2773:43:24" }, "returnParameters": { - "id": 5179, + "id": 5231, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 5178, + "id": 5230, "name": "", "nodeType": "VariableDeclaration", - "scope": 5193, + "scope": 5245, "src": "2840:4:24", "stateVariable": false, "storageLocation": "default", @@ -7586,7 +7586,7 @@ "typeString": "uint256" }, "typeName": { - "id": 5177, + "id": 5229, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2840:4:24", @@ -7601,14 +7601,14 @@ ], "src": "2839:6:24" }, - "scope": 5194, + "scope": 5246, "src": "2743:225:24", "stateMutability": "view", "superFunction": null, "visibility": "internal" } ], - "scope": 5195, + "scope": 5247, "src": "177:2793:24" } ], @@ -7620,7 +7620,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.619Z", + "updatedAt": "2020-04-08T12:21:13.884Z", "devdoc": { "methods": {} }, diff --git a/packages/smart-contracts/artifacts/VatLike.json b/packages/smart-contracts/artifacts/VatLike.json index 6390191..03e4244 100644 --- a/packages/smart-contracts/artifacts/VatLike.json +++ b/packages/smart-contracts/artifacts/VatLike.json @@ -212,35 +212,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -252,9 +252,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -266,9 +266,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -276,22 +276,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -300,7 +300,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -315,10 +315,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -327,7 +327,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -343,12 +343,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -357,22 +357,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -381,7 +381,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -396,10 +396,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -408,7 +408,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -424,12 +424,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -438,22 +438,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -462,7 +462,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -477,10 +477,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -489,7 +489,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -504,10 +504,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -516,7 +516,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -532,12 +532,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -546,25 +546,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -573,22 +573,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -597,7 +597,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -613,19 +613,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -634,9 +634,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -644,22 +644,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -668,7 +668,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -683,10 +683,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -695,7 +695,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -709,10 +709,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -721,7 +721,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -738,15 +738,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -755,7 +755,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -770,7 +770,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -779,22 +779,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -803,7 +803,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -819,15 +819,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -836,7 +836,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -851,7 +851,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -860,22 +860,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -884,7 +884,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -900,15 +900,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -917,7 +917,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -933,7 +933,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -942,22 +942,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -966,7 +966,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -982,15 +982,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -999,7 +999,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -1015,7 +1015,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -1024,28 +1024,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -1054,7 +1054,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -1070,7 +1070,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -1079,22 +1079,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -1103,7 +1103,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -1117,10 +1117,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -1129,7 +1129,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -1146,15 +1146,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -1163,7 +1163,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -1178,7 +1178,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1187,22 +1187,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -1211,7 +1211,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -1225,10 +1225,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -1237,7 +1237,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -1254,12 +1254,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1268,22 +1268,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -1292,7 +1292,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -1306,10 +1306,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -1318,7 +1318,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -1333,10 +1333,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -1345,7 +1345,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -1361,12 +1361,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1375,22 +1375,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -1399,7 +1399,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -1414,10 +1414,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -1426,7 +1426,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -1442,12 +1442,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1456,22 +1456,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -1480,7 +1480,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -1494,10 +1494,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -1506,7 +1506,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -1520,10 +1520,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -1532,7 +1532,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -1548,12 +1548,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1562,22 +1562,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -1586,7 +1586,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -1600,10 +1600,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -1612,7 +1612,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -1627,10 +1627,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -1639,7 +1639,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -1655,12 +1655,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1669,22 +1669,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -1693,7 +1693,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -1707,10 +1707,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -1719,7 +1719,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -1734,10 +1734,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -1746,7 +1746,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -1762,12 +1762,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1776,22 +1776,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -1800,7 +1800,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -1815,10 +1815,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -1827,7 +1827,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -1841,10 +1841,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -1853,7 +1853,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -1868,10 +1868,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -1880,7 +1880,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -1896,12 +1896,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1910,22 +1910,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -1934,7 +1934,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -1948,10 +1948,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -1960,7 +1960,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -1977,12 +1977,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -1991,22 +1991,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -2015,7 +2015,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -2030,10 +2030,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -2042,7 +2042,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -2058,12 +2058,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2072,22 +2072,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -2096,7 +2096,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -2110,10 +2110,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -2122,7 +2122,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -2138,19 +2138,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -2159,9 +2159,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -2169,22 +2169,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -2193,7 +2193,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -2208,10 +2208,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -2220,7 +2220,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -2237,15 +2237,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -2254,7 +2254,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -2269,7 +2269,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -2278,22 +2278,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -2302,7 +2302,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -2318,15 +2318,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -2335,7 +2335,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -2349,10 +2349,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -2361,7 +2361,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -2375,10 +2375,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -2387,7 +2387,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -2401,10 +2401,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -2413,7 +2413,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -2427,10 +2427,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -2439,7 +2439,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -2454,7 +2454,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -2463,22 +2463,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -2487,7 +2487,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -2504,15 +2504,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -2521,7 +2521,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -2536,7 +2536,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -2545,22 +2545,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -2569,7 +2569,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -2583,10 +2583,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -2595,7 +2595,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -2612,15 +2612,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -2629,7 +2629,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -2643,10 +2643,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -2655,7 +2655,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -2670,7 +2670,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -2679,22 +2679,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -2703,7 +2703,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -2717,10 +2717,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -2729,7 +2729,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -2744,10 +2744,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -2756,7 +2756,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -2771,10 +2771,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -2783,7 +2783,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -2798,10 +2798,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -2810,7 +2810,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -2824,10 +2824,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -2836,7 +2836,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -2852,12 +2852,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2866,22 +2866,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -2890,7 +2890,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -2907,12 +2907,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -2921,22 +2921,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -2945,7 +2945,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -2960,10 +2960,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -2972,7 +2972,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -2987,10 +2987,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -2999,7 +2999,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -3015,19 +3015,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -3036,9 +3036,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -3046,28 +3046,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -3076,7 +3076,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -3091,7 +3091,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3100,44 +3100,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3147,7 +3147,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3156,22 +3156,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -3180,7 +3180,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -3195,10 +3195,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -3207,7 +3207,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -3223,12 +3223,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -3237,22 +3237,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -3261,7 +3261,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -3276,10 +3276,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -3288,7 +3288,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -3304,19 +3304,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -3325,9 +3325,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -3335,44 +3335,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -3382,7 +3382,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3391,44 +3391,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -3438,7 +3438,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -3447,22 +3447,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -3471,7 +3471,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -3486,10 +3486,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -3498,7 +3498,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -3514,12 +3514,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -3528,22 +3528,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -3552,7 +3552,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -3567,10 +3567,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -3579,7 +3579,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -3595,19 +3595,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -3616,9 +3616,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -3626,22 +3626,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -3650,7 +3650,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -3666,15 +3666,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -3683,7 +3683,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -3698,14 +3698,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -3714,19 +3714,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -3735,7 +3735,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -3750,7 +3750,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -3758,7 +3758,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -3778,7 +3778,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -3803,7 +3803,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -3817,7 +3817,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -3828,18 +3828,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3851,7 +3851,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -3880,7 +3880,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -3891,7 +3891,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -3901,18 +3901,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3927,18 +3927,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3949,11 +3949,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -3973,7 +3973,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -3990,11 +3990,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4011,11 +4011,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4037,7 +4037,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -4064,21 +4064,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -4092,29 +4092,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -4123,7 +4123,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -4137,10 +4137,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -4149,7 +4149,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -4165,15 +4165,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -4182,7 +4182,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -4197,7 +4197,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -4205,7 +4205,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -4215,11 +4215,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4228,11 +4228,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4261,11 +4261,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4280,18 +4280,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -4301,25 +4301,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -4329,25 +4329,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -4361,7 +4361,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -4371,11 +4371,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4384,11 +4384,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4412,11 +4412,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4431,18 +4431,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -4452,25 +4452,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -4484,29 +4484,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -4515,7 +4515,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -4530,10 +4530,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -4542,7 +4542,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -4557,10 +4557,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -4569,7 +4569,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -4585,19 +4585,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -4606,38 +4606,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -4651,7 +4651,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -4661,18 +4661,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4687,18 +4687,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4709,11 +4709,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4733,7 +4733,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -4750,11 +4750,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4770,7 +4770,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -4797,21 +4797,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -4825,29 +4825,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -4856,7 +4856,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -4870,10 +4870,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -4882,7 +4882,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -4898,15 +4898,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -4915,7 +4915,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -4930,7 +4930,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -4938,25 +4938,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -4970,11 +4970,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -4989,7 +4989,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -5002,7 +5002,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -5022,7 +5022,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -5036,18 +5036,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -5059,7 +5059,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -5083,7 +5083,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -5110,21 +5110,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -5138,29 +5138,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -5169,7 +5169,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -5185,15 +5185,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -5202,7 +5202,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -5217,7 +5217,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -5225,25 +5225,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5257,11 +5257,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5274,7 +5274,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -5282,7 +5282,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -5302,7 +5302,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -5335,18 +5335,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -5366,29 +5366,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -5397,7 +5397,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -5413,15 +5413,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -5430,7 +5430,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -5445,7 +5445,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -5453,25 +5453,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5485,11 +5485,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5502,7 +5502,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -5510,7 +5510,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -5536,7 +5536,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -5544,7 +5544,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -5571,11 +5571,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5590,18 +5590,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -5611,25 +5611,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -5650,7 +5650,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -5681,18 +5681,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -5712,29 +5712,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -5743,7 +5743,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -5758,10 +5758,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -5770,7 +5770,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -5786,15 +5786,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -5803,7 +5803,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -5818,7 +5818,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -5826,25 +5826,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5859,18 +5859,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -5888,7 +5888,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -5896,7 +5896,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -5922,7 +5922,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -5930,7 +5930,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -5957,11 +5957,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -5976,18 +5976,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -5997,25 +5997,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -6036,7 +6036,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -6056,7 +6056,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -6081,29 +6081,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -6112,7 +6112,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -6127,10 +6127,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -6139,7 +6139,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -6155,15 +6155,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -6172,7 +6172,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -6187,7 +6187,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -6195,21 +6195,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -6218,7 +6218,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -6231,17 +6231,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -6261,11 +6261,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6280,18 +6280,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -6301,25 +6301,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -6338,15 +6338,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -6355,7 +6355,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -6368,17 +6368,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6398,11 +6398,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -6417,18 +6417,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -6438,25 +6438,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -6480,18 +6480,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6505,11 +6505,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6518,11 +6518,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6541,18 +6541,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -6573,29 +6573,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6613,7 +6613,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -6626,11 +6626,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6639,11 +6639,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6662,18 +6662,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -6689,11 +6689,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6712,18 +6712,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -6741,11 +6741,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6766,18 +6766,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -6797,25 +6797,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6832,7 +6832,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -6845,11 +6845,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -6864,7 +6864,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -6877,7 +6877,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -6893,11 +6893,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6916,18 +6916,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -6948,11 +6948,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6961,11 +6961,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -6984,18 +6984,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -7017,18 +7017,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -7041,18 +7041,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -7064,7 +7064,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -7096,7 +7096,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -7106,22 +7106,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -7130,7 +7130,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -7145,10 +7145,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -7157,7 +7157,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -7172,10 +7172,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -7184,7 +7184,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -7199,10 +7199,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -7211,7 +7211,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -7225,10 +7225,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -7237,7 +7237,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -7253,15 +7253,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -7270,7 +7270,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -7285,7 +7285,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -7293,14 +7293,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -7309,10 +7309,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -7321,7 +7321,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -7337,17 +7337,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7367,11 +7367,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7386,18 +7386,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -7407,25 +7407,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -7445,16 +7445,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -7463,7 +7463,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -7476,17 +7476,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -7495,11 +7495,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7523,11 +7523,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7542,18 +7542,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -7563,25 +7563,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -7600,15 +7600,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -7617,7 +7617,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -7630,17 +7630,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7660,11 +7660,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -7679,18 +7679,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -7700,25 +7700,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -7737,15 +7737,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -7754,7 +7754,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -7767,7 +7767,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -7776,11 +7776,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7789,11 +7789,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7812,18 +7812,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -7839,11 +7839,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7862,18 +7862,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -7893,18 +7893,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7919,18 +7919,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7941,11 +7941,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7964,25 +7964,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -7999,7 +7999,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -8009,11 +8009,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8022,11 +8022,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8045,18 +8045,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -8074,11 +8074,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8093,18 +8093,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -8117,18 +8117,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8140,7 +8140,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -8172,29 +8172,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -8203,7 +8203,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -8218,10 +8218,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -8230,7 +8230,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -8245,10 +8245,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -8257,7 +8257,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -8272,10 +8272,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -8284,7 +8284,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -8300,15 +8300,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -8317,7 +8317,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -8332,7 +8332,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -8340,25 +8340,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8372,11 +8372,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -8385,11 +8385,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8413,11 +8413,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8432,18 +8432,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -8453,25 +8453,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -8491,29 +8491,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -8522,7 +8522,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -8537,10 +8537,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -8549,7 +8549,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -8563,10 +8563,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -8575,7 +8575,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -8592,15 +8592,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -8609,7 +8609,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -8624,7 +8624,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8632,7 +8632,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -8642,11 +8642,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8655,11 +8655,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8683,11 +8683,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8702,18 +8702,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -8723,25 +8723,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -8755,29 +8755,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -8786,7 +8786,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -8801,10 +8801,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -8813,7 +8813,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -8827,10 +8827,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -8839,7 +8839,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -8856,12 +8856,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -8869,7 +8869,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -8879,11 +8879,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8892,11 +8892,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8905,11 +8905,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -8937,11 +8937,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -8956,18 +8956,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -8977,25 +8977,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -9009,29 +9009,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -9040,7 +9040,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -9055,10 +9055,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -9067,7 +9067,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -9081,10 +9081,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -9093,7 +9093,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -9108,10 +9108,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -9120,7 +9120,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -9136,12 +9136,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9149,7 +9149,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -9159,11 +9159,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9172,11 +9172,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9185,11 +9185,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9217,11 +9217,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9236,18 +9236,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -9257,25 +9257,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -9289,29 +9289,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -9320,7 +9320,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -9335,10 +9335,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -9347,7 +9347,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -9361,10 +9361,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -9373,7 +9373,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -9388,10 +9388,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -9400,7 +9400,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -9416,12 +9416,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9429,7 +9429,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -9439,11 +9439,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9452,11 +9452,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9465,11 +9465,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -9497,11 +9497,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9516,18 +9516,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -9537,25 +9537,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -9569,29 +9569,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -9600,7 +9600,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -9615,10 +9615,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -9627,7 +9627,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -9641,10 +9641,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -9653,7 +9653,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -9667,10 +9667,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -9679,7 +9679,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -9695,12 +9695,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -9708,21 +9708,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -9731,7 +9731,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -9745,7 +9745,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -9756,11 +9756,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9775,18 +9775,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -9796,25 +9796,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -9833,15 +9833,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -9850,7 +9850,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -9864,17 +9864,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -9894,11 +9894,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -9913,18 +9913,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -9934,25 +9934,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -9971,15 +9971,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -9988,7 +9988,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -10001,17 +10001,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10031,11 +10031,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10050,18 +10050,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -10071,25 +10071,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -10109,16 +10109,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -10127,7 +10127,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -10140,17 +10140,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10159,11 +10159,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10187,11 +10187,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10206,18 +10206,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -10227,25 +10227,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -10268,11 +10268,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10281,11 +10281,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10297,11 +10297,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10310,11 +10310,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10323,11 +10323,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10336,11 +10336,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -10367,18 +10367,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -10408,18 +10408,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -10433,7 +10433,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -10443,11 +10443,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10456,11 +10456,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10469,7 +10469,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -10483,11 +10483,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10502,18 +10502,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -10534,7 +10534,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -10548,11 +10548,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10567,7 +10567,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -10580,7 +10580,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -10619,18 +10619,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -10644,7 +10644,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -10654,11 +10654,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10667,11 +10667,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10683,14 +10683,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10698,11 +10698,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -10715,7 +10715,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -10731,11 +10731,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10762,18 +10762,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -10787,7 +10787,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -10800,14 +10800,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -10815,11 +10815,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -10832,7 +10832,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -10848,11 +10848,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10876,11 +10876,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -10895,18 +10895,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -10916,25 +10916,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -10948,7 +10948,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -10958,11 +10958,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -10987,11 +10987,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11006,18 +11006,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -11027,25 +11027,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -11055,25 +11055,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -11087,29 +11087,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -11118,7 +11118,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -11133,10 +11133,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -11145,7 +11145,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -11160,10 +11160,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -11172,7 +11172,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -11187,10 +11187,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -11199,7 +11199,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -11213,10 +11213,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -11225,7 +11225,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -11241,12 +11241,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -11254,21 +11254,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -11277,7 +11277,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -11291,7 +11291,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -11302,11 +11302,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11321,18 +11321,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -11342,25 +11342,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -11379,15 +11379,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -11396,7 +11396,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -11410,17 +11410,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11440,11 +11440,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11459,18 +11459,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -11480,25 +11480,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -11517,15 +11517,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -11534,7 +11534,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -11547,17 +11547,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -11577,11 +11577,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11596,18 +11596,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -11617,25 +11617,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -11655,16 +11655,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -11673,7 +11673,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -11686,17 +11686,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11705,11 +11705,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11733,11 +11733,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11752,18 +11752,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -11773,25 +11773,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -11814,11 +11814,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11827,11 +11827,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11843,11 +11843,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11856,11 +11856,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11869,11 +11869,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -11882,11 +11882,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -11913,18 +11913,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -11954,18 +11954,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -11979,21 +11979,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -12002,7 +12002,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -12015,17 +12015,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12034,11 +12034,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12057,18 +12057,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -12091,11 +12091,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12104,11 +12104,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12117,7 +12117,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -12131,11 +12131,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12150,18 +12150,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -12182,7 +12182,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -12196,11 +12196,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12215,7 +12215,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -12228,7 +12228,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -12267,18 +12267,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -12292,7 +12292,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -12302,11 +12302,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12315,11 +12315,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12331,14 +12331,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12346,11 +12346,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -12363,7 +12363,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -12379,11 +12379,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12410,18 +12410,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -12435,7 +12435,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -12448,14 +12448,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -12463,11 +12463,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -12480,7 +12480,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -12496,11 +12496,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -12524,11 +12524,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -12543,18 +12543,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -12564,25 +12564,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -12596,29 +12596,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -12627,7 +12627,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -12642,10 +12642,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -12654,7 +12654,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -12669,10 +12669,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -12681,7 +12681,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -12696,10 +12696,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -12708,7 +12708,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -12722,10 +12722,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -12734,7 +12734,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -12750,19 +12750,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -12772,35 +12772,35 @@ "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/lib/makerdao/DssProxyActionsBase.sol", "exportedSymbols": { "Common": [ - 4144 + 4196 ], "DaiJoinLike": [ - 4074 + 4126 ], "DssProxyActionsBase": [ - 4711 + 4763 ], "GemJoinLike": [ - 4049 + 4101 ], "GemLike": [ - 3823 + 3875 ], "JugLike": [ - 4082 + 4134 ], "ManagerLike": [ - 3952 + 4004 ], "VatLike": [ - 4024 + 4076 ] }, - "id": 4712, + "id": 4764, "nodeType": "SourceUnit", "nodes": [ { - "id": 3790, + "id": 3842, "literals": [ "solidity", "0.5", @@ -12812,9 +12812,9 @@ { "absolutePath": "/home/kendrick/Development/Ethereum/dedge/packages/smart-contracts/src/interfaces/IERC20.sol", "file": "../../interfaces/IERC20.sol", - "id": 3791, + "id": 3843, "nodeType": "ImportDirective", - "scope": 4712, + "scope": 4764, "sourceUnit": 121, "src": "25:37:22", "symbolAliases": [], @@ -12826,9 +12826,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3823, + "id": 3875, "linearizedBaseContracts": [ - 3823 + 3875 ], "name": "GemLike", "nodeType": "ContractDefinition", @@ -12836,22 +12836,22 @@ { "body": null, "documentation": null, - "id": 3798, + "id": 3850, "implemented": false, "kind": "function", "modifiers": [], "name": "approve", "nodeType": "FunctionDefinition", "parameters": { - "id": 3796, + "id": 3848, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3793, + "id": 3845, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "105:7:22", "stateVariable": false, "storageLocation": "default", @@ -12860,7 +12860,7 @@ "typeString": "address" }, "typeName": { - "id": 3792, + "id": 3844, "name": "address", "nodeType": "ElementaryTypeName", "src": "105:7:22", @@ -12875,10 +12875,10 @@ }, { "constant": false, - "id": 3795, + "id": 3847, "name": "", "nodeType": "VariableDeclaration", - "scope": 3798, + "scope": 3850, "src": "114:4:22", "stateVariable": false, "storageLocation": "default", @@ -12887,7 +12887,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3794, + "id": 3846, "name": "uint", "nodeType": "ElementaryTypeName", "src": "114:4:22", @@ -12903,12 +12903,12 @@ "src": "104:15:22" }, "returnParameters": { - "id": 3797, + "id": 3849, "nodeType": "ParameterList", "parameters": [], "src": "126:0:22" }, - "scope": 3823, + "scope": 3875, "src": "88:39:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12917,22 +12917,22 @@ { "body": null, "documentation": null, - "id": 3805, + "id": 3857, "implemented": false, "kind": "function", "modifiers": [], "name": "transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 3803, + "id": 3855, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3800, + "id": 3852, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "150:7:22", "stateVariable": false, "storageLocation": "default", @@ -12941,7 +12941,7 @@ "typeString": "address" }, "typeName": { - "id": 3799, + "id": 3851, "name": "address", "nodeType": "ElementaryTypeName", "src": "150:7:22", @@ -12956,10 +12956,10 @@ }, { "constant": false, - "id": 3802, + "id": 3854, "name": "", "nodeType": "VariableDeclaration", - "scope": 3805, + "scope": 3857, "src": "159:4:22", "stateVariable": false, "storageLocation": "default", @@ -12968,7 +12968,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3801, + "id": 3853, "name": "uint", "nodeType": "ElementaryTypeName", "src": "159:4:22", @@ -12984,12 +12984,12 @@ "src": "149:15:22" }, "returnParameters": { - "id": 3804, + "id": 3856, "nodeType": "ParameterList", "parameters": [], "src": "171:0:22" }, - "scope": 3823, + "scope": 3875, "src": "132:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -12998,22 +12998,22 @@ { "body": null, "documentation": null, - "id": 3814, + "id": 3866, "implemented": false, "kind": "function", "modifiers": [], "name": "transferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 3812, + "id": 3864, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3807, + "id": 3859, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "199:7:22", "stateVariable": false, "storageLocation": "default", @@ -13022,7 +13022,7 @@ "typeString": "address" }, "typeName": { - "id": 3806, + "id": 3858, "name": "address", "nodeType": "ElementaryTypeName", "src": "199:7:22", @@ -13037,10 +13037,10 @@ }, { "constant": false, - "id": 3809, + "id": 3861, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "208:7:22", "stateVariable": false, "storageLocation": "default", @@ -13049,7 +13049,7 @@ "typeString": "address" }, "typeName": { - "id": 3808, + "id": 3860, "name": "address", "nodeType": "ElementaryTypeName", "src": "208:7:22", @@ -13064,10 +13064,10 @@ }, { "constant": false, - "id": 3811, + "id": 3863, "name": "", "nodeType": "VariableDeclaration", - "scope": 3814, + "scope": 3866, "src": "217:4:22", "stateVariable": false, "storageLocation": "default", @@ -13076,7 +13076,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3810, + "id": 3862, "name": "uint", "nodeType": "ElementaryTypeName", "src": "217:4:22", @@ -13092,12 +13092,12 @@ "src": "198:24:22" }, "returnParameters": { - "id": 3813, + "id": 3865, "nodeType": "ParameterList", "parameters": [], "src": "229:0:22" }, - "scope": 3823, + "scope": 3875, "src": "177:53:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13106,25 +13106,25 @@ { "body": null, "documentation": null, - "id": 3817, + "id": 3869, "implemented": false, "kind": "function", "modifiers": [], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3815, + "id": 3867, "nodeType": "ParameterList", "parameters": [], "src": "251:2:22" }, "returnParameters": { - "id": 3816, + "id": 3868, "nodeType": "ParameterList", "parameters": [], "src": "268:0:22" }, - "scope": 3823, + "scope": 3875, "src": "235:34:22", "stateMutability": "payable", "superFunction": null, @@ -13133,22 +13133,22 @@ { "body": null, "documentation": null, - "id": 3822, + "id": 3874, "implemented": false, "kind": "function", "modifiers": [], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 3820, + "id": 3872, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3819, + "id": 3871, "name": "", "nodeType": "VariableDeclaration", - "scope": 3822, + "scope": 3874, "src": "292:4:22", "stateVariable": false, "storageLocation": "default", @@ -13157,7 +13157,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3818, + "id": 3870, "name": "uint", "nodeType": "ElementaryTypeName", "src": "292:4:22", @@ -13173,19 +13173,19 @@ "src": "291:6:22" }, "returnParameters": { - "id": 3821, + "id": 3873, "nodeType": "ParameterList", "parameters": [], "src": "304:0:22" }, - "scope": 3823, + "scope": 3875, "src": "274:31:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "65:242:22" }, { @@ -13194,9 +13194,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 3952, + "id": 4004, "linearizedBaseContracts": [ - 3952 + 4004 ], "name": "ManagerLike", "nodeType": "ContractDefinition", @@ -13204,22 +13204,22 @@ { "body": null, "documentation": null, - "id": 3834, + "id": 3886, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpCan", "nodeType": "FunctionDefinition", "parameters": { - "id": 3830, + "id": 3882, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3825, + "id": 3877, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "352:7:22", "stateVariable": false, "storageLocation": "default", @@ -13228,7 +13228,7 @@ "typeString": "address" }, "typeName": { - "id": 3824, + "id": 3876, "name": "address", "nodeType": "ElementaryTypeName", "src": "352:7:22", @@ -13243,10 +13243,10 @@ }, { "constant": false, - "id": 3827, + "id": 3879, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "361:4:22", "stateVariable": false, "storageLocation": "default", @@ -13255,7 +13255,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3826, + "id": 3878, "name": "uint", "nodeType": "ElementaryTypeName", "src": "361:4:22", @@ -13269,10 +13269,10 @@ }, { "constant": false, - "id": 3829, + "id": 3881, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "367:7:22", "stateVariable": false, "storageLocation": "default", @@ -13281,7 +13281,7 @@ "typeString": "address" }, "typeName": { - "id": 3828, + "id": 3880, "name": "address", "nodeType": "ElementaryTypeName", "src": "367:7:22", @@ -13298,15 +13298,15 @@ "src": "351:24:22" }, "returnParameters": { - "id": 3833, + "id": 3885, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3832, + "id": 3884, "name": "", "nodeType": "VariableDeclaration", - "scope": 3834, + "scope": 3886, "src": "397:4:22", "stateVariable": false, "storageLocation": "default", @@ -13315,7 +13315,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3831, + "id": 3883, "name": "uint", "nodeType": "ElementaryTypeName", "src": "397:4:22", @@ -13330,7 +13330,7 @@ ], "src": "396:6:22" }, - "scope": 3952, + "scope": 4004, "src": "336:67:22", "stateMutability": "view", "superFunction": null, @@ -13339,22 +13339,22 @@ { "body": null, "documentation": null, - "id": 3841, + "id": 3893, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3837, + "id": 3889, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3836, + "id": 3888, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "422:4:22", "stateVariable": false, "storageLocation": "default", @@ -13363,7 +13363,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3835, + "id": 3887, "name": "uint", "nodeType": "ElementaryTypeName", "src": "422:4:22", @@ -13379,15 +13379,15 @@ "src": "421:6:22" }, "returnParameters": { - "id": 3840, + "id": 3892, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3839, + "id": 3891, "name": "", "nodeType": "VariableDeclaration", - "scope": 3841, + "scope": 3893, "src": "449:7:22", "stateVariable": false, "storageLocation": "default", @@ -13396,7 +13396,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3838, + "id": 3890, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "449:7:22", @@ -13411,7 +13411,7 @@ ], "src": "448:9:22" }, - "scope": 3952, + "scope": 4004, "src": "408:50:22", "stateMutability": "view", "superFunction": null, @@ -13420,22 +13420,22 @@ { "body": null, "documentation": null, - "id": 3848, + "id": 3900, "implemented": false, "kind": "function", "modifiers": [], "name": "owns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3844, + "id": 3896, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3843, + "id": 3895, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "477:4:22", "stateVariable": false, "storageLocation": "default", @@ -13444,7 +13444,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3842, + "id": 3894, "name": "uint", "nodeType": "ElementaryTypeName", "src": "477:4:22", @@ -13460,15 +13460,15 @@ "src": "476:6:22" }, "returnParameters": { - "id": 3847, + "id": 3899, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3846, + "id": 3898, "name": "", "nodeType": "VariableDeclaration", - "scope": 3848, + "scope": 3900, "src": "504:7:22", "stateVariable": false, "storageLocation": "default", @@ -13477,7 +13477,7 @@ "typeString": "address" }, "typeName": { - "id": 3845, + "id": 3897, "name": "address", "nodeType": "ElementaryTypeName", "src": "504:7:22", @@ -13493,7 +13493,7 @@ ], "src": "503:9:22" }, - "scope": 3952, + "scope": 4004, "src": "463:50:22", "stateMutability": "view", "superFunction": null, @@ -13502,22 +13502,22 @@ { "body": null, "documentation": null, - "id": 3855, + "id": 3907, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3851, + "id": 3903, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3850, + "id": 3902, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "532:4:22", "stateVariable": false, "storageLocation": "default", @@ -13526,7 +13526,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3849, + "id": 3901, "name": "uint", "nodeType": "ElementaryTypeName", "src": "532:4:22", @@ -13542,15 +13542,15 @@ "src": "531:6:22" }, "returnParameters": { - "id": 3854, + "id": 3906, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3853, + "id": 3905, "name": "", "nodeType": "VariableDeclaration", - "scope": 3855, + "scope": 3907, "src": "559:7:22", "stateVariable": false, "storageLocation": "default", @@ -13559,7 +13559,7 @@ "typeString": "address" }, "typeName": { - "id": 3852, + "id": 3904, "name": "address", "nodeType": "ElementaryTypeName", "src": "559:7:22", @@ -13575,7 +13575,7 @@ ], "src": "558:9:22" }, - "scope": 3952, + "scope": 4004, "src": "518:50:22", "stateMutability": "view", "superFunction": null, @@ -13584,28 +13584,28 @@ { "body": null, "documentation": null, - "id": 3860, + "id": 3912, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 3856, + "id": 3908, "nodeType": "ParameterList", "parameters": [], "src": "585:2:22" }, "returnParameters": { - "id": 3859, + "id": 3911, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3858, + "id": 3910, "name": "", "nodeType": "VariableDeclaration", - "scope": 3860, + "scope": 3912, "src": "609:7:22", "stateVariable": false, "storageLocation": "default", @@ -13614,7 +13614,7 @@ "typeString": "address" }, "typeName": { - "id": 3857, + "id": 3909, "name": "address", "nodeType": "ElementaryTypeName", "src": "609:7:22", @@ -13630,7 +13630,7 @@ ], "src": "608:9:22" }, - "scope": 3952, + "scope": 4004, "src": "573:45:22", "stateMutability": "view", "superFunction": null, @@ -13639,22 +13639,22 @@ { "body": null, "documentation": null, - "id": 3869, + "id": 3921, "implemented": false, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 3865, + "id": 3917, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3862, + "id": 3914, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "637:7:22", "stateVariable": false, "storageLocation": "default", @@ -13663,7 +13663,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3861, + "id": 3913, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "637:7:22", @@ -13677,10 +13677,10 @@ }, { "constant": false, - "id": 3864, + "id": 3916, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "646:7:22", "stateVariable": false, "storageLocation": "default", @@ -13689,7 +13689,7 @@ "typeString": "address" }, "typeName": { - "id": 3863, + "id": 3915, "name": "address", "nodeType": "ElementaryTypeName", "src": "646:7:22", @@ -13706,15 +13706,15 @@ "src": "636:18:22" }, "returnParameters": { - "id": 3868, + "id": 3920, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3867, + "id": 3919, "name": "", "nodeType": "VariableDeclaration", - "scope": 3869, + "scope": 3921, "src": "671:4:22", "stateVariable": false, "storageLocation": "default", @@ -13723,7 +13723,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3866, + "id": 3918, "name": "uint", "nodeType": "ElementaryTypeName", "src": "671:4:22", @@ -13738,7 +13738,7 @@ ], "src": "670:6:22" }, - "scope": 3952, + "scope": 4004, "src": "623:54:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13747,22 +13747,22 @@ { "body": null, "documentation": null, - "id": 3876, + "id": 3928, "implemented": false, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 3874, + "id": 3926, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3871, + "id": 3923, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "696:4:22", "stateVariable": false, "storageLocation": "default", @@ -13771,7 +13771,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3870, + "id": 3922, "name": "uint", "nodeType": "ElementaryTypeName", "src": "696:4:22", @@ -13785,10 +13785,10 @@ }, { "constant": false, - "id": 3873, + "id": 3925, "name": "", "nodeType": "VariableDeclaration", - "scope": 3876, + "scope": 3928, "src": "702:7:22", "stateVariable": false, "storageLocation": "default", @@ -13797,7 +13797,7 @@ "typeString": "address" }, "typeName": { - "id": 3872, + "id": 3924, "name": "address", "nodeType": "ElementaryTypeName", "src": "702:7:22", @@ -13814,12 +13814,12 @@ "src": "695:15:22" }, "returnParameters": { - "id": 3875, + "id": 3927, "nodeType": "ParameterList", "parameters": [], "src": "717:0:22" }, - "scope": 3952, + "scope": 4004, "src": "682:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13828,22 +13828,22 @@ { "body": null, "documentation": null, - "id": 3885, + "id": 3937, "implemented": false, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3883, + "id": 3935, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3878, + "id": 3930, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "741:4:22", "stateVariable": false, "storageLocation": "default", @@ -13852,7 +13852,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3877, + "id": 3929, "name": "uint", "nodeType": "ElementaryTypeName", "src": "741:4:22", @@ -13866,10 +13866,10 @@ }, { "constant": false, - "id": 3880, + "id": 3932, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "747:7:22", "stateVariable": false, "storageLocation": "default", @@ -13878,7 +13878,7 @@ "typeString": "address" }, "typeName": { - "id": 3879, + "id": 3931, "name": "address", "nodeType": "ElementaryTypeName", "src": "747:7:22", @@ -13893,10 +13893,10 @@ }, { "constant": false, - "id": 3882, + "id": 3934, "name": "", "nodeType": "VariableDeclaration", - "scope": 3885, + "scope": 3937, "src": "756:4:22", "stateVariable": false, "storageLocation": "default", @@ -13905,7 +13905,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3881, + "id": 3933, "name": "uint", "nodeType": "ElementaryTypeName", "src": "756:4:22", @@ -13921,12 +13921,12 @@ "src": "740:21:22" }, "returnParameters": { - "id": 3884, + "id": 3936, "nodeType": "ParameterList", "parameters": [], "src": "768:0:22" }, - "scope": 3952, + "scope": 4004, "src": "723:46:22", "stateMutability": "nonpayable", "superFunction": null, @@ -13935,22 +13935,22 @@ { "body": null, "documentation": null, - "id": 3892, + "id": 3944, "implemented": false, "kind": "function", "modifiers": [], "name": "urnAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 3890, + "id": 3942, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3887, + "id": 3939, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "792:7:22", "stateVariable": false, "storageLocation": "default", @@ -13959,7 +13959,7 @@ "typeString": "address" }, "typeName": { - "id": 3886, + "id": 3938, "name": "address", "nodeType": "ElementaryTypeName", "src": "792:7:22", @@ -13974,10 +13974,10 @@ }, { "constant": false, - "id": 3889, + "id": 3941, "name": "", "nodeType": "VariableDeclaration", - "scope": 3892, + "scope": 3944, "src": "801:4:22", "stateVariable": false, "storageLocation": "default", @@ -13986,7 +13986,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3888, + "id": 3940, "name": "uint", "nodeType": "ElementaryTypeName", "src": "801:4:22", @@ -14002,12 +14002,12 @@ "src": "791:15:22" }, "returnParameters": { - "id": 3891, + "id": 3943, "nodeType": "ParameterList", "parameters": [], "src": "813:0:22" }, - "scope": 3952, + "scope": 4004, "src": "774:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14016,22 +14016,22 @@ { "body": null, "documentation": null, - "id": 3901, + "id": 3953, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 3899, + "id": 3951, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3894, + "id": 3946, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "833:4:22", "stateVariable": false, "storageLocation": "default", @@ -14040,7 +14040,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3893, + "id": 3945, "name": "uint", "nodeType": "ElementaryTypeName", "src": "833:4:22", @@ -14054,10 +14054,10 @@ }, { "constant": false, - "id": 3896, + "id": 3948, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "839:3:22", "stateVariable": false, "storageLocation": "default", @@ -14066,7 +14066,7 @@ "typeString": "int256" }, "typeName": { - "id": 3895, + "id": 3947, "name": "int", "nodeType": "ElementaryTypeName", "src": "839:3:22", @@ -14080,10 +14080,10 @@ }, { "constant": false, - "id": 3898, + "id": 3950, "name": "", "nodeType": "VariableDeclaration", - "scope": 3901, + "scope": 3953, "src": "844:3:22", "stateVariable": false, "storageLocation": "default", @@ -14092,7 +14092,7 @@ "typeString": "int256" }, "typeName": { - "id": 3897, + "id": 3949, "name": "int", "nodeType": "ElementaryTypeName", "src": "844:3:22", @@ -14108,12 +14108,12 @@ "src": "832:16:22" }, "returnParameters": { - "id": 3900, + "id": 3952, "nodeType": "ParameterList", "parameters": [], "src": "855:0:22" }, - "scope": 3952, + "scope": 4004, "src": "819:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14122,22 +14122,22 @@ { "body": null, "documentation": null, - "id": 3910, + "id": 3962, "implemented": false, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 3908, + "id": 3960, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3903, + "id": 3955, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "875:4:22", "stateVariable": false, "storageLocation": "default", @@ -14146,7 +14146,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3902, + "id": 3954, "name": "uint", "nodeType": "ElementaryTypeName", "src": "875:4:22", @@ -14160,10 +14160,10 @@ }, { "constant": false, - "id": 3905, + "id": 3957, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "881:7:22", "stateVariable": false, "storageLocation": "default", @@ -14172,7 +14172,7 @@ "typeString": "address" }, "typeName": { - "id": 3904, + "id": 3956, "name": "address", "nodeType": "ElementaryTypeName", "src": "881:7:22", @@ -14187,10 +14187,10 @@ }, { "constant": false, - "id": 3907, + "id": 3959, "name": "", "nodeType": "VariableDeclaration", - "scope": 3910, + "scope": 3962, "src": "890:4:22", "stateVariable": false, "storageLocation": "default", @@ -14199,7 +14199,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3906, + "id": 3958, "name": "uint", "nodeType": "ElementaryTypeName", "src": "890:4:22", @@ -14215,12 +14215,12 @@ "src": "874:21:22" }, "returnParameters": { - "id": 3909, + "id": 3961, "nodeType": "ParameterList", "parameters": [], "src": "902:0:22" }, - "scope": 3952, + "scope": 4004, "src": "861:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14229,22 +14229,22 @@ { "body": null, "documentation": null, - "id": 3919, + "id": 3971, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 3917, + "id": 3969, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3912, + "id": 3964, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "922:4:22", "stateVariable": false, "storageLocation": "default", @@ -14253,7 +14253,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3911, + "id": 3963, "name": "uint", "nodeType": "ElementaryTypeName", "src": "922:4:22", @@ -14267,10 +14267,10 @@ }, { "constant": false, - "id": 3914, + "id": 3966, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "928:7:22", "stateVariable": false, "storageLocation": "default", @@ -14279,7 +14279,7 @@ "typeString": "address" }, "typeName": { - "id": 3913, + "id": 3965, "name": "address", "nodeType": "ElementaryTypeName", "src": "928:7:22", @@ -14294,10 +14294,10 @@ }, { "constant": false, - "id": 3916, + "id": 3968, "name": "", "nodeType": "VariableDeclaration", - "scope": 3919, + "scope": 3971, "src": "937:4:22", "stateVariable": false, "storageLocation": "default", @@ -14306,7 +14306,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3915, + "id": 3967, "name": "uint", "nodeType": "ElementaryTypeName", "src": "937:4:22", @@ -14322,12 +14322,12 @@ "src": "921:21:22" }, "returnParameters": { - "id": 3918, + "id": 3970, "nodeType": "ParameterList", "parameters": [], "src": "949:0:22" }, - "scope": 3952, + "scope": 4004, "src": "908:42:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14336,22 +14336,22 @@ { "body": null, "documentation": null, - "id": 3930, + "id": 3982, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3928, + "id": 3980, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3921, + "id": 3973, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "969:7:22", "stateVariable": false, "storageLocation": "default", @@ -14360,7 +14360,7 @@ "typeString": "address" }, "typeName": { - "id": 3920, + "id": 3972, "name": "address", "nodeType": "ElementaryTypeName", "src": "969:7:22", @@ -14375,10 +14375,10 @@ }, { "constant": false, - "id": 3923, + "id": 3975, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "978:4:22", "stateVariable": false, "storageLocation": "default", @@ -14387,7 +14387,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3922, + "id": 3974, "name": "uint", "nodeType": "ElementaryTypeName", "src": "978:4:22", @@ -14401,10 +14401,10 @@ }, { "constant": false, - "id": 3925, + "id": 3977, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "984:7:22", "stateVariable": false, "storageLocation": "default", @@ -14413,7 +14413,7 @@ "typeString": "address" }, "typeName": { - "id": 3924, + "id": 3976, "name": "address", "nodeType": "ElementaryTypeName", "src": "984:7:22", @@ -14428,10 +14428,10 @@ }, { "constant": false, - "id": 3927, + "id": 3979, "name": "", "nodeType": "VariableDeclaration", - "scope": 3930, + "scope": 3982, "src": "993:4:22", "stateVariable": false, "storageLocation": "default", @@ -14440,7 +14440,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3926, + "id": 3978, "name": "uint", "nodeType": "ElementaryTypeName", "src": "993:4:22", @@ -14456,12 +14456,12 @@ "src": "968:30:22" }, "returnParameters": { - "id": 3929, + "id": 3981, "nodeType": "ParameterList", "parameters": [], "src": "1005:0:22" }, - "scope": 3952, + "scope": 4004, "src": "955:51:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14470,22 +14470,22 @@ { "body": null, "documentation": null, - "id": 3937, + "id": 3989, "implemented": false, "kind": "function", "modifiers": [], "name": "quit", "nodeType": "FunctionDefinition", "parameters": { - "id": 3935, + "id": 3987, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3932, + "id": 3984, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1025:4:22", "stateVariable": false, "storageLocation": "default", @@ -14494,7 +14494,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3931, + "id": 3983, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1025:4:22", @@ -14508,10 +14508,10 @@ }, { "constant": false, - "id": 3934, + "id": 3986, "name": "", "nodeType": "VariableDeclaration", - "scope": 3937, + "scope": 3989, "src": "1031:7:22", "stateVariable": false, "storageLocation": "default", @@ -14520,7 +14520,7 @@ "typeString": "address" }, "typeName": { - "id": 3933, + "id": 3985, "name": "address", "nodeType": "ElementaryTypeName", "src": "1031:7:22", @@ -14537,12 +14537,12 @@ "src": "1024:15:22" }, "returnParameters": { - "id": 3936, + "id": 3988, "nodeType": "ParameterList", "parameters": [], "src": "1046:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1011:36:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14551,22 +14551,22 @@ { "body": null, "documentation": null, - "id": 3944, + "id": 3996, "implemented": false, "kind": "function", "modifiers": [], "name": "enter", "nodeType": "FunctionDefinition", "parameters": { - "id": 3942, + "id": 3994, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3939, + "id": 3991, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1067:7:22", "stateVariable": false, "storageLocation": "default", @@ -14575,7 +14575,7 @@ "typeString": "address" }, "typeName": { - "id": 3938, + "id": 3990, "name": "address", "nodeType": "ElementaryTypeName", "src": "1067:7:22", @@ -14590,10 +14590,10 @@ }, { "constant": false, - "id": 3941, + "id": 3993, "name": "", "nodeType": "VariableDeclaration", - "scope": 3944, + "scope": 3996, "src": "1076:4:22", "stateVariable": false, "storageLocation": "default", @@ -14602,7 +14602,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3940, + "id": 3992, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1076:4:22", @@ -14618,12 +14618,12 @@ "src": "1066:15:22" }, "returnParameters": { - "id": 3943, + "id": 3995, "nodeType": "ParameterList", "parameters": [], "src": "1088:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1052:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -14632,22 +14632,22 @@ { "body": null, "documentation": null, - "id": 3951, + "id": 4003, "implemented": false, "kind": "function", "modifiers": [], "name": "shift", "nodeType": "FunctionDefinition", "parameters": { - "id": 3949, + "id": 4001, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3946, + "id": 3998, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1109:4:22", "stateVariable": false, "storageLocation": "default", @@ -14656,7 +14656,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3945, + "id": 3997, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1109:4:22", @@ -14670,10 +14670,10 @@ }, { "constant": false, - "id": 3948, + "id": 4000, "name": "", "nodeType": "VariableDeclaration", - "scope": 3951, + "scope": 4003, "src": "1115:4:22", "stateVariable": false, "storageLocation": "default", @@ -14682,7 +14682,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3947, + "id": 3999, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1115:4:22", @@ -14698,19 +14698,19 @@ "src": "1108:12:22" }, "returnParameters": { - "id": 3950, + "id": 4002, "nodeType": "ParameterList", "parameters": [], "src": "1127:0:22" }, - "scope": 3952, + "scope": 4004, "src": "1094:34:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "309:821:22" }, { @@ -14719,9 +14719,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4024, + "id": 4076, "linearizedBaseContracts": [ - 4024 + 4076 ], "name": "VatLike", "nodeType": "ContractDefinition", @@ -14729,22 +14729,22 @@ { "body": null, "documentation": null, - "id": 3961, + "id": 4013, "implemented": false, "kind": "function", "modifiers": [], "name": "can", "nodeType": "FunctionDefinition", "parameters": { - "id": 3957, + "id": 4009, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3954, + "id": 4006, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1168:7:22", "stateVariable": false, "storageLocation": "default", @@ -14753,7 +14753,7 @@ "typeString": "address" }, "typeName": { - "id": 3953, + "id": 4005, "name": "address", "nodeType": "ElementaryTypeName", "src": "1168:7:22", @@ -14768,10 +14768,10 @@ }, { "constant": false, - "id": 3956, + "id": 4008, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1177:7:22", "stateVariable": false, "storageLocation": "default", @@ -14780,7 +14780,7 @@ "typeString": "address" }, "typeName": { - "id": 3955, + "id": 4007, "name": "address", "nodeType": "ElementaryTypeName", "src": "1177:7:22", @@ -14797,15 +14797,15 @@ "src": "1167:18:22" }, "returnParameters": { - "id": 3960, + "id": 4012, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3959, + "id": 4011, "name": "", "nodeType": "VariableDeclaration", - "scope": 3961, + "scope": 4013, "src": "1207:4:22", "stateVariable": false, "storageLocation": "default", @@ -14814,7 +14814,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3958, + "id": 4010, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1207:4:22", @@ -14829,7 +14829,7 @@ ], "src": "1206:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1155:58:22", "stateMutability": "view", "superFunction": null, @@ -14838,22 +14838,22 @@ { "body": null, "documentation": null, - "id": 3976, + "id": 4028, "implemented": false, "kind": "function", "modifiers": [], "name": "ilks", "nodeType": "FunctionDefinition", "parameters": { - "id": 3964, + "id": 4016, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3963, + "id": 4015, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1232:7:22", "stateVariable": false, "storageLocation": "default", @@ -14862,7 +14862,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3962, + "id": 4014, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1232:7:22", @@ -14878,15 +14878,15 @@ "src": "1231:9:22" }, "returnParameters": { - "id": 3975, + "id": 4027, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3966, + "id": 4018, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1262:4:22", "stateVariable": false, "storageLocation": "default", @@ -14895,7 +14895,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3965, + "id": 4017, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1262:4:22", @@ -14909,10 +14909,10 @@ }, { "constant": false, - "id": 3968, + "id": 4020, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1268:4:22", "stateVariable": false, "storageLocation": "default", @@ -14921,7 +14921,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3967, + "id": 4019, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1268:4:22", @@ -14935,10 +14935,10 @@ }, { "constant": false, - "id": 3970, + "id": 4022, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1274:4:22", "stateVariable": false, "storageLocation": "default", @@ -14947,7 +14947,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3969, + "id": 4021, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1274:4:22", @@ -14961,10 +14961,10 @@ }, { "constant": false, - "id": 3972, + "id": 4024, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1280:4:22", "stateVariable": false, "storageLocation": "default", @@ -14973,7 +14973,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3971, + "id": 4023, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1280:4:22", @@ -14987,10 +14987,10 @@ }, { "constant": false, - "id": 3974, + "id": 4026, "name": "", "nodeType": "VariableDeclaration", - "scope": 3976, + "scope": 4028, "src": "1286:4:22", "stateVariable": false, "storageLocation": "default", @@ -14999,7 +14999,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3973, + "id": 4025, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1286:4:22", @@ -15014,7 +15014,7 @@ ], "src": "1261:30:22" }, - "scope": 4024, + "scope": 4076, "src": "1218:74:22", "stateMutability": "view", "superFunction": null, @@ -15023,22 +15023,22 @@ { "body": null, "documentation": null, - "id": 3983, + "id": 4035, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 3979, + "id": 4031, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3978, + "id": 4030, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1310:7:22", "stateVariable": false, "storageLocation": "default", @@ -15047,7 +15047,7 @@ "typeString": "address" }, "typeName": { - "id": 3977, + "id": 4029, "name": "address", "nodeType": "ElementaryTypeName", "src": "1310:7:22", @@ -15064,15 +15064,15 @@ "src": "1309:9:22" }, "returnParameters": { - "id": 3982, + "id": 4034, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3981, + "id": 4033, "name": "", "nodeType": "VariableDeclaration", - "scope": 3983, + "scope": 4035, "src": "1340:4:22", "stateVariable": false, "storageLocation": "default", @@ -15081,7 +15081,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3980, + "id": 4032, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1340:4:22", @@ -15096,7 +15096,7 @@ ], "src": "1339:6:22" }, - "scope": 4024, + "scope": 4076, "src": "1297:49:22", "stateMutability": "view", "superFunction": null, @@ -15105,22 +15105,22 @@ { "body": null, "documentation": null, - "id": 3994, + "id": 4046, "implemented": false, "kind": "function", "modifiers": [], "name": "urns", "nodeType": "FunctionDefinition", "parameters": { - "id": 3988, + "id": 4040, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3985, + "id": 4037, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1365:7:22", "stateVariable": false, "storageLocation": "default", @@ -15129,7 +15129,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3984, + "id": 4036, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1365:7:22", @@ -15143,10 +15143,10 @@ }, { "constant": false, - "id": 3987, + "id": 4039, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1374:7:22", "stateVariable": false, "storageLocation": "default", @@ -15155,7 +15155,7 @@ "typeString": "address" }, "typeName": { - "id": 3986, + "id": 4038, "name": "address", "nodeType": "ElementaryTypeName", "src": "1374:7:22", @@ -15172,15 +15172,15 @@ "src": "1364:18:22" }, "returnParameters": { - "id": 3993, + "id": 4045, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3990, + "id": 4042, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1404:4:22", "stateVariable": false, "storageLocation": "default", @@ -15189,7 +15189,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3989, + "id": 4041, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1404:4:22", @@ -15203,10 +15203,10 @@ }, { "constant": false, - "id": 3992, + "id": 4044, "name": "", "nodeType": "VariableDeclaration", - "scope": 3994, + "scope": 4046, "src": "1410:4:22", "stateVariable": false, "storageLocation": "default", @@ -15215,7 +15215,7 @@ "typeString": "uint256" }, "typeName": { - "id": 3991, + "id": 4043, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1410:4:22", @@ -15230,7 +15230,7 @@ ], "src": "1403:12:22" }, - "scope": 4024, + "scope": 4076, "src": "1351:65:22", "stateMutability": "view", "superFunction": null, @@ -15239,22 +15239,22 @@ { "body": null, "documentation": null, - "id": 4009, + "id": 4061, "implemented": false, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4007, + "id": 4059, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 3996, + "id": 4048, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1435:7:22", "stateVariable": false, "storageLocation": "default", @@ -15263,7 +15263,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 3995, + "id": 4047, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "1435:7:22", @@ -15277,10 +15277,10 @@ }, { "constant": false, - "id": 3998, + "id": 4050, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1444:7:22", "stateVariable": false, "storageLocation": "default", @@ -15289,7 +15289,7 @@ "typeString": "address" }, "typeName": { - "id": 3997, + "id": 4049, "name": "address", "nodeType": "ElementaryTypeName", "src": "1444:7:22", @@ -15304,10 +15304,10 @@ }, { "constant": false, - "id": 4000, + "id": 4052, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1453:7:22", "stateVariable": false, "storageLocation": "default", @@ -15316,7 +15316,7 @@ "typeString": "address" }, "typeName": { - "id": 3999, + "id": 4051, "name": "address", "nodeType": "ElementaryTypeName", "src": "1453:7:22", @@ -15331,10 +15331,10 @@ }, { "constant": false, - "id": 4002, + "id": 4054, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1462:7:22", "stateVariable": false, "storageLocation": "default", @@ -15343,7 +15343,7 @@ "typeString": "address" }, "typeName": { - "id": 4001, + "id": 4053, "name": "address", "nodeType": "ElementaryTypeName", "src": "1462:7:22", @@ -15358,10 +15358,10 @@ }, { "constant": false, - "id": 4004, + "id": 4056, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1471:3:22", "stateVariable": false, "storageLocation": "default", @@ -15370,7 +15370,7 @@ "typeString": "int256" }, "typeName": { - "id": 4003, + "id": 4055, "name": "int", "nodeType": "ElementaryTypeName", "src": "1471:3:22", @@ -15384,10 +15384,10 @@ }, { "constant": false, - "id": 4006, + "id": 4058, "name": "", "nodeType": "VariableDeclaration", - "scope": 4009, + "scope": 4061, "src": "1476:3:22", "stateVariable": false, "storageLocation": "default", @@ -15396,7 +15396,7 @@ "typeString": "int256" }, "typeName": { - "id": 4005, + "id": 4057, "name": "int", "nodeType": "ElementaryTypeName", "src": "1476:3:22", @@ -15412,12 +15412,12 @@ "src": "1434:46:22" }, "returnParameters": { - "id": 4008, + "id": 4060, "nodeType": "ParameterList", "parameters": [], "src": "1487:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1421:67:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15426,22 +15426,22 @@ { "body": null, "documentation": null, - "id": 4014, + "id": 4066, "implemented": false, "kind": "function", "modifiers": [], "name": "hope", "nodeType": "FunctionDefinition", "parameters": { - "id": 4012, + "id": 4064, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4011, + "id": 4063, "name": "", "nodeType": "VariableDeclaration", - "scope": 4014, + "scope": 4066, "src": "1507:7:22", "stateVariable": false, "storageLocation": "default", @@ -15450,7 +15450,7 @@ "typeString": "address" }, "typeName": { - "id": 4010, + "id": 4062, "name": "address", "nodeType": "ElementaryTypeName", "src": "1507:7:22", @@ -15467,12 +15467,12 @@ "src": "1506:9:22" }, "returnParameters": { - "id": 4013, + "id": 4065, "nodeType": "ParameterList", "parameters": [], "src": "1522:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1493:30:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15481,22 +15481,22 @@ { "body": null, "documentation": null, - "id": 4023, + "id": 4075, "implemented": false, "kind": "function", "modifiers": [], "name": "move", "nodeType": "FunctionDefinition", "parameters": { - "id": 4021, + "id": 4073, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4016, + "id": 4068, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1542:7:22", "stateVariable": false, "storageLocation": "default", @@ -15505,7 +15505,7 @@ "typeString": "address" }, "typeName": { - "id": 4015, + "id": 4067, "name": "address", "nodeType": "ElementaryTypeName", "src": "1542:7:22", @@ -15520,10 +15520,10 @@ }, { "constant": false, - "id": 4018, + "id": 4070, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1551:7:22", "stateVariable": false, "storageLocation": "default", @@ -15532,7 +15532,7 @@ "typeString": "address" }, "typeName": { - "id": 4017, + "id": 4069, "name": "address", "nodeType": "ElementaryTypeName", "src": "1551:7:22", @@ -15547,10 +15547,10 @@ }, { "constant": false, - "id": 4020, + "id": 4072, "name": "", "nodeType": "VariableDeclaration", - "scope": 4023, + "scope": 4075, "src": "1560:4:22", "stateVariable": false, "storageLocation": "default", @@ -15559,7 +15559,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4019, + "id": 4071, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1560:4:22", @@ -15575,19 +15575,19 @@ "src": "1541:24:22" }, "returnParameters": { - "id": 4022, + "id": 4074, "nodeType": "ParameterList", "parameters": [], "src": "1572:0:22" }, - "scope": 4024, + "scope": 4076, "src": "1528:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1132:443:22" }, { @@ -15596,9 +15596,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4049, + "id": 4101, "linearizedBaseContracts": [ - 4049 + 4101 ], "name": "GemJoinLike", "nodeType": "ContractDefinition", @@ -15606,28 +15606,28 @@ { "body": null, "documentation": null, - "id": 4029, + "id": 4081, "implemented": false, "kind": "function", "modifiers": [], "name": "dec", "nodeType": "FunctionDefinition", "parameters": { - "id": 4025, + "id": 4077, "nodeType": "ParameterList", "parameters": [], "src": "1616:2:22" }, "returnParameters": { - "id": 4028, + "id": 4080, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4027, + "id": 4079, "name": "", "nodeType": "VariableDeclaration", - "scope": 4029, + "scope": 4081, "src": "1635:4:22", "stateVariable": false, "storageLocation": "default", @@ -15636,7 +15636,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4026, + "id": 4078, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1635:4:22", @@ -15651,7 +15651,7 @@ ], "src": "1634:6:22" }, - "scope": 4049, + "scope": 4101, "src": "1604:37:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15660,44 +15660,44 @@ { "body": null, "documentation": null, - "id": 4034, + "id": 4086, "implemented": false, "kind": "function", "modifiers": [], "name": "gem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4030, + "id": 4082, "nodeType": "ParameterList", "parameters": [], "src": "1658:2:22" }, "returnParameters": { - "id": 4033, + "id": 4085, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4032, + "id": 4084, "name": "", "nodeType": "VariableDeclaration", - "scope": 4034, + "scope": 4086, "src": "1677:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4031, + "id": 4083, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1677:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15707,7 +15707,7 @@ ], "src": "1676:9:22" }, - "scope": 4049, + "scope": 4101, "src": "1646:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15716,22 +15716,22 @@ { "body": null, "documentation": null, - "id": 4041, + "id": 4093, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4039, + "id": 4091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4036, + "id": 4088, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1705:7:22", "stateVariable": false, "storageLocation": "default", @@ -15740,7 +15740,7 @@ "typeString": "address" }, "typeName": { - "id": 4035, + "id": 4087, "name": "address", "nodeType": "ElementaryTypeName", "src": "1705:7:22", @@ -15755,10 +15755,10 @@ }, { "constant": false, - "id": 4038, + "id": 4090, "name": "", "nodeType": "VariableDeclaration", - "scope": 4041, + "scope": 4093, "src": "1714:4:22", "stateVariable": false, "storageLocation": "default", @@ -15767,7 +15767,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4037, + "id": 4089, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1714:4:22", @@ -15783,12 +15783,12 @@ "src": "1704:15:22" }, "returnParameters": { - "id": 4040, + "id": 4092, "nodeType": "ParameterList", "parameters": [], "src": "1734:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1691:44:22", "stateMutability": "payable", "superFunction": null, @@ -15797,22 +15797,22 @@ { "body": null, "documentation": null, - "id": 4048, + "id": 4100, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4046, + "id": 4098, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4043, + "id": 4095, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1754:7:22", "stateVariable": false, "storageLocation": "default", @@ -15821,7 +15821,7 @@ "typeString": "address" }, "typeName": { - "id": 4042, + "id": 4094, "name": "address", "nodeType": "ElementaryTypeName", "src": "1754:7:22", @@ -15836,10 +15836,10 @@ }, { "constant": false, - "id": 4045, + "id": 4097, "name": "", "nodeType": "VariableDeclaration", - "scope": 4048, + "scope": 4100, "src": "1763:4:22", "stateVariable": false, "storageLocation": "default", @@ -15848,7 +15848,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4044, + "id": 4096, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1763:4:22", @@ -15864,19 +15864,19 @@ "src": "1753:15:22" }, "returnParameters": { - "id": 4047, + "id": 4099, "nodeType": "ParameterList", "parameters": [], "src": "1775:0:22" }, - "scope": 4049, + "scope": 4101, "src": "1740:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1577:201:22" }, { @@ -15885,9 +15885,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4074, + "id": 4126, "linearizedBaseContracts": [ - 4074 + 4126 ], "name": "DaiJoinLike", "nodeType": "ContractDefinition", @@ -15895,44 +15895,44 @@ { "body": null, "documentation": null, - "id": 4054, + "id": 4106, "implemented": false, "kind": "function", "modifiers": [], "name": "vat", "nodeType": "FunctionDefinition", "parameters": { - "id": 4050, + "id": 4102, "nodeType": "ParameterList", "parameters": [], "src": "1819:2:22" }, "returnParameters": { - "id": 4053, + "id": 4105, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4052, + "id": 4104, "name": "", "nodeType": "VariableDeclaration", - "scope": 4054, + "scope": 4106, "src": "1838:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" }, "typeName": { "contractScope": null, - "id": 4051, + "id": 4103, "name": "VatLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "1838:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, @@ -15942,7 +15942,7 @@ ], "src": "1837:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1807:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -15951,44 +15951,44 @@ { "body": null, "documentation": null, - "id": 4059, + "id": 4111, "implemented": false, "kind": "function", "modifiers": [], "name": "dai", "nodeType": "FunctionDefinition", "parameters": { - "id": 4055, + "id": 4107, "nodeType": "ParameterList", "parameters": [], "src": "1864:2:22" }, "returnParameters": { - "id": 4058, + "id": 4110, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4057, + "id": 4109, "name": "", "nodeType": "VariableDeclaration", - "scope": 4059, + "scope": 4111, "src": "1883:7:22", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" }, "typeName": { "contractScope": null, - "id": 4056, + "id": 4108, "name": "GemLike", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 3823, + "referencedDeclaration": 3875, "src": "1883:7:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, @@ -15998,7 +15998,7 @@ ], "src": "1882:9:22" }, - "scope": 4074, + "scope": 4126, "src": "1852:40:22", "stateMutability": "nonpayable", "superFunction": null, @@ -16007,22 +16007,22 @@ { "body": null, "documentation": null, - "id": 4066, + "id": 4118, "implemented": false, "kind": "function", "modifiers": [], "name": "join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4064, + "id": 4116, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4061, + "id": 4113, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1911:7:22", "stateVariable": false, "storageLocation": "default", @@ -16031,7 +16031,7 @@ "typeString": "address" }, "typeName": { - "id": 4060, + "id": 4112, "name": "address", "nodeType": "ElementaryTypeName", "src": "1911:7:22", @@ -16046,10 +16046,10 @@ }, { "constant": false, - "id": 4063, + "id": 4115, "name": "", "nodeType": "VariableDeclaration", - "scope": 4066, + "scope": 4118, "src": "1920:4:22", "stateVariable": false, "storageLocation": "default", @@ -16058,7 +16058,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4062, + "id": 4114, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1920:4:22", @@ -16074,12 +16074,12 @@ "src": "1910:15:22" }, "returnParameters": { - "id": 4065, + "id": 4117, "nodeType": "ParameterList", "parameters": [], "src": "1940:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1897:44:22", "stateMutability": "payable", "superFunction": null, @@ -16088,22 +16088,22 @@ { "body": null, "documentation": null, - "id": 4073, + "id": 4125, "implemented": false, "kind": "function", "modifiers": [], "name": "exit", "nodeType": "FunctionDefinition", "parameters": { - "id": 4071, + "id": 4123, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4068, + "id": 4120, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1960:7:22", "stateVariable": false, "storageLocation": "default", @@ -16112,7 +16112,7 @@ "typeString": "address" }, "typeName": { - "id": 4067, + "id": 4119, "name": "address", "nodeType": "ElementaryTypeName", "src": "1960:7:22", @@ -16127,10 +16127,10 @@ }, { "constant": false, - "id": 4070, + "id": 4122, "name": "", "nodeType": "VariableDeclaration", - "scope": 4073, + "scope": 4125, "src": "1969:4:22", "stateVariable": false, "storageLocation": "default", @@ -16139,7 +16139,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4069, + "id": 4121, "name": "uint", "nodeType": "ElementaryTypeName", "src": "1969:4:22", @@ -16155,19 +16155,19 @@ "src": "1959:15:22" }, "returnParameters": { - "id": 4072, + "id": 4124, "nodeType": "ParameterList", "parameters": [], "src": "1981:0:22" }, - "scope": 4074, + "scope": 4126, "src": "1946:36:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1780:204:22" }, { @@ -16176,9 +16176,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 4082, + "id": 4134, "linearizedBaseContracts": [ - 4082 + 4134 ], "name": "JugLike", "nodeType": "ContractDefinition", @@ -16186,22 +16186,22 @@ { "body": null, "documentation": null, - "id": 4081, + "id": 4133, "implemented": false, "kind": "function", "modifiers": [], "name": "drip", "nodeType": "FunctionDefinition", "parameters": { - "id": 4077, + "id": 4129, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4076, + "id": 4128, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2023:7:22", "stateVariable": false, "storageLocation": "default", @@ -16210,7 +16210,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4075, + "id": 4127, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "2023:7:22", @@ -16226,15 +16226,15 @@ "src": "2022:9:22" }, "returnParameters": { - "id": 4080, + "id": 4132, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4079, + "id": 4131, "name": "", "nodeType": "VariableDeclaration", - "scope": 4081, + "scope": 4133, "src": "2048:4:22", "stateVariable": false, "storageLocation": "default", @@ -16243,7 +16243,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4078, + "id": 4130, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2048:4:22", @@ -16258,14 +16258,14 @@ ], "src": "2047:6:22" }, - "scope": 4082, + "scope": 4134, "src": "2009:45:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "1986:70:22" }, { @@ -16274,19 +16274,19 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4144, + "id": 4196, "linearizedBaseContracts": [ - 4144 + 4196 ], "name": "Common", "nodeType": "ContractDefinition", "nodes": [ { "constant": true, - "id": 4087, + "id": 4139, "name": "RAY", "nodeType": "VariableDeclaration", - "scope": 4144, + "scope": 4196, "src": "2435:31:22", "stateVariable": true, "storageLocation": "default", @@ -16295,7 +16295,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4083, + "id": 4135, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "2435:7:22", @@ -16310,7 +16310,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4086, + "id": 4138, "isConstant": false, "isLValue": false, "isPure": true, @@ -16318,7 +16318,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4084, + "id": 4136, "isConstant": false, "isLValue": false, "isPure": true, @@ -16338,7 +16338,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4085, + "id": 4137, "isConstant": false, "isLValue": false, "isPure": true, @@ -16363,7 +16363,7 @@ }, { "body": { - "id": 4114, + "id": 4166, "nodeType": "Block", "src": "2560:72:22", "statements": [ @@ -16377,7 +16377,7 @@ "typeIdentifier": "t_bool", "typeString": "bool" }, - "id": 4110, + "id": 4162, "isConstant": false, "isLValue": false, "isPure": false, @@ -16388,18 +16388,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4099, + "id": 4151, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4097, + "id": 4149, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2578:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16411,7 +16411,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4098, + "id": 4150, "isConstant": false, "isLValue": false, "isPure": true, @@ -16440,7 +16440,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4109, + "id": 4161, "isConstant": false, "isLValue": false, "isPure": false, @@ -16451,7 +16451,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4107, + "id": 4159, "isConstant": false, "isLValue": false, "isPure": false, @@ -16461,18 +16461,18 @@ "components": [ { "argumentTypes": null, - "id": 4104, + "id": 4156, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4100, + "id": 4152, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4094, + "referencedDeclaration": 4146, "src": "2589:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16487,18 +16487,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4103, + "id": 4155, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4101, + "id": 4153, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2593:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16509,11 +16509,11 @@ "operator": "*", "rightExpression": { "argumentTypes": null, - "id": 4102, + "id": 4154, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2597:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16533,7 +16533,7 @@ } } ], - "id": 4105, + "id": 4157, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -16550,11 +16550,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4106, + "id": 4158, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4091, + "referencedDeclaration": 4143, "src": "2602:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16571,11 +16571,11 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 4108, + "id": 4160, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4089, + "referencedDeclaration": 4141, "src": "2607:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16597,7 +16597,7 @@ { "argumentTypes": null, "hexValue": "6d756c2d6f766572666c6f77", - "id": 4111, + "id": 4163, "isConstant": false, "isLValue": false, "isPure": true, @@ -16624,21 +16624,21 @@ "typeString": "literal_string \"mul-overflow\"" } ], - "id": 4096, + "id": 4148, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "2570:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4112, + "id": 4164, "isConstant": false, "isLValue": false, "isPure": false, @@ -16652,29 +16652,29 @@ "typeString": "tuple()" } }, - "id": 4113, + "id": 4165, "nodeType": "ExpressionStatement", "src": "2570:55:22" } ] }, "documentation": null, - "id": 4115, + "id": 4167, "implemented": true, "kind": "function", "modifiers": [], "name": "mul", "nodeType": "FunctionDefinition", "parameters": { - "id": 4092, + "id": 4144, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4089, + "id": 4141, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2513:6:22", "stateVariable": false, "storageLocation": "default", @@ -16683,7 +16683,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4088, + "id": 4140, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2513:4:22", @@ -16697,10 +16697,10 @@ }, { "constant": false, - "id": 4091, + "id": 4143, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2521:6:22", "stateVariable": false, "storageLocation": "default", @@ -16709,7 +16709,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4090, + "id": 4142, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2521:4:22", @@ -16725,15 +16725,15 @@ "src": "2512:16:22" }, "returnParameters": { - "id": 4095, + "id": 4147, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4094, + "id": 4146, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4115, + "scope": 4167, "src": "2552:6:22", "stateVariable": false, "storageLocation": "default", @@ -16742,7 +16742,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4093, + "id": 4145, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2552:4:22", @@ -16757,7 +16757,7 @@ ], "src": "2551:8:22" }, - "scope": 4144, + "scope": 4196, "src": "2500:132:22", "stateMutability": "pure", "superFunction": null, @@ -16765,7 +16765,7 @@ }, { "body": { - "id": 4142, + "id": 4194, "nodeType": "Block", "src": "2758:314:22", "statements": [ @@ -16775,11 +16775,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4130, + "id": 4182, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2981:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16788,11 +16788,11 @@ }, { "argumentTypes": null, - "id": 4131, + "id": 4183, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "2986:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16821,11 +16821,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4125, + "id": 4177, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "2962:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16840,18 +16840,18 @@ "typeString": "address" } ], - "id": 4124, + "id": 4176, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "2950:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4126, + "id": 4178, "isConstant": false, "isLValue": false, "isPure": false, @@ -16861,25 +16861,25 @@ "nodeType": "FunctionCall", "src": "2950:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4127, + "id": 4179, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 4059, + "referencedDeclaration": 4111, "src": "2950:20:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4128, + "id": 4180, "isConstant": false, "isLValue": false, "isPure": false, @@ -16889,25 +16889,25 @@ "nodeType": "FunctionCall", "src": "2950:22:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4129, + "id": 4181, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "approve", "nodeType": "MemberAccess", - "referencedDeclaration": 3798, + "referencedDeclaration": 3850, "src": "2950:30:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4132, + "id": 4184, "isConstant": false, "isLValue": false, "isPure": false, @@ -16921,7 +16921,7 @@ "typeString": "tuple()" } }, - "id": 4133, + "id": 4185, "nodeType": "ExpressionStatement", "src": "2950:40:22" }, @@ -16931,11 +16931,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4138, + "id": 4190, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4119, + "referencedDeclaration": 4171, "src": "3056:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16944,11 +16944,11 @@ }, { "argumentTypes": null, - "id": 4139, + "id": 4191, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4121, + "referencedDeclaration": 4173, "src": "3061:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -16972,11 +16972,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4135, + "id": 4187, "name": "apt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4117, + "referencedDeclaration": 4169, "src": "3046:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -16991,18 +16991,18 @@ "typeString": "address" } ], - "id": 4134, + "id": 4186, "name": "DaiJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4074, + "referencedDeclaration": 4126, "src": "3034:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4074_$", + "typeIdentifier": "t_type$_t_contract$_DaiJoinLike_$4126_$", "typeString": "type(contract DaiJoinLike)" } }, - "id": 4136, + "id": 4188, "isConstant": false, "isLValue": false, "isPure": false, @@ -17012,25 +17012,25 @@ "nodeType": "FunctionCall", "src": "3034:16:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DaiJoinLike_$4074", + "typeIdentifier": "t_contract$_DaiJoinLike_$4126", "typeString": "contract DaiJoinLike" } }, - "id": 4137, + "id": 4189, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "join", "nodeType": "MemberAccess", - "referencedDeclaration": 4066, + "referencedDeclaration": 4118, "src": "3034:21:22", "typeDescriptions": { "typeIdentifier": "t_function_external_payable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) payable external" } }, - "id": 4140, + "id": 4192, "isConstant": false, "isLValue": false, "isPure": false, @@ -17044,29 +17044,29 @@ "typeString": "tuple()" } }, - "id": 4141, + "id": 4193, "nodeType": "ExpressionStatement", "src": "3034:31:22" } ] }, "documentation": null, - "id": 4143, + "id": 4195, "implemented": true, "kind": "function", "modifiers": [], "name": "daiJoin_join", "nodeType": "FunctionDefinition", "parameters": { - "id": 4122, + "id": 4174, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4117, + "id": 4169, "name": "apt", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2694:11:22", "stateVariable": false, "storageLocation": "default", @@ -17075,7 +17075,7 @@ "typeString": "address" }, "typeName": { - "id": 4116, + "id": 4168, "name": "address", "nodeType": "ElementaryTypeName", "src": "2694:7:22", @@ -17090,10 +17090,10 @@ }, { "constant": false, - "id": 4119, + "id": 4171, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2715:11:22", "stateVariable": false, "storageLocation": "default", @@ -17102,7 +17102,7 @@ "typeString": "address" }, "typeName": { - "id": 4118, + "id": 4170, "name": "address", "nodeType": "ElementaryTypeName", "src": "2715:7:22", @@ -17117,10 +17117,10 @@ }, { "constant": false, - "id": 4121, + "id": 4173, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4143, + "scope": 4195, "src": "2736:8:22", "stateVariable": false, "storageLocation": "default", @@ -17129,7 +17129,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4120, + "id": 4172, "name": "uint", "nodeType": "ElementaryTypeName", "src": "2736:4:22", @@ -17145,19 +17145,19 @@ "src": "2684:66:22" }, "returnParameters": { - "id": 4123, + "id": 4175, "nodeType": "ParameterList", "parameters": [], "src": "2758:0:22" }, - "scope": 4144, + "scope": 4196, "src": "2663:409:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "2413:661:22" }, { @@ -17166,38 +17166,38 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 4145, + "id": 4197, "name": "Common", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 4144, + "referencedDeclaration": 4196, "src": "3108:6:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_Common_$4144", + "typeIdentifier": "t_contract$_Common_$4196", "typeString": "contract Common" } }, - "id": 4146, + "id": 4198, "nodeType": "InheritanceSpecifier", "src": "3108:6:22" } ], "contractDependencies": [ - 4144 + 4196 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 4711, + "id": 4763, "linearizedBaseContracts": [ - 4711, - 4144 + 4763, + 4196 ], "name": "DssProxyActionsBase", "nodeType": "ContractDefinition", "nodes": [ { "body": { - "id": 4167, + "id": 4219, "nodeType": "Block", "src": "3208:58:22", "statements": [ @@ -17211,7 +17211,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4163, + "id": 4215, "isConstant": false, "isLValue": false, "isPure": false, @@ -17221,18 +17221,18 @@ "components": [ { "argumentTypes": null, - "id": 4160, + "id": 4212, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4156, + "id": 4208, "name": "z", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4153, + "referencedDeclaration": 4205, "src": "3227:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17247,18 +17247,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4159, + "id": 4211, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4157, + "id": 4209, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3231:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17269,11 +17269,11 @@ "operator": "-", "rightExpression": { "argumentTypes": null, - "id": 4158, + "id": 4210, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4150, + "referencedDeclaration": 4202, "src": "3235:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17293,7 +17293,7 @@ } } ], - "id": 4161, + "id": 4213, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -17310,11 +17310,11 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 4162, + "id": 4214, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4148, + "referencedDeclaration": 4200, "src": "3241:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17330,7 +17330,7 @@ { "argumentTypes": null, "hexValue": "7375622d6f766572666c6f77", - "id": 4164, + "id": 4216, "isConstant": false, "isLValue": false, "isPure": true, @@ -17357,21 +17357,21 @@ "typeString": "literal_string \"sub-overflow\"" } ], - "id": 4155, + "id": 4207, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3218:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4165, + "id": 4217, "isConstant": false, "isLValue": false, "isPure": false, @@ -17385,29 +17385,29 @@ "typeString": "tuple()" } }, - "id": 4166, + "id": 4218, "nodeType": "ExpressionStatement", "src": "3218:41:22" } ] }, "documentation": null, - "id": 4168, + "id": 4220, "implemented": true, "kind": "function", "modifiers": [], "name": "sub", "nodeType": "FunctionDefinition", "parameters": { - "id": 4151, + "id": 4203, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4148, + "id": 4200, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3161:6:22", "stateVariable": false, "storageLocation": "default", @@ -17416,7 +17416,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4147, + "id": 4199, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3161:4:22", @@ -17430,10 +17430,10 @@ }, { "constant": false, - "id": 4150, + "id": 4202, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3169:6:22", "stateVariable": false, "storageLocation": "default", @@ -17442,7 +17442,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4149, + "id": 4201, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3169:4:22", @@ -17458,15 +17458,15 @@ "src": "3160:16:22" }, "returnParameters": { - "id": 4154, + "id": 4206, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4153, + "id": 4205, "name": "z", "nodeType": "VariableDeclaration", - "scope": 4168, + "scope": 4220, "src": "3200:6:22", "stateVariable": false, "storageLocation": "default", @@ -17475,7 +17475,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4152, + "id": 4204, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3200:4:22", @@ -17490,7 +17490,7 @@ ], "src": "3199:8:22" }, - "scope": 4711, + "scope": 4763, "src": "3148:118:22", "stateMutability": "pure", "superFunction": null, @@ -17498,25 +17498,25 @@ }, { "body": { - "id": 4188, + "id": 4240, "nodeType": "Block", "src": "3325:68:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4179, + "id": 4231, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4175, + "id": 4227, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3335:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17530,11 +17530,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4177, + "id": 4229, "name": "x", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4170, + "referencedDeclaration": 4222, "src": "3343:1:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17549,7 +17549,7 @@ "typeString": "uint256" } ], - "id": 4176, + "id": 4228, "isConstant": false, "isLValue": false, "isPure": true, @@ -17562,7 +17562,7 @@ }, "typeName": "int" }, - "id": 4178, + "id": 4230, "isConstant": false, "isLValue": false, "isPure": false, @@ -17582,7 +17582,7 @@ "typeString": "int256" } }, - "id": 4180, + "id": 4232, "nodeType": "ExpressionStatement", "src": "3335:10:22" }, @@ -17596,18 +17596,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4184, + "id": 4236, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4182, + "id": 4234, "name": "y", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4173, + "referencedDeclaration": 4225, "src": "3363:1:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -17619,7 +17619,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 4183, + "id": 4235, "isConstant": false, "isLValue": false, "isPure": true, @@ -17643,7 +17643,7 @@ { "argumentTypes": null, "hexValue": "696e742d6f766572666c6f77", - "id": 4185, + "id": 4237, "isConstant": false, "isLValue": false, "isPure": true, @@ -17670,21 +17670,21 @@ "typeString": "literal_string \"int-overflow\"" } ], - "id": 4181, + "id": 4233, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 7830, - 7831 + 7821, + 7822 ], - "referencedDeclaration": 7831, + "referencedDeclaration": 7822, "src": "3355:7:22", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 4186, + "id": 4238, "isConstant": false, "isLValue": false, "isPure": false, @@ -17698,29 +17698,29 @@ "typeString": "tuple()" } }, - "id": 4187, + "id": 4239, "nodeType": "ExpressionStatement", "src": "3355:31:22" } ] }, "documentation": null, - "id": 4189, + "id": 4241, "implemented": true, "kind": "function", "modifiers": [], "name": "toInt", "nodeType": "FunctionDefinition", "parameters": { - "id": 4171, + "id": 4223, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4170, + "id": 4222, "name": "x", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3287:6:22", "stateVariable": false, "storageLocation": "default", @@ -17729,7 +17729,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4169, + "id": 4221, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3287:4:22", @@ -17745,15 +17745,15 @@ "src": "3286:8:22" }, "returnParameters": { - "id": 4174, + "id": 4226, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4173, + "id": 4225, "name": "y", "nodeType": "VariableDeclaration", - "scope": 4189, + "scope": 4241, "src": "3318:5:22", "stateVariable": false, "storageLocation": "default", @@ -17762,7 +17762,7 @@ "typeString": "int256" }, "typeName": { - "id": 4172, + "id": 4224, "name": "int", "nodeType": "ElementaryTypeName", "src": "3318:3:22", @@ -17777,7 +17777,7 @@ ], "src": "3317:7:22" }, - "scope": 4711, + "scope": 4763, "src": "3272:121:22", "stateMutability": "pure", "superFunction": null, @@ -17785,25 +17785,25 @@ }, { "body": { - "id": 4205, + "id": 4257, "nodeType": "Block", "src": "3457:41:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4203, + "id": 4255, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4196, + "id": 4248, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4194, + "referencedDeclaration": 4246, "src": "3467:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17817,11 +17817,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4198, + "id": 4250, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4191, + "referencedDeclaration": 4243, "src": "3477:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -17834,7 +17834,7 @@ "typeIdentifier": "t_rational_1000000000000000000000000000_by_1", "typeString": "int_const 1000000000000000000000000000" }, - "id": 4201, + "id": 4253, "isConstant": false, "isLValue": false, "isPure": true, @@ -17842,7 +17842,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4199, + "id": 4251, "isConstant": false, "isLValue": false, "isPure": true, @@ -17862,7 +17862,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3237", - "id": 4200, + "id": 4252, "isConstant": false, "isLValue": false, "isPure": true, @@ -17895,18 +17895,18 @@ "typeString": "int_const 1000000000000000000000000000" } ], - "id": 4197, + "id": 4249, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3473:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4202, + "id": 4254, "isConstant": false, "isLValue": false, "isPure": false, @@ -17926,29 +17926,29 @@ "typeString": "uint256" } }, - "id": 4204, + "id": 4256, "nodeType": "ExpressionStatement", "src": "3467:24:22" } ] }, "documentation": null, - "id": 4206, + "id": 4258, "implemented": true, "kind": "function", "modifiers": [], "name": "toRad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4192, + "id": 4244, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4191, + "id": 4243, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3414:8:22", "stateVariable": false, "storageLocation": "default", @@ -17957,7 +17957,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4190, + "id": 4242, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3414:4:22", @@ -17973,15 +17973,15 @@ "src": "3413:10:22" }, "returnParameters": { - "id": 4195, + "id": 4247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4194, + "id": 4246, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4206, + "scope": 4258, "src": "3447:8:22", "stateVariable": false, "storageLocation": "default", @@ -17990,7 +17990,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4193, + "id": 4245, "name": "uint", "nodeType": "ElementaryTypeName", "src": "3447:4:22", @@ -18005,7 +18005,7 @@ ], "src": "3446:10:22" }, - "scope": 4711, + "scope": 4763, "src": "3399:99:22", "stateMutability": "pure", "superFunction": null, @@ -18013,25 +18013,25 @@ }, { "body": { - "id": 4231, + "id": 4283, "nodeType": "Block", "src": "3586:316:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4229, + "id": 4281, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4215, + "id": 4267, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4213, + "referencedDeclaration": 4265, "src": "3806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18045,11 +18045,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4217, + "id": 4269, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4210, + "referencedDeclaration": 4262, "src": "3829:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18062,7 +18062,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4227, + "id": 4279, "isConstant": false, "isLValue": false, "isPure": false, @@ -18070,7 +18070,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4218, + "id": 4270, "isConstant": false, "isLValue": false, "isPure": true, @@ -18096,7 +18096,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4225, + "id": 4277, "isConstant": false, "isLValue": false, "isPure": false, @@ -18104,7 +18104,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4219, + "id": 4271, "isConstant": false, "isLValue": false, "isPure": true, @@ -18131,11 +18131,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4221, + "id": 4273, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4208, + "referencedDeclaration": 4260, "src": "3870:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18150,18 +18150,18 @@ "typeString": "address" } ], - "id": 4220, + "id": 4272, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "3858:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4222, + "id": 4274, "isConstant": false, "isLValue": false, "isPure": false, @@ -18171,25 +18171,25 @@ "nodeType": "FunctionCall", "src": "3858:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4223, + "id": 4275, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "3858:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4224, + "id": 4276, "isConstant": false, "isLValue": false, "isPure": false, @@ -18210,7 +18210,7 @@ } } ], - "id": 4226, + "id": 4278, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18241,18 +18241,18 @@ "typeString": "uint256" } ], - "id": 4216, + "id": 4268, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "3812:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4228, + "id": 4280, "isConstant": false, "isLValue": false, "isPure": false, @@ -18272,29 +18272,29 @@ "typeString": "uint256" } }, - "id": 4230, + "id": 4282, "nodeType": "ExpressionStatement", "src": "3806:89:22" } ] }, "documentation": null, - "id": 4232, + "id": 4284, "implemented": true, "kind": "function", "modifiers": [], "name": "convertTo18", "nodeType": "FunctionDefinition", "parameters": { - "id": 4211, + "id": 4263, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4208, + "id": 4260, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3525:15:22", "stateVariable": false, "storageLocation": "default", @@ -18303,7 +18303,7 @@ "typeString": "address" }, "typeName": { - "id": 4207, + "id": 4259, "name": "address", "nodeType": "ElementaryTypeName", "src": "3525:7:22", @@ -18318,10 +18318,10 @@ }, { "constant": false, - "id": 4210, + "id": 4262, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3542:11:22", "stateVariable": false, "storageLocation": "default", @@ -18330,7 +18330,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4209, + "id": 4261, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3542:7:22", @@ -18346,15 +18346,15 @@ "src": "3524:30:22" }, "returnParameters": { - "id": 4214, + "id": 4266, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4213, + "id": 4265, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4232, + "scope": 4284, "src": "3573:11:22", "stateVariable": false, "storageLocation": "default", @@ -18363,7 +18363,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4212, + "id": 4264, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3573:7:22", @@ -18378,7 +18378,7 @@ ], "src": "3572:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3504:398:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18386,25 +18386,25 @@ }, { "body": { - "id": 4257, + "id": 4309, "nodeType": "Block", "src": "3996:174:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4255, + "id": 4307, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4241, + "id": 4293, "name": "amt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4239, + "referencedDeclaration": 4291, "src": "4110:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18419,18 +18419,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4254, + "id": 4306, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4242, + "id": 4294, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4236, + "referencedDeclaration": 4288, "src": "4116:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -18448,7 +18448,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4252, + "id": 4304, "isConstant": false, "isLValue": false, "isPure": false, @@ -18456,7 +18456,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3130", - "id": 4243, + "id": 4295, "isConstant": false, "isLValue": false, "isPure": true, @@ -18482,7 +18482,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4250, + "id": 4302, "isConstant": false, "isLValue": false, "isPure": false, @@ -18490,7 +18490,7 @@ "leftExpression": { "argumentTypes": null, "hexValue": "3138", - "id": 4244, + "id": 4296, "isConstant": false, "isLValue": false, "isPure": true, @@ -18517,11 +18517,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4246, + "id": 4298, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4234, + "referencedDeclaration": 4286, "src": "4147:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18536,18 +18536,18 @@ "typeString": "address" } ], - "id": 4245, + "id": 4297, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "4135:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4247, + "id": 4299, "isConstant": false, "isLValue": false, "isPure": false, @@ -18557,25 +18557,25 @@ "nodeType": "FunctionCall", "src": "4135:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4248, + "id": 4300, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dec", "nodeType": "MemberAccess", - "referencedDeclaration": 4029, + "referencedDeclaration": 4081, "src": "4135:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_uint256_$", "typeString": "function () external returns (uint256)" } }, - "id": 4249, + "id": 4301, "isConstant": false, "isLValue": false, "isPure": false, @@ -18596,7 +18596,7 @@ } } ], - "id": 4251, + "id": 4303, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18616,7 +18616,7 @@ } } ], - "id": 4253, + "id": 4305, "isConstant": false, "isInlineArray": false, "isLValue": false, @@ -18641,29 +18641,29 @@ "typeString": "uint256" } }, - "id": 4256, + "id": 4308, "nodeType": "ExpressionStatement", "src": "4110:53:22" } ] }, "documentation": null, - "id": 4258, + "id": 4310, "implemented": true, "kind": "function", "modifiers": [], "name": "convertToGemUnits", "nodeType": "FunctionDefinition", "parameters": { - "id": 4237, + "id": 4289, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4234, + "id": 4286, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3935:15:22", "stateVariable": false, "storageLocation": "default", @@ -18672,7 +18672,7 @@ "typeString": "address" }, "typeName": { - "id": 4233, + "id": 4285, "name": "address", "nodeType": "ElementaryTypeName", "src": "3935:7:22", @@ -18687,10 +18687,10 @@ }, { "constant": false, - "id": 4236, + "id": 4288, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3952:11:22", "stateVariable": false, "storageLocation": "default", @@ -18699,7 +18699,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4235, + "id": 4287, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3952:7:22", @@ -18715,15 +18715,15 @@ "src": "3934:30:22" }, "returnParameters": { - "id": 4240, + "id": 4292, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4239, + "id": 4291, "name": "amt", "nodeType": "VariableDeclaration", - "scope": 4258, + "scope": 4310, "src": "3983:11:22", "stateVariable": false, "storageLocation": "default", @@ -18732,7 +18732,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4238, + "id": 4290, "name": "uint256", "nodeType": "ElementaryTypeName", "src": "3983:7:22", @@ -18747,7 +18747,7 @@ ], "src": "3982:13:22" }, - "scope": 4711, + "scope": 4763, "src": "3908:262:22", "stateMutability": "nonpayable", "superFunction": null, @@ -18755,21 +18755,21 @@ }, { "body": { - "id": 4332, + "id": 4384, "nodeType": "Block", "src": "4334:718:22", "statements": [ { "assignments": [ - 4274 + 4326 ], "declarations": [ { "constant": false, - "id": 4274, + "id": 4326, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4382:9:22", "stateVariable": false, "storageLocation": "default", @@ -18778,7 +18778,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4273, + "id": 4325, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4382:4:22", @@ -18791,17 +18791,17 @@ "visibility": "internal" } ], - "id": 4281, + "id": 4333, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4279, + "id": 4331, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4266, + "referencedDeclaration": 4318, "src": "4412:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -18821,11 +18821,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4276, + "id": 4328, "name": "jug", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4262, + "referencedDeclaration": 4314, "src": "4402:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18840,18 +18840,18 @@ "typeString": "address" } ], - "id": 4275, + "id": 4327, "name": "JugLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4082, + "referencedDeclaration": 4134, "src": "4394:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_JugLike_$4082_$", + "typeIdentifier": "t_type$_t_contract$_JugLike_$4134_$", "typeString": "type(contract JugLike)" } }, - "id": 4277, + "id": 4329, "isConstant": false, "isLValue": false, "isPure": false, @@ -18861,25 +18861,25 @@ "nodeType": "FunctionCall", "src": "4394:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_JugLike_$4082", + "typeIdentifier": "t_contract$_JugLike_$4134", "typeString": "contract JugLike" } }, - "id": 4278, + "id": 4330, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "drip", "nodeType": "MemberAccess", - "referencedDeclaration": 4081, + "referencedDeclaration": 4133, "src": "4394:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (bytes32) external returns (uint256)" } }, - "id": 4280, + "id": 4332, "isConstant": false, "isLValue": false, "isPure": false, @@ -18898,15 +18898,15 @@ }, { "assignments": [ - 4283 + 4335 ], "declarations": [ { "constant": false, - "id": 4283, + "id": 4335, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4332, + "scope": 4384, "src": "4477:8:22", "stateVariable": false, "storageLocation": "default", @@ -18915,7 +18915,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4282, + "id": 4334, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4477:4:22", @@ -18928,17 +18928,17 @@ "visibility": "internal" } ], - "id": 4290, + "id": 4342, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4288, + "id": 4340, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4264, + "referencedDeclaration": 4316, "src": "4505:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18958,11 +18958,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4285, + "id": 4337, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4260, + "referencedDeclaration": 4312, "src": "4496:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -18977,18 +18977,18 @@ "typeString": "address" } ], - "id": 4284, + "id": 4336, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "4488:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4286, + "id": 4338, "isConstant": false, "isLValue": false, "isPure": false, @@ -18998,25 +18998,25 @@ "nodeType": "FunctionCall", "src": "4488:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4287, + "id": 4339, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "4488:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4289, + "id": 4341, "isConstant": false, "isLValue": false, "isPure": false, @@ -19040,18 +19040,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4296, + "id": 4348, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4291, + "id": 4343, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4626:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19065,11 +19065,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4293, + "id": 4345, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4636:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19078,11 +19078,11 @@ }, { "argumentTypes": null, - "id": 4294, + "id": 4346, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4641:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19101,18 +19101,18 @@ "typeString": "uint256" } ], - "id": 4292, + "id": 4344, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4632:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4295, + "id": 4347, "isConstant": false, "isLValue": false, "isPure": false, @@ -19133,29 +19133,29 @@ } }, "falseBody": null, - "id": 4331, + "id": 4383, "nodeType": "IfStatement", "src": "4622:424:22", "trueBody": { - "id": 4330, + "id": 4382, "nodeType": "Block", "src": "4647:399:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4309, + "id": 4361, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4297, + "id": 4349, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4791:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19173,7 +19173,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4307, + "id": 4359, "isConstant": false, "isLValue": false, "isPure": false, @@ -19186,11 +19186,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4301, + "id": 4353, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "4812:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19199,11 +19199,11 @@ }, { "argumentTypes": null, - "id": 4302, + "id": 4354, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "4817:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19222,18 +19222,18 @@ "typeString": "uint256" } ], - "id": 4300, + "id": 4352, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4808:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4303, + "id": 4355, "isConstant": false, "isLValue": false, "isPure": false, @@ -19249,11 +19249,11 @@ }, { "argumentTypes": null, - "id": 4304, + "id": 4356, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4283, + "referencedDeclaration": 4335, "src": "4823:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19272,18 +19272,18 @@ "typeString": "uint256" } ], - "id": 4299, + "id": 4351, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "4804:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4305, + "id": 4357, "isConstant": false, "isLValue": false, "isPure": false, @@ -19301,11 +19301,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4306, + "id": 4358, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4830:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19326,18 +19326,18 @@ "typeString": "uint256" } ], - "id": 4298, + "id": 4350, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "4798:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4308, + "id": 4360, "isConstant": false, "isLValue": false, "isPure": false, @@ -19357,25 +19357,25 @@ "typeString": "int256" } }, - "id": 4310, + "id": 4362, "nodeType": "ExpressionStatement", "src": "4791:44:22" }, { "expression": { "argumentTypes": null, - "id": 4328, + "id": 4380, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4311, + "id": 4363, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4973:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19392,7 +19392,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4322, + "id": 4374, "isConstant": false, "isLValue": false, "isPure": false, @@ -19405,11 +19405,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4314, + "id": 4366, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "4989:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19424,7 +19424,7 @@ "typeString": "int256" } ], - "id": 4313, + "id": 4365, "isConstant": false, "isLValue": false, "isPure": true, @@ -19437,7 +19437,7 @@ }, "typeName": "uint" }, - "id": 4315, + "id": 4367, "isConstant": false, "isLValue": false, "isPure": false, @@ -19453,11 +19453,11 @@ }, { "argumentTypes": null, - "id": 4316, + "id": 4368, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4274, + "referencedDeclaration": 4326, "src": "4996:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19476,18 +19476,18 @@ "typeString": "uint256" } ], - "id": 4312, + "id": 4364, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "4980:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4317, + "id": 4369, "isConstant": false, "isLValue": false, "isPure": false, @@ -19508,11 +19508,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4319, + "id": 4371, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4268, + "referencedDeclaration": 4320, "src": "5008:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19521,11 +19521,11 @@ }, { "argumentTypes": null, - "id": 4320, + "id": 4372, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5013:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -19544,18 +19544,18 @@ "typeString": "uint256" } ], - "id": 4318, + "id": 4370, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5004:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4321, + "id": 4373, "isConstant": false, "isLValue": false, "isPure": false, @@ -19577,18 +19577,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4326, + "id": 4378, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5031:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", "typeString": "int256" } }, - "id": 4327, + "id": 4379, "isConstant": false, "isLValue": false, "isPure": false, @@ -19601,18 +19601,18 @@ "typeIdentifier": "t_int256", "typeString": "int256" }, - "id": 4325, + "id": 4377, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4323, + "id": 4375, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4271, + "referencedDeclaration": 4323, "src": "5020:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -19624,7 +19624,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4324, + "id": 4376, "isConstant": false, "isLValue": false, "isPure": true, @@ -19656,7 +19656,7 @@ "typeString": "int256" } }, - "id": 4329, + "id": 4381, "nodeType": "ExpressionStatement", "src": "4973:62:22" } @@ -19666,22 +19666,22 @@ ] }, "documentation": null, - "id": 4333, + "id": 4385, "implemented": true, "kind": "function", "modifiers": [], "name": "_getDrawDart", "nodeType": "FunctionDefinition", "parameters": { - "id": 4269, + "id": 4321, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4260, + "id": 4312, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4207:11:22", "stateVariable": false, "storageLocation": "default", @@ -19690,7 +19690,7 @@ "typeString": "address" }, "typeName": { - "id": 4259, + "id": 4311, "name": "address", "nodeType": "ElementaryTypeName", "src": "4207:7:22", @@ -19705,10 +19705,10 @@ }, { "constant": false, - "id": 4262, + "id": 4314, "name": "jug", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4228:11:22", "stateVariable": false, "storageLocation": "default", @@ -19717,7 +19717,7 @@ "typeString": "address" }, "typeName": { - "id": 4261, + "id": 4313, "name": "address", "nodeType": "ElementaryTypeName", "src": "4228:7:22", @@ -19732,10 +19732,10 @@ }, { "constant": false, - "id": 4264, + "id": 4316, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4249:11:22", "stateVariable": false, "storageLocation": "default", @@ -19744,7 +19744,7 @@ "typeString": "address" }, "typeName": { - "id": 4263, + "id": 4315, "name": "address", "nodeType": "ElementaryTypeName", "src": "4249:7:22", @@ -19759,10 +19759,10 @@ }, { "constant": false, - "id": 4266, + "id": 4318, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4270:11:22", "stateVariable": false, "storageLocation": "default", @@ -19771,7 +19771,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4265, + "id": 4317, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "4270:7:22", @@ -19785,10 +19785,10 @@ }, { "constant": false, - "id": 4268, + "id": 4320, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4291:8:22", "stateVariable": false, "storageLocation": "default", @@ -19797,7 +19797,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4267, + "id": 4319, "name": "uint", "nodeType": "ElementaryTypeName", "src": "4291:4:22", @@ -19813,15 +19813,15 @@ "src": "4197:108:22" }, "returnParameters": { - "id": 4272, + "id": 4324, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4271, + "id": 4323, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4333, + "scope": 4385, "src": "4324:8:22", "stateVariable": false, "storageLocation": "default", @@ -19830,7 +19830,7 @@ "typeString": "int256" }, "typeName": { - "id": 4270, + "id": 4322, "name": "int", "nodeType": "ElementaryTypeName", "src": "4324:3:22", @@ -19845,7 +19845,7 @@ ], "src": "4323:10:22" }, - "scope": 4711, + "scope": 4763, "src": "4176:876:22", "stateMutability": "nonpayable", "superFunction": null, @@ -19853,14 +19853,14 @@ }, { "body": { - "id": 4404, + "id": 4456, "nodeType": "Block", "src": "5205:496:22", "statements": [ { "assignments": [ null, - 4347, + 4399, null, null, null @@ -19869,10 +19869,10 @@ null, { "constant": false, - "id": 4347, + "id": 4399, "name": "rate", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5259:9:22", "stateVariable": false, "storageLocation": "default", @@ -19881,7 +19881,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4346, + "id": 4398, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5259:4:22", @@ -19897,17 +19897,17 @@ null, null ], - "id": 4354, + "id": 4406, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4352, + "id": 4404, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5293:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -19927,11 +19927,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4349, + "id": 4401, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5283:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -19946,18 +19946,18 @@ "typeString": "address" } ], - "id": 4348, + "id": 4400, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5275:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4350, + "id": 4402, "isConstant": false, "isLValue": false, "isPure": false, @@ -19967,25 +19967,25 @@ "nodeType": "FunctionCall", "src": "5275:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4351, + "id": 4403, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3976, + "referencedDeclaration": 4028, "src": "5275:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$returns$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32) view external returns (uint256,uint256,uint256,uint256,uint256)" } }, - "id": 4353, + "id": 4405, "isConstant": false, "isLValue": false, "isPure": false, @@ -20005,16 +20005,16 @@ { "assignments": [ null, - 4356 + 4408 ], "declarations": [ null, { "constant": false, - "id": 4356, + "id": 4408, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5354:8:22", "stateVariable": false, "storageLocation": "default", @@ -20023,7 +20023,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4355, + "id": 4407, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5354:4:22", @@ -20036,17 +20036,17 @@ "visibility": "internal" } ], - "id": 4364, + "id": 4416, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4361, + "id": 4413, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4341, + "referencedDeclaration": 4393, "src": "5384:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -20055,11 +20055,11 @@ }, { "argumentTypes": null, - "id": 4362, + "id": 4414, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4339, + "referencedDeclaration": 4391, "src": "5389:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20083,11 +20083,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4358, + "id": 4410, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5374:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20102,18 +20102,18 @@ "typeString": "address" } ], - "id": 4357, + "id": 4409, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5366:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4359, + "id": 4411, "isConstant": false, "isLValue": false, "isPure": false, @@ -20123,25 +20123,25 @@ "nodeType": "FunctionCall", "src": "5366:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4360, + "id": 4412, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "5366:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4363, + "id": 4415, "isConstant": false, "isLValue": false, "isPure": false, @@ -20160,15 +20160,15 @@ }, { "assignments": [ - 4366 + 4418 ], "declarations": [ { "constant": false, - "id": 4366, + "id": 4418, "name": "dai", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5448:8:22", "stateVariable": false, "storageLocation": "default", @@ -20177,7 +20177,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4365, + "id": 4417, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5448:4:22", @@ -20190,17 +20190,17 @@ "visibility": "internal" } ], - "id": 4373, + "id": 4425, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4371, + "id": 4423, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4337, + "referencedDeclaration": 4389, "src": "5476:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20220,11 +20220,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4368, + "id": 4420, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4335, + "referencedDeclaration": 4387, "src": "5467:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20239,18 +20239,18 @@ "typeString": "address" } ], - "id": 4367, + "id": 4419, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "5459:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4369, + "id": 4421, "isConstant": false, "isLValue": false, "isPure": false, @@ -20260,25 +20260,25 @@ "nodeType": "FunctionCall", "src": "5459:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4370, + "id": 4422, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "dai", "nodeType": "MemberAccess", - "referencedDeclaration": 3983, + "referencedDeclaration": 4035, "src": "5459:16:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_address_$returns$_t_uint256_$", "typeString": "function (address) view external returns (uint256)" } }, - "id": 4372, + "id": 4424, "isConstant": false, "isLValue": false, "isPure": false, @@ -20297,15 +20297,15 @@ }, { "assignments": [ - 4375 + 4427 ], "declarations": [ { "constant": false, - "id": 4375, + "id": 4427, "name": "rad", "nodeType": "VariableDeclaration", - "scope": 4404, + "scope": 4456, "src": "5491:8:22", "stateVariable": false, "storageLocation": "default", @@ -20314,7 +20314,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4374, + "id": 4426, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5491:4:22", @@ -20327,7 +20327,7 @@ "visibility": "internal" } ], - "id": 4383, + "id": 4435, "initialValue": { "argumentTypes": null, "arguments": [ @@ -20336,11 +20336,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4378, + "id": 4430, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4356, + "referencedDeclaration": 4408, "src": "5510:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20349,11 +20349,11 @@ }, { "argumentTypes": null, - "id": 4379, + "id": 4431, "name": "rate", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4347, + "referencedDeclaration": 4399, "src": "5515:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20372,18 +20372,18 @@ "typeString": "uint256" } ], - "id": 4377, + "id": 4429, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5506:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4380, + "id": 4432, "isConstant": false, "isLValue": false, "isPure": false, @@ -20399,11 +20399,11 @@ }, { "argumentTypes": null, - "id": 4381, + "id": 4433, "name": "dai", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4366, + "referencedDeclaration": 4418, "src": "5522:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20422,18 +20422,18 @@ "typeString": "uint256" } ], - "id": 4376, + "id": 4428, "name": "sub", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4168, + "referencedDeclaration": 4220, "src": "5502:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4382, + "id": 4434, "isConstant": false, "isLValue": false, "isPure": false, @@ -20453,18 +20453,18 @@ { "expression": { "argumentTypes": null, - "id": 4388, + "id": 4440, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4384, + "id": 4436, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5536:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20479,18 +20479,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4387, + "id": 4439, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4385, + "id": 4437, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5542:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20501,11 +20501,11 @@ "operator": "/", "rightExpression": { "argumentTypes": null, - "id": 4386, + "id": 4438, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5548:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20524,25 +20524,25 @@ "typeString": "uint256" } }, - "id": 4389, + "id": 4441, "nodeType": "ExpressionStatement", "src": "5536:15:22" }, { "expression": { "argumentTypes": null, - "id": 4402, + "id": 4454, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4390, + "id": 4442, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5653:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20559,7 +20559,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4396, + "id": 4448, "isConstant": false, "isLValue": false, "isPure": false, @@ -20569,11 +20569,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4392, + "id": 4444, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5663:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20582,11 +20582,11 @@ }, { "argumentTypes": null, - "id": 4393, + "id": 4445, "name": "RAY", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4087, + "referencedDeclaration": 4139, "src": "5668:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20605,18 +20605,18 @@ "typeString": "uint256" } ], - "id": 4391, + "id": 4443, "name": "mul", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4115, + "referencedDeclaration": 4167, "src": "5659:3:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "id": 4394, + "id": 4446, "isConstant": false, "isLValue": false, "isPure": false, @@ -20634,11 +20634,11 @@ "operator": "<", "rightExpression": { "argumentTypes": null, - "id": 4395, + "id": 4447, "name": "rad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4375, + "referencedDeclaration": 4427, "src": "5675:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20653,18 +20653,18 @@ }, "falseExpression": { "argumentTypes": null, - "id": 4400, + "id": 4452, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5691:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 4401, + "id": 4453, "isConstant": false, "isLValue": false, "isPure": false, @@ -20677,18 +20677,18 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 4399, + "id": 4451, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 4397, + "id": 4449, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4344, + "referencedDeclaration": 4396, "src": "5681:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20700,7 +20700,7 @@ "rightExpression": { "argumentTypes": null, "hexValue": "31", - "id": 4398, + "id": 4450, "isConstant": false, "isLValue": false, "isPure": true, @@ -20732,29 +20732,29 @@ "typeString": "uint256" } }, - "id": 4403, + "id": 4455, "nodeType": "ExpressionStatement", "src": "5653:41:22" } ] }, "documentation": null, - "id": 4405, + "id": 4457, "implemented": true, "kind": "function", "modifiers": [], "name": "_getWipeAllWad", "nodeType": "FunctionDefinition", "parameters": { - "id": 4342, + "id": 4394, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4335, + "id": 4387, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5091:11:22", "stateVariable": false, "storageLocation": "default", @@ -20763,7 +20763,7 @@ "typeString": "address" }, "typeName": { - "id": 4334, + "id": 4386, "name": "address", "nodeType": "ElementaryTypeName", "src": "5091:7:22", @@ -20778,10 +20778,10 @@ }, { "constant": false, - "id": 4337, + "id": 4389, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5112:11:22", "stateVariable": false, "storageLocation": "default", @@ -20790,7 +20790,7 @@ "typeString": "address" }, "typeName": { - "id": 4336, + "id": 4388, "name": "address", "nodeType": "ElementaryTypeName", "src": "5112:7:22", @@ -20805,10 +20805,10 @@ }, { "constant": false, - "id": 4339, + "id": 4391, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5133:11:22", "stateVariable": false, "storageLocation": "default", @@ -20817,7 +20817,7 @@ "typeString": "address" }, "typeName": { - "id": 4338, + "id": 4390, "name": "address", "nodeType": "ElementaryTypeName", "src": "5133:7:22", @@ -20832,10 +20832,10 @@ }, { "constant": false, - "id": 4341, + "id": 4393, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5154:11:22", "stateVariable": false, "storageLocation": "default", @@ -20844,7 +20844,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4340, + "id": 4392, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5154:7:22", @@ -20860,15 +20860,15 @@ "src": "5081:90:22" }, "returnParameters": { - "id": 4345, + "id": 4397, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4344, + "id": 4396, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4405, + "scope": 4457, "src": "5195:8:22", "stateVariable": false, "storageLocation": "default", @@ -20877,7 +20877,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4343, + "id": 4395, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5195:4:22", @@ -20892,7 +20892,7 @@ ], "src": "5194:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5058:643:22", "stateMutability": "view", "superFunction": null, @@ -20900,25 +20900,25 @@ }, { "body": { - "id": 4426, + "id": 4478, "nodeType": "Block", "src": "5820:58:22", "statements": [ { "expression": { "argumentTypes": null, - "id": 4424, + "id": 4476, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 4416, + "id": 4468, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4414, + "referencedDeclaration": 4466, "src": "5830:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -20932,11 +20932,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4421, + "id": 4473, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4409, + "referencedDeclaration": 4461, "src": "5862:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -20945,11 +20945,11 @@ }, { "argumentTypes": null, - "id": 4422, + "id": 4474, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4411, + "referencedDeclaration": 4463, "src": "5867:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20973,11 +20973,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4418, + "id": 4470, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4407, + "referencedDeclaration": 4459, "src": "5848:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -20992,18 +20992,18 @@ "typeString": "address" } ], - "id": 4417, + "id": 4469, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5836:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4419, + "id": 4471, "isConstant": false, "isLValue": false, "isPure": false, @@ -21013,25 +21013,25 @@ "nodeType": "FunctionCall", "src": "5836:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4420, + "id": 4472, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "open", "nodeType": "MemberAccess", - "referencedDeclaration": 3869, + "referencedDeclaration": 3921, "src": "5836:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes32_$_t_address_$returns$_t_uint256_$", "typeString": "function (bytes32,address) external returns (uint256)" } }, - "id": 4423, + "id": 4475, "isConstant": false, "isLValue": false, "isPure": false, @@ -21051,29 +21051,29 @@ "typeString": "uint256" } }, - "id": 4425, + "id": 4477, "nodeType": "ExpressionStatement", "src": "5830:41:22" } ] }, "documentation": null, - "id": 4427, + "id": 4479, "implemented": true, "kind": "function", "modifiers": [], "name": "open", "nodeType": "FunctionDefinition", "parameters": { - "id": 4412, + "id": 4464, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4407, + "id": 4459, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5730:15:22", "stateVariable": false, "storageLocation": "default", @@ -21082,7 +21082,7 @@ "typeString": "address" }, "typeName": { - "id": 4406, + "id": 4458, "name": "address", "nodeType": "ElementaryTypeName", "src": "5730:7:22", @@ -21097,10 +21097,10 @@ }, { "constant": false, - "id": 4409, + "id": 4461, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5755:11:22", "stateVariable": false, "storageLocation": "default", @@ -21109,7 +21109,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4408, + "id": 4460, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "5755:7:22", @@ -21123,10 +21123,10 @@ }, { "constant": false, - "id": 4411, + "id": 4463, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5776:11:22", "stateVariable": false, "storageLocation": "default", @@ -21135,7 +21135,7 @@ "typeString": "address" }, "typeName": { - "id": 4410, + "id": 4462, "name": "address", "nodeType": "ElementaryTypeName", "src": "5776:7:22", @@ -21152,15 +21152,15 @@ "src": "5720:73:22" }, "returnParameters": { - "id": 4415, + "id": 4467, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4414, + "id": 4466, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4427, + "scope": 4479, "src": "5810:8:22", "stateVariable": false, "storageLocation": "default", @@ -21169,7 +21169,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4413, + "id": 4465, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5810:4:22", @@ -21184,7 +21184,7 @@ ], "src": "5809:10:22" }, - "scope": 4711, + "scope": 4763, "src": "5707:171:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21192,7 +21192,7 @@ }, { "body": { - "id": 4444, + "id": 4496, "nodeType": "Block", "src": "5975:52:22", "statements": [ @@ -21202,11 +21202,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4440, + "id": 4492, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4431, + "referencedDeclaration": 4483, "src": "6011:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21215,11 +21215,11 @@ }, { "argumentTypes": null, - "id": 4441, + "id": 4493, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4433, + "referencedDeclaration": 4485, "src": "6016:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21243,11 +21243,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4437, + "id": 4489, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4429, + "referencedDeclaration": 4481, "src": "5997:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21262,18 +21262,18 @@ "typeString": "address" } ], - "id": 4436, + "id": 4488, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "5985:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4438, + "id": 4490, "isConstant": false, "isLValue": false, "isPure": false, @@ -21283,25 +21283,25 @@ "nodeType": "FunctionCall", "src": "5985:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4439, + "id": 4491, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "give", "nodeType": "MemberAccess", - "referencedDeclaration": 3876, + "referencedDeclaration": 3928, "src": "5985:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$returns$__$", "typeString": "function (uint256,address) external" } }, - "id": 4442, + "id": 4494, "isConstant": false, "isLValue": false, "isPure": false, @@ -21315,29 +21315,29 @@ "typeString": "tuple()" } }, - "id": 4443, + "id": 4495, "nodeType": "ExpressionStatement", "src": "5985:35:22" } ] }, "documentation": null, - "id": 4445, + "id": 4497, "implemented": true, "kind": "function", "modifiers": [], "name": "give", "nodeType": "FunctionDefinition", "parameters": { - "id": 4434, + "id": 4486, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4429, + "id": 4481, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5907:15:22", "stateVariable": false, "storageLocation": "default", @@ -21346,7 +21346,7 @@ "typeString": "address" }, "typeName": { - "id": 4428, + "id": 4480, "name": "address", "nodeType": "ElementaryTypeName", "src": "5907:7:22", @@ -21361,10 +21361,10 @@ }, { "constant": false, - "id": 4431, + "id": 4483, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5932:8:22", "stateVariable": false, "storageLocation": "default", @@ -21373,7 +21373,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4430, + "id": 4482, "name": "uint", "nodeType": "ElementaryTypeName", "src": "5932:4:22", @@ -21387,10 +21387,10 @@ }, { "constant": false, - "id": 4433, + "id": 4485, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4445, + "scope": 4497, "src": "5950:11:22", "stateVariable": false, "storageLocation": "default", @@ -21399,7 +21399,7 @@ "typeString": "address" }, "typeName": { - "id": 4432, + "id": 4484, "name": "address", "nodeType": "ElementaryTypeName", "src": "5950:7:22", @@ -21416,12 +21416,12 @@ "src": "5897:70:22" }, "returnParameters": { - "id": 4435, + "id": 4487, "nodeType": "ParameterList", "parameters": [], "src": "5975:0:22" }, - "scope": 4711, + "scope": 4763, "src": "5884:143:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21429,7 +21429,7 @@ }, { "body": { - "id": 4465, + "id": 4517, "nodeType": "Block", "src": "6145:60:22", "statements": [ @@ -21439,11 +21439,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4460, + "id": 4512, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4449, + "referencedDeclaration": 4501, "src": "6185:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21452,11 +21452,11 @@ }, { "argumentTypes": null, - "id": 4461, + "id": 4513, "name": "usr", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4451, + "referencedDeclaration": 4503, "src": "6190:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21465,11 +21465,11 @@ }, { "argumentTypes": null, - "id": 4462, + "id": 4514, "name": "ok", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4453, + "referencedDeclaration": 4505, "src": "6195:2:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21497,11 +21497,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4457, + "id": 4509, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4447, + "referencedDeclaration": 4499, "src": "6167:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21516,18 +21516,18 @@ "typeString": "address" } ], - "id": 4456, + "id": 4508, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6155:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4458, + "id": 4510, "isConstant": false, "isLValue": false, "isPure": false, @@ -21537,25 +21537,25 @@ "nodeType": "FunctionCall", "src": "6155:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4459, + "id": 4511, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "cdpAllow", "nodeType": "MemberAccess", - "referencedDeclaration": 3885, + "referencedDeclaration": 3937, "src": "6155:29:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4463, + "id": 4515, "isConstant": false, "isLValue": false, "isPure": false, @@ -21569,29 +21569,29 @@ "typeString": "tuple()" } }, - "id": 4464, + "id": 4516, "nodeType": "ExpressionStatement", "src": "6155:43:22" } ] }, "documentation": null, - "id": 4466, + "id": 4518, "implemented": true, "kind": "function", "modifiers": [], "name": "cdpAllow", "nodeType": "FunctionDefinition", "parameters": { - "id": 4454, + "id": 4506, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4447, + "id": 4499, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6060:15:22", "stateVariable": false, "storageLocation": "default", @@ -21600,7 +21600,7 @@ "typeString": "address" }, "typeName": { - "id": 4446, + "id": 4498, "name": "address", "nodeType": "ElementaryTypeName", "src": "6060:7:22", @@ -21615,10 +21615,10 @@ }, { "constant": false, - "id": 4449, + "id": 4501, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6085:8:22", "stateVariable": false, "storageLocation": "default", @@ -21627,7 +21627,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4448, + "id": 4500, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6085:4:22", @@ -21641,10 +21641,10 @@ }, { "constant": false, - "id": 4451, + "id": 4503, "name": "usr", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6103:11:22", "stateVariable": false, "storageLocation": "default", @@ -21653,7 +21653,7 @@ "typeString": "address" }, "typeName": { - "id": 4450, + "id": 4502, "name": "address", "nodeType": "ElementaryTypeName", "src": "6103:7:22", @@ -21668,10 +21668,10 @@ }, { "constant": false, - "id": 4453, + "id": 4505, "name": "ok", "nodeType": "VariableDeclaration", - "scope": 4466, + "scope": 4518, "src": "6124:7:22", "stateVariable": false, "storageLocation": "default", @@ -21680,7 +21680,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4452, + "id": 4504, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6124:4:22", @@ -21696,12 +21696,12 @@ "src": "6050:87:22" }, "returnParameters": { - "id": 4455, + "id": 4507, "nodeType": "ParameterList", "parameters": [], "src": "6145:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6033:172:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21709,7 +21709,7 @@ }, { "body": { - "id": 4486, + "id": 4538, "nodeType": "Block", "src": "6320:57:22", "statements": [ @@ -21719,11 +21719,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4481, + "id": 4533, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4470, + "referencedDeclaration": 4522, "src": "6356:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21732,11 +21732,11 @@ }, { "argumentTypes": null, - "id": 4482, + "id": 4534, "name": "dst", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4472, + "referencedDeclaration": 4524, "src": "6361:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21745,11 +21745,11 @@ }, { "argumentTypes": null, - "id": 4483, + "id": 4535, "name": "wad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4474, + "referencedDeclaration": 4526, "src": "6366:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -21777,11 +21777,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4478, + "id": 4530, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4468, + "referencedDeclaration": 4520, "src": "6342:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -21796,18 +21796,18 @@ "typeString": "address" } ], - "id": 4477, + "id": 4529, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6330:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4479, + "id": 4531, "isConstant": false, "isLValue": false, "isPure": false, @@ -21817,25 +21817,25 @@ "nodeType": "FunctionCall", "src": "6330:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4480, + "id": 4532, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "flux", "nodeType": "MemberAccess", - "referencedDeclaration": 3910, + "referencedDeclaration": 3962, "src": "6330:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (uint256,address,uint256) external" } }, - "id": 4484, + "id": 4536, "isConstant": false, "isLValue": false, "isPure": false, @@ -21849,29 +21849,29 @@ "typeString": "tuple()" } }, - "id": 4485, + "id": 4537, "nodeType": "ExpressionStatement", "src": "6330:40:22" } ] }, "documentation": null, - "id": 4487, + "id": 4539, "implemented": true, "kind": "function", "modifiers": [], "name": "flux", "nodeType": "FunctionDefinition", "parameters": { - "id": 4475, + "id": 4527, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4468, + "id": 4520, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6234:15:22", "stateVariable": false, "storageLocation": "default", @@ -21880,7 +21880,7 @@ "typeString": "address" }, "typeName": { - "id": 4467, + "id": 4519, "name": "address", "nodeType": "ElementaryTypeName", "src": "6234:7:22", @@ -21895,10 +21895,10 @@ }, { "constant": false, - "id": 4470, + "id": 4522, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6259:8:22", "stateVariable": false, "storageLocation": "default", @@ -21907,7 +21907,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4469, + "id": 4521, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6259:4:22", @@ -21921,10 +21921,10 @@ }, { "constant": false, - "id": 4472, + "id": 4524, "name": "dst", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6277:11:22", "stateVariable": false, "storageLocation": "default", @@ -21933,7 +21933,7 @@ "typeString": "address" }, "typeName": { - "id": 4471, + "id": 4523, "name": "address", "nodeType": "ElementaryTypeName", "src": "6277:7:22", @@ -21948,10 +21948,10 @@ }, { "constant": false, - "id": 4474, + "id": 4526, "name": "wad", "nodeType": "VariableDeclaration", - "scope": 4487, + "scope": 4539, "src": "6298:8:22", "stateVariable": false, "storageLocation": "default", @@ -21960,7 +21960,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4473, + "id": 4525, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6298:4:22", @@ -21976,12 +21976,12 @@ "src": "6224:88:22" }, "returnParameters": { - "id": 4476, + "id": 4528, "nodeType": "ParameterList", "parameters": [], "src": "6320:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6211:166:22", "stateMutability": "nonpayable", "superFunction": null, @@ -21989,7 +21989,7 @@ }, { "body": { - "id": 4507, + "id": 4559, "nodeType": "Block", "src": "6489:59:22", "statements": [ @@ -21999,11 +21999,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4502, + "id": 4554, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4491, + "referencedDeclaration": 4543, "src": "6525:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22012,11 +22012,11 @@ }, { "argumentTypes": null, - "id": 4503, + "id": 4555, "name": "dink", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4493, + "referencedDeclaration": 4545, "src": "6530:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -22025,11 +22025,11 @@ }, { "argumentTypes": null, - "id": 4504, + "id": 4556, "name": "dart", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4495, + "referencedDeclaration": 4547, "src": "6536:4:22", "typeDescriptions": { "typeIdentifier": "t_int256", @@ -22057,11 +22057,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4499, + "id": 4551, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4489, + "referencedDeclaration": 4541, "src": "6511:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22076,18 +22076,18 @@ "typeString": "address" } ], - "id": 4498, + "id": 4550, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6499:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4500, + "id": 4552, "isConstant": false, "isLValue": false, "isPure": false, @@ -22097,25 +22097,25 @@ "nodeType": "FunctionCall", "src": "6499:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4501, + "id": 4553, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "frob", "nodeType": "MemberAccess", - "referencedDeclaration": 3901, + "referencedDeclaration": 3953, "src": "6499:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (uint256,int256,int256) external" } }, - "id": 4505, + "id": 4557, "isConstant": false, "isLValue": false, "isPure": false, @@ -22129,29 +22129,29 @@ "typeString": "tuple()" } }, - "id": 4506, + "id": 4558, "nodeType": "ExpressionStatement", "src": "6499:42:22" } ] }, "documentation": null, - "id": 4508, + "id": 4560, "implemented": true, "kind": "function", "modifiers": [], "name": "frob", "nodeType": "FunctionDefinition", "parameters": { - "id": 4496, + "id": 4548, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4489, + "id": 4541, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6406:15:22", "stateVariable": false, "storageLocation": "default", @@ -22160,7 +22160,7 @@ "typeString": "address" }, "typeName": { - "id": 4488, + "id": 4540, "name": "address", "nodeType": "ElementaryTypeName", "src": "6406:7:22", @@ -22175,10 +22175,10 @@ }, { "constant": false, - "id": 4491, + "id": 4543, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6431:8:22", "stateVariable": false, "storageLocation": "default", @@ -22187,7 +22187,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4490, + "id": 4542, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6431:4:22", @@ -22201,10 +22201,10 @@ }, { "constant": false, - "id": 4493, + "id": 4545, "name": "dink", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6449:8:22", "stateVariable": false, "storageLocation": "default", @@ -22213,7 +22213,7 @@ "typeString": "int256" }, "typeName": { - "id": 4492, + "id": 4544, "name": "int", "nodeType": "ElementaryTypeName", "src": "6449:3:22", @@ -22227,10 +22227,10 @@ }, { "constant": false, - "id": 4495, + "id": 4547, "name": "dart", "nodeType": "VariableDeclaration", - "scope": 4508, + "scope": 4560, "src": "6467:8:22", "stateVariable": false, "storageLocation": "default", @@ -22239,7 +22239,7 @@ "typeString": "int256" }, "typeName": { - "id": 4494, + "id": 4546, "name": "int", "nodeType": "ElementaryTypeName", "src": "6467:3:22", @@ -22255,12 +22255,12 @@ "src": "6396:85:22" }, "returnParameters": { - "id": 4497, + "id": 4549, "nodeType": "ParameterList", "parameters": [], "src": "6489:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6383:165:22", "stateMutability": "nonpayable", "superFunction": null, @@ -22268,21 +22268,21 @@ }, { "body": { - "id": 4609, + "id": 4661, "nodeType": "Block", "src": "6706:904:22", "statements": [ { "assignments": [ - 4522 + 4574 ], "declarations": [ { "constant": false, - "id": 4522, + "id": 4574, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6716:11:22", "stateVariable": false, "storageLocation": "default", @@ -22291,7 +22291,7 @@ "typeString": "address" }, "typeName": { - "id": 4521, + "id": 4573, "name": "address", "nodeType": "ElementaryTypeName", "src": "6716:7:22", @@ -22305,7 +22305,7 @@ "visibility": "internal" } ], - "id": 4528, + "id": 4580, "initialValue": { "argumentTypes": null, "arguments": [], @@ -22316,11 +22316,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4524, + "id": 4576, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6742:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22335,18 +22335,18 @@ "typeString": "address" } ], - "id": 4523, + "id": 4575, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6730:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4525, + "id": 4577, "isConstant": false, "isLValue": false, "isPure": false, @@ -22356,25 +22356,25 @@ "nodeType": "FunctionCall", "src": "6730:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4526, + "id": 4578, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "6730:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4527, + "id": 4579, "isConstant": false, "isLValue": false, "isPure": false, @@ -22393,15 +22393,15 @@ }, { "assignments": [ - 4530 + 4582 ], "declarations": [ { "constant": false, - "id": 4530, + "id": 4582, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6766:11:22", "stateVariable": false, "storageLocation": "default", @@ -22410,7 +22410,7 @@ "typeString": "address" }, "typeName": { - "id": 4529, + "id": 4581, "name": "address", "nodeType": "ElementaryTypeName", "src": "6766:7:22", @@ -22424,17 +22424,17 @@ "visibility": "internal" } ], - "id": 4537, + "id": 4589, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4535, + "id": 4587, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6806:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22454,11 +22454,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4532, + "id": 4584, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6792:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22473,18 +22473,18 @@ "typeString": "address" } ], - "id": 4531, + "id": 4583, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6780:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4533, + "id": 4585, "isConstant": false, "isLValue": false, "isPure": false, @@ -22494,25 +22494,25 @@ "nodeType": "FunctionCall", "src": "6780:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4534, + "id": 4586, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "6780:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4536, + "id": 4588, "isConstant": false, "isLValue": false, "isPure": false, @@ -22531,15 +22531,15 @@ }, { "assignments": [ - 4539 + 4591 ], "declarations": [ { "constant": false, - "id": 4539, + "id": 4591, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6820:11:22", "stateVariable": false, "storageLocation": "default", @@ -22548,7 +22548,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4538, + "id": 4590, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "6820:7:22", @@ -22561,17 +22561,17 @@ "visibility": "internal" } ], - "id": 4546, + "id": 4598, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4544, + "id": 4596, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "6860:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -22591,11 +22591,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4541, + "id": 4593, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "6846:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22610,18 +22610,18 @@ "typeString": "address" } ], - "id": 4540, + "id": 4592, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "6834:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4542, + "id": 4594, "isConstant": false, "isLValue": false, "isPure": false, @@ -22631,25 +22631,25 @@ "nodeType": "FunctionCall", "src": "6834:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4543, + "id": 4595, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "6834:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4545, + "id": 4597, "isConstant": false, "isLValue": false, "isPure": false, @@ -22669,16 +22669,16 @@ { "assignments": [ null, - 4548 + 4600 ], "declarations": [ null, { "constant": false, - "id": 4548, + "id": 4600, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4609, + "scope": 4661, "src": "6877:8:22", "stateVariable": false, "storageLocation": "default", @@ -22687,7 +22687,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4547, + "id": 4599, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6877:4:22", @@ -22700,17 +22700,17 @@ "visibility": "internal" } ], - "id": 4556, + "id": 4608, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4553, + "id": 4605, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "6907:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22719,11 +22719,11 @@ }, { "argumentTypes": null, - "id": 4554, + "id": 4606, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6912:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22747,11 +22747,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4550, + "id": 4602, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "6897:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22766,18 +22766,18 @@ "typeString": "address" } ], - "id": 4549, + "id": 4601, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "6889:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4551, + "id": 4603, "isConstant": false, "isLValue": false, "isPure": false, @@ -22787,25 +22787,25 @@ "nodeType": "FunctionCall", "src": "6889:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4552, + "id": 4604, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "6889:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4555, + "id": 4607, "isConstant": false, "isLValue": false, "isPure": false, @@ -22828,11 +22828,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4558, + "id": 4610, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4514, + "referencedDeclaration": 4566, "src": "6981:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22841,11 +22841,11 @@ }, { "argumentTypes": null, - "id": 4559, + "id": 4611, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "6990:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22857,11 +22857,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4561, + "id": 4613, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4522, + "referencedDeclaration": 4574, "src": "7010:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22870,11 +22870,11 @@ }, { "argumentTypes": null, - "id": 4562, + "id": 4614, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7015:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22883,11 +22883,11 @@ }, { "argumentTypes": null, - "id": 4563, + "id": 4615, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4530, + "referencedDeclaration": 4582, "src": "7020:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -22896,11 +22896,11 @@ }, { "argumentTypes": null, - "id": 4564, + "id": 4616, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4539, + "referencedDeclaration": 4591, "src": "7025:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -22927,18 +22927,18 @@ "typeString": "bytes32" } ], - "id": 4560, + "id": 4612, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "6995:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4565, + "id": 4617, "isConstant": false, "isLValue": false, "isPure": false, @@ -22968,18 +22968,18 @@ "typeString": "uint256" } ], - "id": 4557, + "id": 4609, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "6968:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4566, + "id": 4618, "isConstant": false, "isLValue": false, "isPure": false, @@ -22993,7 +22993,7 @@ "typeString": "tuple()" } }, - "id": 4567, + "id": 4619, "nodeType": "ExpressionStatement", "src": "6968:62:22" }, @@ -23003,11 +23003,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4569, + "id": 4621, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7126:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23016,11 +23016,11 @@ }, { "argumentTypes": null, - "id": 4570, + "id": 4622, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7147:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23029,7 +23029,7 @@ }, { "argumentTypes": null, - "id": 4574, + "id": 4626, "isConstant": false, "isLValue": false, "isPure": false, @@ -23043,11 +23043,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4572, + "id": 4624, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7171:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23062,18 +23062,18 @@ "typeString": "uint256" } ], - "id": 4571, + "id": 4623, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "7165:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4573, + "id": 4625, "isConstant": false, "isLValue": false, "isPure": false, @@ -23094,7 +23094,7 @@ }, { "argumentTypes": null, - "id": 4578, + "id": 4630, "isConstant": false, "isLValue": false, "isPure": false, @@ -23108,11 +23108,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4576, + "id": 4628, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4548, + "referencedDeclaration": 4600, "src": "7195:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23127,7 +23127,7 @@ "typeString": "uint256" } ], - "id": 4575, + "id": 4627, "isConstant": false, "isLValue": false, "isPure": true, @@ -23140,7 +23140,7 @@ }, "typeName": "int" }, - "id": 4577, + "id": 4629, "isConstant": false, "isLValue": false, "isPure": false, @@ -23179,18 +23179,18 @@ "typeString": "int256" } ], - "id": 4568, + "id": 4620, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "7108:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4579, + "id": 4631, "isConstant": false, "isLValue": false, "isPure": false, @@ -23204,7 +23204,7 @@ "typeString": "tuple()" } }, - "id": 4580, + "id": 4632, "nodeType": "ExpressionStatement", "src": "7108:101:22" }, @@ -23214,11 +23214,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4582, + "id": 4634, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4510, + "referencedDeclaration": 4562, "src": "7288:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23227,11 +23227,11 @@ }, { "argumentTypes": null, - "id": 4583, + "id": 4635, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4516, + "referencedDeclaration": 4568, "src": "7297:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23243,14 +23243,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4585, + "id": 4637, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7310:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23258,11 +23258,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4584, + "id": 4636, "isConstant": false, "isLValue": false, "isPure": true, @@ -23275,7 +23275,7 @@ }, "typeName": "address" }, - "id": 4586, + "id": 4638, "isConstant": false, "isLValue": false, "isPure": false, @@ -23291,11 +23291,11 @@ }, { "argumentTypes": null, - "id": 4587, + "id": 4639, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7317:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23322,18 +23322,18 @@ "typeString": "uint256" } ], - "id": 4581, + "id": 4633, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "7283:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4588, + "id": 4640, "isConstant": false, "isLValue": false, "isPure": false, @@ -23347,7 +23347,7 @@ "typeString": "tuple()" } }, - "id": 4589, + "id": 4641, "nodeType": "ExpressionStatement", "src": "7283:39:22" }, @@ -23360,14 +23360,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4595, + "id": 4647, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "7423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -23375,11 +23375,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4594, + "id": 4646, "isConstant": false, "isLValue": false, "isPure": true, @@ -23392,7 +23392,7 @@ }, "typeName": "address" }, - "id": 4596, + "id": 4648, "isConstant": false, "isLValue": false, "isPure": false, @@ -23408,11 +23408,11 @@ }, { "argumentTypes": null, - "id": 4597, + "id": 4649, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7430:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23436,11 +23436,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4591, + "id": 4643, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23455,18 +23455,18 @@ "typeString": "address" } ], - "id": 4590, + "id": 4642, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7389:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4592, + "id": 4644, "isConstant": false, "isLValue": false, "isPure": false, @@ -23476,25 +23476,25 @@ "nodeType": "FunctionCall", "src": "7389:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4593, + "id": 4645, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "7389:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4598, + "id": 4650, "isConstant": false, "isLValue": false, "isPure": false, @@ -23508,7 +23508,7 @@ "typeString": "tuple()" } }, - "id": 4599, + "id": 4651, "nodeType": "ExpressionStatement", "src": "7389:46:22" }, @@ -23518,11 +23518,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4606, + "id": 4658, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4518, + "referencedDeclaration": 4570, "src": "7513:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -23547,11 +23547,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4601, + "id": 4653, "name": "ethJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4512, + "referencedDeclaration": 4564, "src": "7489:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23566,18 +23566,18 @@ "typeString": "address" } ], - "id": 4600, + "id": 4652, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "7477:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4602, + "id": 4654, "isConstant": false, "isLValue": false, "isPure": false, @@ -23587,25 +23587,25 @@ "nodeType": "FunctionCall", "src": "7477:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4603, + "id": 4655, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "gem", "nodeType": "MemberAccess", - "referencedDeclaration": 4034, + "referencedDeclaration": 4086, "src": "7477:24:22", "typeDescriptions": { - "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3823_$", + "typeIdentifier": "t_function_external_nonpayable$__$returns$_t_contract$_GemLike_$3875_$", "typeString": "function () external returns (contract GemLike)" } }, - "id": 4604, + "id": 4656, "isConstant": false, "isLValue": false, "isPure": false, @@ -23615,25 +23615,25 @@ "nodeType": "FunctionCall", "src": "7477:26:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemLike_$3823", + "typeIdentifier": "t_contract$_GemLike_$3875", "typeString": "contract GemLike" } }, - "id": 4605, + "id": 4657, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "withdraw", "nodeType": "MemberAccess", - "referencedDeclaration": 3822, + "referencedDeclaration": 3874, "src": "7477:35:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" } }, - "id": 4607, + "id": 4659, "isConstant": false, "isLValue": false, "isPure": false, @@ -23647,29 +23647,29 @@ "typeString": "tuple()" } }, - "id": 4608, + "id": 4660, "nodeType": "ExpressionStatement", "src": "7477:41:22" } ] }, "documentation": null, - "id": 4610, + "id": 4662, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeETH", "nodeType": "FunctionDefinition", "parameters": { - "id": 4519, + "id": 4571, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4510, + "id": 4562, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6590:15:22", "stateVariable": false, "storageLocation": "default", @@ -23678,7 +23678,7 @@ "typeString": "address" }, "typeName": { - "id": 4509, + "id": 4561, "name": "address", "nodeType": "ElementaryTypeName", "src": "6590:7:22", @@ -23693,10 +23693,10 @@ }, { "constant": false, - "id": 4512, + "id": 4564, "name": "ethJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6615:15:22", "stateVariable": false, "storageLocation": "default", @@ -23705,7 +23705,7 @@ "typeString": "address" }, "typeName": { - "id": 4511, + "id": 4563, "name": "address", "nodeType": "ElementaryTypeName", "src": "6615:7:22", @@ -23720,10 +23720,10 @@ }, { "constant": false, - "id": 4514, + "id": 4566, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6640:15:22", "stateVariable": false, "storageLocation": "default", @@ -23732,7 +23732,7 @@ "typeString": "address" }, "typeName": { - "id": 4513, + "id": 4565, "name": "address", "nodeType": "ElementaryTypeName", "src": "6640:7:22", @@ -23747,10 +23747,10 @@ }, { "constant": false, - "id": 4516, + "id": 4568, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6665:8:22", "stateVariable": false, "storageLocation": "default", @@ -23759,7 +23759,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4515, + "id": 4567, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6665:4:22", @@ -23773,10 +23773,10 @@ }, { "constant": false, - "id": 4518, + "id": 4570, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4610, + "scope": 4662, "src": "6683:9:22", "stateVariable": false, "storageLocation": "default", @@ -23785,7 +23785,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4517, + "id": 4569, "name": "uint", "nodeType": "ElementaryTypeName", "src": "6683:4:22", @@ -23801,12 +23801,12 @@ "src": "6580:118:22" }, "returnParameters": { - "id": 4520, + "id": 4572, "nodeType": "ParameterList", "parameters": [], "src": "6706:0:22" }, - "scope": 4711, + "scope": 4763, "src": "6554:1056:22", "stateMutability": "nonpayable", "superFunction": null, @@ -23814,21 +23814,21 @@ }, { "body": { - "id": 4709, + "id": 4761, "nodeType": "Block", "src": "7768:793:22", "statements": [ { "assignments": [ - 4624 + 4676 ], "declarations": [ { "constant": false, - "id": 4624, + "id": 4676, "name": "vat", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7778:11:22", "stateVariable": false, "storageLocation": "default", @@ -23837,7 +23837,7 @@ "typeString": "address" }, "typeName": { - "id": 4623, + "id": 4675, "name": "address", "nodeType": "ElementaryTypeName", "src": "7778:7:22", @@ -23851,7 +23851,7 @@ "visibility": "internal" } ], - "id": 4630, + "id": 4682, "initialValue": { "argumentTypes": null, "arguments": [], @@ -23862,11 +23862,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4626, + "id": 4678, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7804:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -23881,18 +23881,18 @@ "typeString": "address" } ], - "id": 4625, + "id": 4677, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7792:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4627, + "id": 4679, "isConstant": false, "isLValue": false, "isPure": false, @@ -23902,25 +23902,25 @@ "nodeType": "FunctionCall", "src": "7792:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4628, + "id": 4680, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "vat", "nodeType": "MemberAccess", - "referencedDeclaration": 3860, + "referencedDeclaration": 3912, "src": "7792:24:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", "typeString": "function () view external returns (address)" } }, - "id": 4629, + "id": 4681, "isConstant": false, "isLValue": false, "isPure": false, @@ -23939,15 +23939,15 @@ }, { "assignments": [ - 4632 + 4684 ], "declarations": [ { "constant": false, - "id": 4632, + "id": 4684, "name": "urn", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7828:11:22", "stateVariable": false, "storageLocation": "default", @@ -23956,7 +23956,7 @@ "typeString": "address" }, "typeName": { - "id": 4631, + "id": 4683, "name": "address", "nodeType": "ElementaryTypeName", "src": "7828:7:22", @@ -23970,17 +23970,17 @@ "visibility": "internal" } ], - "id": 4639, + "id": 4691, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4637, + "id": 4689, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7868:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24000,11 +24000,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4634, + "id": 4686, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7854:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24019,18 +24019,18 @@ "typeString": "address" } ], - "id": 4633, + "id": 4685, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7842:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4635, + "id": 4687, "isConstant": false, "isLValue": false, "isPure": false, @@ -24040,25 +24040,25 @@ "nodeType": "FunctionCall", "src": "7842:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4636, + "id": 4688, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3855, + "referencedDeclaration": 3907, "src": "7842:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_address_$", "typeString": "function (uint256) view external returns (address)" } }, - "id": 4638, + "id": 4690, "isConstant": false, "isLValue": false, "isPure": false, @@ -24077,15 +24077,15 @@ }, { "assignments": [ - 4641 + 4693 ], "declarations": [ { "constant": false, - "id": 4641, + "id": 4693, "name": "ilk", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7882:11:22", "stateVariable": false, "storageLocation": "default", @@ -24094,7 +24094,7 @@ "typeString": "bytes32" }, "typeName": { - "id": 4640, + "id": 4692, "name": "bytes32", "nodeType": "ElementaryTypeName", "src": "7882:7:22", @@ -24107,17 +24107,17 @@ "visibility": "internal" } ], - "id": 4648, + "id": 4700, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4646, + "id": 4698, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "7922:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24137,11 +24137,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4643, + "id": 4695, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "7908:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24156,18 +24156,18 @@ "typeString": "address" } ], - "id": 4642, + "id": 4694, "name": "ManagerLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 3952, + "referencedDeclaration": 4004, "src": "7896:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_ManagerLike_$3952_$", + "typeIdentifier": "t_type$_t_contract$_ManagerLike_$4004_$", "typeString": "type(contract ManagerLike)" } }, - "id": 4644, + "id": 4696, "isConstant": false, "isLValue": false, "isPure": false, @@ -24177,25 +24177,25 @@ "nodeType": "FunctionCall", "src": "7896:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_ManagerLike_$3952", + "typeIdentifier": "t_contract$_ManagerLike_$4004", "typeString": "contract ManagerLike" } }, - "id": 4645, + "id": 4697, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "ilks", "nodeType": "MemberAccess", - "referencedDeclaration": 3841, + "referencedDeclaration": 3893, "src": "7896:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_uint256_$returns$_t_bytes32_$", "typeString": "function (uint256) view external returns (bytes32)" } }, - "id": 4647, + "id": 4699, "isConstant": false, "isLValue": false, "isPure": false, @@ -24215,16 +24215,16 @@ { "assignments": [ null, - 4650 + 4702 ], "declarations": [ null, { "constant": false, - "id": 4650, + "id": 4702, "name": "art", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "7939:8:22", "stateVariable": false, "storageLocation": "default", @@ -24233,7 +24233,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4649, + "id": 4701, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7939:4:22", @@ -24246,17 +24246,17 @@ "visibility": "internal" } ], - "id": 4658, + "id": 4710, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4655, + "id": 4707, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "7969:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24265,11 +24265,11 @@ }, { "argumentTypes": null, - "id": 4656, + "id": 4708, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "7974:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24293,11 +24293,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4652, + "id": 4704, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "7959:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24312,18 +24312,18 @@ "typeString": "address" } ], - "id": 4651, + "id": 4703, "name": "VatLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4024, + "referencedDeclaration": 4076, "src": "7951:7:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_VatLike_$4024_$", + "typeIdentifier": "t_type$_t_contract$_VatLike_$4076_$", "typeString": "type(contract VatLike)" } }, - "id": 4653, + "id": 4705, "isConstant": false, "isLValue": false, "isPure": false, @@ -24333,25 +24333,25 @@ "nodeType": "FunctionCall", "src": "7951:12:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_VatLike_$4024", + "typeIdentifier": "t_contract$_VatLike_$4076", "typeString": "contract VatLike" } }, - "id": 4654, + "id": 4706, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "urns", "nodeType": "MemberAccess", - "referencedDeclaration": 3994, + "referencedDeclaration": 4046, "src": "7951:17:22", "typeDescriptions": { "typeIdentifier": "t_function_external_view$_t_bytes32_$_t_address_$returns$_t_uint256_$_t_uint256_$", "typeString": "function (bytes32,address) view external returns (uint256,uint256)" } }, - "id": 4657, + "id": 4709, "isConstant": false, "isLValue": false, "isPure": false, @@ -24374,11 +24374,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4660, + "id": 4712, "name": "daiJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4616, + "referencedDeclaration": 4668, "src": "8043:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24387,11 +24387,11 @@ }, { "argumentTypes": null, - "id": 4661, + "id": 4713, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8052:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24403,11 +24403,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4663, + "id": 4715, "name": "vat", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4624, + "referencedDeclaration": 4676, "src": "8072:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24416,11 +24416,11 @@ }, { "argumentTypes": null, - "id": 4664, + "id": 4716, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8077:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24429,11 +24429,11 @@ }, { "argumentTypes": null, - "id": 4665, + "id": 4717, "name": "urn", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4632, + "referencedDeclaration": 4684, "src": "8082:3:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24442,11 +24442,11 @@ }, { "argumentTypes": null, - "id": 4666, + "id": 4718, "name": "ilk", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4641, + "referencedDeclaration": 4693, "src": "8087:3:22", "typeDescriptions": { "typeIdentifier": "t_bytes32", @@ -24473,18 +24473,18 @@ "typeString": "bytes32" } ], - "id": 4662, + "id": 4714, "name": "_getWipeAllWad", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4405, + "referencedDeclaration": 4457, "src": "8057:14:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_address_$_t_address_$_t_address_$_t_bytes32_$returns$_t_uint256_$", "typeString": "function (address,address,address,bytes32) view returns (uint256)" } }, - "id": 4667, + "id": 4719, "isConstant": false, "isLValue": false, "isPure": false, @@ -24514,18 +24514,18 @@ "typeString": "uint256" } ], - "id": 4659, + "id": 4711, "name": "daiJoin_join", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4143, + "referencedDeclaration": 4195, "src": "8030:12:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,address,uint256)" } }, - "id": 4668, + "id": 4720, "isConstant": false, "isLValue": false, "isPure": false, @@ -24539,21 +24539,21 @@ "typeString": "tuple()" } }, - "id": 4669, + "id": 4721, "nodeType": "ExpressionStatement", "src": "8030:62:22" }, { "assignments": [ - 4671 + 4723 ], "declarations": [ { "constant": false, - "id": 4671, + "id": 4723, "name": "wad18", "nodeType": "VariableDeclaration", - "scope": 4709, + "scope": 4761, "src": "8102:10:22", "stateVariable": false, "storageLocation": "default", @@ -24562,7 +24562,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4670, + "id": 4722, "name": "uint", "nodeType": "ElementaryTypeName", "src": "8102:4:22", @@ -24575,17 +24575,17 @@ "visibility": "internal" } ], - "id": 4676, + "id": 4728, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 4673, + "id": 4725, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8127:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24594,11 +24594,11 @@ }, { "argumentTypes": null, - "id": 4674, + "id": 4726, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8136:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24617,18 +24617,18 @@ "typeString": "uint256" } ], - "id": 4672, + "id": 4724, "name": "convertTo18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4232, + "referencedDeclaration": 4284, "src": "8115:11:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$_t_uint256_$", "typeString": "function (address,uint256) returns (uint256)" } }, - "id": 4675, + "id": 4727, "isConstant": false, "isLValue": false, "isPure": false, @@ -24651,11 +24651,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4678, + "id": 4730, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8238:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24664,11 +24664,11 @@ }, { "argumentTypes": null, - "id": 4679, + "id": 4731, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8259:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24677,7 +24677,7 @@ }, { "argumentTypes": null, - "id": 4683, + "id": 4735, "isConstant": false, "isLValue": false, "isPure": false, @@ -24691,11 +24691,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4681, + "id": 4733, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8283:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24710,18 +24710,18 @@ "typeString": "uint256" } ], - "id": 4680, + "id": 4732, "name": "toInt", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4189, + "referencedDeclaration": 4241, "src": "8277:5:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$returns$_t_int256_$", "typeString": "function (uint256) pure returns (int256)" } }, - "id": 4682, + "id": 4734, "isConstant": false, "isLValue": false, "isPure": false, @@ -24742,7 +24742,7 @@ }, { "argumentTypes": null, - "id": 4687, + "id": 4739, "isConstant": false, "isLValue": false, "isPure": false, @@ -24756,11 +24756,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4685, + "id": 4737, "name": "art", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4650, + "referencedDeclaration": 4702, "src": "8308:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24775,7 +24775,7 @@ "typeString": "uint256" } ], - "id": 4684, + "id": 4736, "isConstant": false, "isLValue": false, "isPure": true, @@ -24788,7 +24788,7 @@ }, "typeName": "int" }, - "id": 4686, + "id": 4738, "isConstant": false, "isLValue": false, "isPure": false, @@ -24827,18 +24827,18 @@ "typeString": "int256" } ], - "id": 4677, + "id": 4729, "name": "frob", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4508, + "referencedDeclaration": 4560, "src": "8220:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_int256_$_t_int256_$returns$__$", "typeString": "function (address,uint256,int256,int256)" } }, - "id": 4688, + "id": 4740, "isConstant": false, "isLValue": false, "isPure": false, @@ -24852,7 +24852,7 @@ "typeString": "tuple()" } }, - "id": 4689, + "id": 4741, "nodeType": "ExpressionStatement", "src": "8220:102:22" }, @@ -24862,11 +24862,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4691, + "id": 4743, "name": "manager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4612, + "referencedDeclaration": 4664, "src": "8401:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -24875,11 +24875,11 @@ }, { "argumentTypes": null, - "id": 4692, + "id": 4744, "name": "cdp", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4618, + "referencedDeclaration": 4670, "src": "8410:3:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24891,14 +24891,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4694, + "id": 4746, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8423:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -24906,11 +24906,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4693, + "id": 4745, "isConstant": false, "isLValue": false, "isPure": true, @@ -24923,7 +24923,7 @@ }, "typeName": "address" }, - "id": 4695, + "id": 4747, "isConstant": false, "isLValue": false, "isPure": false, @@ -24939,11 +24939,11 @@ }, { "argumentTypes": null, - "id": 4696, + "id": 4748, "name": "wad18", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4671, + "referencedDeclaration": 4723, "src": "8430:5:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -24970,18 +24970,18 @@ "typeString": "uint256" } ], - "id": 4690, + "id": 4742, "name": "flux", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4487, + "referencedDeclaration": 4539, "src": "8396:4:22", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256,address,uint256)" } }, - "id": 4697, + "id": 4749, "isConstant": false, "isLValue": false, "isPure": false, @@ -24995,7 +24995,7 @@ "typeString": "tuple()" } }, - "id": 4698, + "id": 4750, "nodeType": "ExpressionStatement", "src": "8396:40:22" }, @@ -25008,14 +25008,14 @@ "arguments": [ { "argumentTypes": null, - "id": 4704, + "id": 4756, "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 7915, + "referencedDeclaration": 7906, "src": "8542:4:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } } @@ -25023,11 +25023,11 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_DssProxyActionsBase_$4711", + "typeIdentifier": "t_contract$_DssProxyActionsBase_$4763", "typeString": "contract DssProxyActionsBase" } ], - "id": 4703, + "id": 4755, "isConstant": false, "isLValue": false, "isPure": true, @@ -25040,7 +25040,7 @@ }, "typeName": "address" }, - "id": 4705, + "id": 4757, "isConstant": false, "isLValue": false, "isPure": false, @@ -25056,11 +25056,11 @@ }, { "argumentTypes": null, - "id": 4706, + "id": 4758, "name": "wadC", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4620, + "referencedDeclaration": 4672, "src": "8549:4:22", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -25084,11 +25084,11 @@ "arguments": [ { "argumentTypes": null, - "id": 4700, + "id": 4752, "name": "gemJoin", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4614, + "referencedDeclaration": 4666, "src": "8520:7:22", "typeDescriptions": { "typeIdentifier": "t_address", @@ -25103,18 +25103,18 @@ "typeString": "address" } ], - "id": 4699, + "id": 4751, "name": "GemJoinLike", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 4049, + "referencedDeclaration": 4101, "src": "8508:11:22", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4049_$", + "typeIdentifier": "t_type$_t_contract$_GemJoinLike_$4101_$", "typeString": "type(contract GemJoinLike)" } }, - "id": 4701, + "id": 4753, "isConstant": false, "isLValue": false, "isPure": false, @@ -25124,25 +25124,25 @@ "nodeType": "FunctionCall", "src": "8508:20:22", "typeDescriptions": { - "typeIdentifier": "t_contract$_GemJoinLike_$4049", + "typeIdentifier": "t_contract$_GemJoinLike_$4101", "typeString": "contract GemJoinLike" } }, - "id": 4702, + "id": 4754, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "exit", "nodeType": "MemberAccess", - "referencedDeclaration": 4048, + "referencedDeclaration": 4100, "src": "8508:25:22", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256) external" } }, - "id": 4707, + "id": 4759, "isConstant": false, "isLValue": false, "isPure": false, @@ -25156,29 +25156,29 @@ "typeString": "tuple()" } }, - "id": 4708, + "id": 4760, "nodeType": "ExpressionStatement", "src": "8508:46:22" } ] }, "documentation": null, - "id": 4710, + "id": 4762, "implemented": true, "kind": "function", "modifiers": [], "name": "wipeAllAndFreeGem", "nodeType": "FunctionDefinition", "parameters": { - "id": 4621, + "id": 4673, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 4612, + "id": 4664, "name": "manager", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7652:15:22", "stateVariable": false, "storageLocation": "default", @@ -25187,7 +25187,7 @@ "typeString": "address" }, "typeName": { - "id": 4611, + "id": 4663, "name": "address", "nodeType": "ElementaryTypeName", "src": "7652:7:22", @@ -25202,10 +25202,10 @@ }, { "constant": false, - "id": 4614, + "id": 4666, "name": "gemJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7677:15:22", "stateVariable": false, "storageLocation": "default", @@ -25214,7 +25214,7 @@ "typeString": "address" }, "typeName": { - "id": 4613, + "id": 4665, "name": "address", "nodeType": "ElementaryTypeName", "src": "7677:7:22", @@ -25229,10 +25229,10 @@ }, { "constant": false, - "id": 4616, + "id": 4668, "name": "daiJoin", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7702:15:22", "stateVariable": false, "storageLocation": "default", @@ -25241,7 +25241,7 @@ "typeString": "address" }, "typeName": { - "id": 4615, + "id": 4667, "name": "address", "nodeType": "ElementaryTypeName", "src": "7702:7:22", @@ -25256,10 +25256,10 @@ }, { "constant": false, - "id": 4618, + "id": 4670, "name": "cdp", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7727:8:22", "stateVariable": false, "storageLocation": "default", @@ -25268,7 +25268,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4617, + "id": 4669, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7727:4:22", @@ -25282,10 +25282,10 @@ }, { "constant": false, - "id": 4620, + "id": 4672, "name": "wadC", "nodeType": "VariableDeclaration", - "scope": 4710, + "scope": 4762, "src": "7745:9:22", "stateVariable": false, "storageLocation": "default", @@ -25294,7 +25294,7 @@ "typeString": "uint256" }, "typeName": { - "id": 4619, + "id": 4671, "name": "uint", "nodeType": "ElementaryTypeName", "src": "7745:4:22", @@ -25310,19 +25310,19 @@ "src": "7642:118:22" }, "returnParameters": { - "id": 4622, + "id": 4674, "nodeType": "ParameterList", "parameters": [], "src": "7768:0:22" }, - "scope": 4711, + "scope": 4763, "src": "7616:945:22", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 4712, + "scope": 4764, "src": "3076:5487:22" } ], @@ -25334,7 +25334,7 @@ }, "networks": {}, "schemaVersion": "3.0.23", - "updatedAt": "2020-04-03T06:25:13.605Z", + "updatedAt": "2020-04-08T12:21:13.870Z", "devdoc": { "methods": {} }, From 489bf55e26027fc9f9c2cf2b8f0e9d0747f66702 Mon Sep 17 00:00:00 2001 From: Kendrick Tan Date: Wed, 8 Apr 2020 22:28:07 +1000 Subject: [PATCH 10/11] reverted deployement scripts after mainnet deploy --- .../migrations/1_initial_migration.js | 2 +- .../smart-contracts/migrations/2_deploy_contracts.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/smart-contracts/migrations/1_initial_migration.js b/packages/smart-contracts/migrations/1_initial_migration.js index 0d92b02..ee2135d 100644 --- a/packages/smart-contracts/migrations/1_initial_migration.js +++ b/packages/smart-contracts/migrations/1_initial_migration.js @@ -1,5 +1,5 @@ const Migrations = artifacts.require("Migrations"); module.exports = function(deployer) { - deployer.deploy(Migrations, { overwrite: false }); + deployer.deploy(Migrations); }; diff --git a/packages/smart-contracts/migrations/2_deploy_contracts.js b/packages/smart-contracts/migrations/2_deploy_contracts.js index 9c15b8f..4c7b5df 100644 --- a/packages/smart-contracts/migrations/2_deploy_contracts.js +++ b/packages/smart-contracts/migrations/2_deploy_contracts.js @@ -9,12 +9,12 @@ const DedgeMakerManager = artifacts.require("DedgeMakerManager"); const AddressRegistry = artifacts.require("AddressRegistry"); module.exports = async deployer => { - await deployer.deploy(DACProxyFactory, { overwrite: false }) - await deployer.deploy(DedgeCompoundManager, { overwrite: true }) - await deployer.deploy(DedgeGeneralManager, { overwrite: false }) - await deployer.deploy(DedgeExitManager, { overwrite: false }) - await deployer.deploy(DedgeMakerManager, { overwrite: false }) - await deployer.deploy(AddressRegistry, { overwrite: false }) + await deployer.deploy(DACProxyFactory) + await deployer.deploy(DedgeCompoundManager) + await deployer.deploy(DedgeGeneralManager) + await deployer.deploy(DedgeExitManager) + await deployer.deploy(DedgeMakerManager) + await deployer.deploy(AddressRegistry) // Saves to a file if needed const data = JSON.stringify({ From 456578b78719487669940518240a841c57c16f29 Mon Sep 17 00:00:00 2001 From: Kendrick Tan Date: Thu, 9 Apr 2020 07:09:48 +1000 Subject: [PATCH 11/11] fixed swap debt toast --- packages/frontend/features/swap-tokens/useSwap.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/features/swap-tokens/useSwap.ts b/packages/frontend/features/swap-tokens/useSwap.ts index e376038..17c51f9 100644 --- a/packages/frontend/features/swap-tokens/useSwap.ts +++ b/packages/frontend/features/swap-tokens/useSwap.ts @@ -52,7 +52,7 @@ const useSwap = (thingToSwap, fromTokenStr, toTokenStr, amountToSwap) => { let tx = null; try { - await swapDebt( + tx = await swapDebt( ADDRESS_MAP[fromTokenStr], ADDRESS_MAP[toTokenStr], amount