diff --git a/client/contracts/ERC20Tornado.json b/client/contracts/ERC20Tornado.json index 75d2192..a3ec3d5 100644 --- a/client/contracts/ERC20Tornado.json +++ b/client/contracts/ERC20Tornado.json @@ -63,6 +63,44 @@ "name": "Deposit", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sender", + "type": "address" + }, + { + "indexed": false, + "internalType": "bytes", + "name": "encryptedNote", + "type": "bytes" + } + ], + "name": "EncryptedNote", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "previousOwner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "OwnershipTransferred", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -212,6 +250,11 @@ "internalType": "bytes32", "name": "_commitment", "type": "bytes32" + }, + { + "internalType": "bytes", + "name": "_encryptedNote", + "type": "bytes" } ], "name": "deposit", @@ -559,21 +602,21 @@ "type": "function" } ], - "metadata": "{\"compiler\":{\"version\":\"0.5.17+commit.d19bba13\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"contract IVerifier\",\"name\":\"_verifier\",\"type\":\"address\"},{\"internalType\":\"contract IFeeManager\",\"name\":\"_feeManager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_denomination\",\"type\":\"uint256\"},{\"internalType\":\"uint32\",\"name\":\"_merkleTreeHeight\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"_operator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_token\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"commitment\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"leafIndex\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"}],\"name\":\"Deposit\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"nullifierHash\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"relayer\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"fee\",\"type\":\"uint256\"}],\"name\":\"Withdrawal\",\"type\":\"event\"},{\"constant\":true,\"inputs\":[],\"name\":\"FIELD_SIZE\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"ROOT_HISTORY_SIZE\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"ZERO_VALUE\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newOperator\",\"type\":\"address\"}],\"name\":\"changeOperator\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"commitments\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"currentRootIndex\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"denomination\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_commitment\",\"type\":\"bytes32\"}],\"name\":\"deposit\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"feeManager\",\"outputs\":[{\"internalType\":\"contract IFeeManager\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"filledSubtrees\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"getLastRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_left\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"_right\",\"type\":\"bytes32\"}],\"name\":\"hashLeftRight\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"pure\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_root\",\"type\":\"bytes32\"}],\"name\":\"isKnownRoot\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_nullifierHash\",\"type\":\"bytes32\"}],\"name\":\"isSpent\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32[]\",\"name\":\"_nullifierHashes\",\"type\":\"bytes32[]\"}],\"name\":\"isSpentArray\",\"outputs\":[{\"internalType\":\"bool[]\",\"name\":\"spent\",\"type\":\"bool[]\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"levels\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"nextIndex\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"nullifierHashes\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"operator\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"roots\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"token\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newVerifier\",\"type\":\"address\"}],\"name\":\"updateVerifier\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"verifier\",\"outputs\":[{\"internalType\":\"contract IVerifier\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_proof\",\"type\":\"bytes\"},{\"internalType\":\"bytes32\",\"name\":\"_root\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"_nullifierHash\",\"type\":\"bytes32\"},{\"internalType\":\"address payable\",\"name\":\"_recipient\",\"type\":\"address\"},{\"internalType\":\"address payable\",\"name\":\"_relayer\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_refund\",\"type\":\"uint256\"}],\"name\":\"withdraw\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"zeros\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{\"changeOperator(address)\":{\"details\":\"operator can change his address \"},\"deposit(bytes32)\":{\"details\":\"Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\",\"params\":{\"_commitment\":\"the note commitment, which is PedersenHash(nullifier + secret)\"}},\"getLastRoot()\":{\"details\":\"Returns the last root\"},\"hashLeftRight(bytes32,bytes32)\":{\"details\":\"Hash 2 tree leaves, returns MiMC(_left, _right)\"},\"isKnownRoot(bytes32)\":{\"details\":\"Whether the root is present in the root history\"},\"isSpent(bytes32)\":{\"details\":\"whether a note is already spent \"},\"isSpentArray(bytes32[])\":{\"details\":\"whether an array of notes is already spent \"},\"updateVerifier(address)\":{\"details\":\"allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held. After that operator rights are supposed to be transferred to zero address\"},\"withdraw(bytes,bytes32,bytes32,address,address,uint256,uint256)\":{\"details\":\"Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs `input` array consists of: - merkle root of all deposits in the contract - hash of unique deposit nullifier to prevent double spends - the recipient of funds - optional fee that goes to the transaction sender (usually a relay)\"}}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/home/dotfiles/tornado-core/contracts/ERC20Tornado.sol\":\"ERC20Tornado\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/home/dotfiles/tornado-core/contracts/ERC20Tornado.sol\":{\"keccak256\":\"0xbd85f0da69a18b21440f06b5f8a595739d54b17bf7d1bc1fe8466b3a2a9c60f2\",\"urls\":[\"bzz-raw://46fa01fd0462818dbf879bc28e54d4ff42a6b633eb5e96c7fb6de480de8f1062\",\"dweb:/ipfs/QmY34nCA4m7WApU7ENTaJEzStCj1vjAB4evy2DFsEcevy5\"]},\"/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol\":{\"keccak256\":\"0x671cc9268dd70c47d18795f7e37fc4df11763fcbcca026edcf163f4239036254\",\"urls\":[\"bzz-raw://9c36a207ed164b60a514eae89bfb15e5b4de4b346c4a89a7a1cb50a940bc699d\",\"dweb:/ipfs/QmbPEqFJAGMpYduLEFsbPazyBsYWcjRtpth8X26wCHALwk\"]},\"/home/home/dotfiles/tornado-core/contracts/SafeMath.sol\":{\"keccak256\":\"0x92dbc60a1308f6f7fc49158be2792c9eb7d4cb2a828628b9ac67b09402caeaf9\",\"urls\":[\"bzz-raw://875473c162bd502c1dd2c1f40f812e337a16da7c27475d7ffc4f9dd72db65c49\",\"dweb:/ipfs/QmUVCJUnPDkQ6AV78uFvegmKJUMtFNb1Jy7cKYJLvHLu2E\"]},\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":{\"keccak256\":\"0x7269c9361452a555e6f29e924e70d4478a8a5bd86c7b33ea3731470a52c235b5\",\"urls\":[\"bzz-raw://eddd542888565cb84d4dac710511b0f02afbed2e0e1a7d25e0425e6d69b7712f\",\"dweb:/ipfs/Qma1KWoX8nZYK1d1PAfRiZH4prYqM347dMkWM6DjJzTqYY\"]},\"@openzeppelin/contracts/utils/ReentrancyGuard.sol\":{\"keccak256\":\"0xb63221b23818d622bfd83d18e0968307e4fcb7a35536bdceded76e1cf8349acd\",\"urls\":[\"bzz-raw://44e1e8c22362c4708a8c3362735f1465f5b05e2f7315e16c7010d694ce019d73\",\"dweb:/ipfs/QmWj9g8X1hxkXRre2kwkEjLBetjuzmSbWHD81bsSojnBkS\"]}},\"version\":1}", - "bytecode": "0x6080604052600380546001600160401b03191690553480156200002157600080fd5b5060405162001f9a38038062001f9a833981810160405260c08110156200004757600080fd5b508051602082015160408301516060840151608085015160a090950151939492939192909185858585858163ffffffff8116620000b65760405162461bcd60e51b815260040180806020018281038252602781526020018062001f116027913960400191505060405180910390fd5b60208163ffffffff1610620000fd5760405162461bcd60e51b815260040180806020018281038252602281526020018062001f586022913960400191505060405180910390fd5b6000805463ffffffff191663ffffffff83161781556002805460018181019092557f2fe54c60d3acabf3343a35b6eba15db4821b340f76e741e2249685ed4899af6c60008051602062001ed0833981519152909101819055815480830183559282905260008051602062001f7a8339815191529092018290555b60005463ffffffff9081169082161015620001eb57620001a182806001600160e01b03620002b316565b60028054600181810190925560008051602062001ed08339815191520182905580548082018255600082905260008051602062001f7a833981519152018290559092500162000177565b506200020181806001600160e01b03620002b316565b60046000015550506068805460ff1916600117905582620002545760405162461bcd60e51b815260040180806020018281038252602581526020018062001eab6025913960400191505060405180910390fd5b606c80546001600160a01b03199081166001600160a01b0397881617909155606d8054821695871695909517909455606e8054851691861691909117905550606955606f80549091169290911691909117905550620004a09350505050565b600060008051602062001f38833981519152831062000319576040805162461bcd60e51b815260206004820181905260248201527f5f6c6566742073686f756c6420626520696e7369646520746865206669656c64604482015290519081900360640190fd5b60008051602062001f388339815191528210620003685760405162461bcd60e51b815260040180806020018281038252602181526020018062001ef06021913960400191505060405180910390fd5b6040805163f47d33b560e01b81526004810185905260006024820181905282518693919273__Hasher________________________________9263f47d33b592604480840193829003018186803b158015620003c357600080fd5b505af4158015620003d8573d6000803e3d6000fd5b505050506040513d6040811015620003ef57600080fd5b508051602090910151909250905060008051602062001f38833981519152848308915073__Hasher________________________________63f47d33b583836040518363ffffffff1660e01b81526004018083815260200182815260200192505050604080518083038186803b1580156200046957600080fd5b505af41580156200047e573d6000803e3d6000fd5b505050506040513d60408110156200049557600080fd5b505195945050505050565b6119fb80620004b06000396000f3fe6080604052600436106101665760003560e01c806397fc007c116100d1578063d0fb02031161008a578063ec73295911610064578063ec73295914610598578063f178e47c146105ad578063fc0c546a146105d7578063fc7e9c6f146105ec57610166565b8063d0fb02031461052f578063e5285dcc14610544578063e82955881461056e57610166565b806397fc007c146103c05780639fa12d0b146103f3578063b214faa5146104be578063ba70f757146104db578063c2b40ae4146104f0578063cd87a3b41461051a57610166565b80634ecf518b116101235780634ecf518b146102ff578063570ca7351461032d5780636d9833e314610342578063839df9451461036c5780638bca6d161461039657806390eeb02b146103ab57610166565b806306394c9b1461016b57806317cc915c146101a057806321a0adb6146101de5780632b7ac3f31461027757806338bf282e146102a8578063414a37ba146102ea575b600080fd5b34801561017757600080fd5b5061019e6004803603602081101561018e57600080fd5b50356001600160a01b0316610601565b005b3480156101ac57600080fd5b506101ca600480360360208110156101c357600080fd5b503561066c565b604080519115158252519081900360200190f35b61019e600480360360e08110156101f457600080fd5b810190602081018135600160201b81111561020e57600080fd5b82018360208201111561022057600080fd5b803590602001918460018302840111600160201b8311171561024157600080fd5b91935091508035906020810135906001600160a01b03604082013581169160608101359091169060808101359060a00135610681565b34801561028357600080fd5b5061028c6109ce565b604080516001600160a01b039092168252519081900360200190f35b3480156102b457600080fd5b506102d8600480360360408110156102cb57600080fd5b50803590602001356109dd565b60408051918252519081900360200190f35b3480156102f657600080fd5b506102d8610bbe565b34801561030b57600080fd5b50610314610bd0565b6040805163ffffffff9092168252519081900360200190f35b34801561033957600080fd5b5061028c610bdc565b34801561034e57600080fd5b506101ca6004803603602081101561036557600080fd5b5035610beb565b34801561037857600080fd5b506101ca6004803603602081101561038f57600080fd5b5035610c5e565b3480156103a257600080fd5b506102d8610c73565b3480156103b757600080fd5b50610314610c79565b3480156103cc57600080fd5b5061019e600480360360208110156103e357600080fd5b50356001600160a01b0316610c85565b3480156103ff57600080fd5b5061046e6004803603602081101561041657600080fd5b810190602081018135600160201b81111561043057600080fd5b82018360208201111561044257600080fd5b803590602001918460208302840111600160201b8311171561046357600080fd5b509092509050610cf0565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156104aa578181015183820152602001610492565b505050509050019250505060405180910390f35b61019e600480360360208110156104d457600080fd5b5035610d78565b3480156104e757600080fd5b506102d8610ea5565b3480156104fc57600080fd5b506102d86004803603602081101561051357600080fd5b5035610ec5565b34801561052657600080fd5b50610314610ed9565b34801561053b57600080fd5b5061028c610ede565b34801561055057600080fd5b506101ca6004803603602081101561056757600080fd5b5035610eed565b34801561057a57600080fd5b506102d86004803603602081101561059157600080fd5b5035610f02565b3480156105a457600080fd5b506102d8610f20565b3480156105b957600080fd5b506102d8600480360360208110156105d057600080fd5b5035610f44565b3480156105e357600080fd5b5061028c610f51565b3480156105f857600080fd5b50610314610f60565b606e546001600160a01b0316331461064a5760405162461bcd60e51b81526004018080602001828103825260258152602001806119a26025913960400191505060405180910390fd5b606e80546001600160a01b0319166001600160a01b0392909216919091179055565b606a6020526000908152604090205460ff1681565b60685460ff166106d8576040805162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604482015290519081900360640190fd5b6068805460ff19169055606954821115610739576040805162461bcd60e51b815260206004820152601a60248201527f4665652065786365656473207472616e736665722076616c7565000000000000604482015290519081900360640190fd5b6000858152606a602052604090205460ff161561079d576040805162461bcd60e51b815260206004820152601f60248201527f546865206e6f746520686173206265656e20616c7265616479207370656e7400604482015290519081900360640190fd5b6107a686610beb565b6107f7576040805162461bcd60e51b815260206004820152601c60248201527f43616e6e6f742066696e6420796f7572206d65726b6c6520726f6f7400000000604482015290519081900360640190fd5b606c546040805160c08082018352898252602082018990526001600160a01b038881168385015287811660608401526080830187905260a08301869052925163695ef6f960e01b8152929093169263695ef6f9928c928c9290916004810191829160240190849080838360005b8381101561087c578181015183820152602001610864565b505050509050018281038252858582818152602001925080828437600081840152601f19601f820116905080830192505050945050505050602060405180830381600087803b1580156108ce57600080fd5b505af11580156108e2573d6000803e3d6000fd5b505050506040513d60208110156108f857600080fd5b5051610944576040805162461bcd60e51b815260206004820152601660248201527524b73b30b634b2103bb4ba34323930bb90383937b7b360511b604482015290519081900360640190fd5b6000858152606a60205260409020805460ff1916600117905561096984848484610f73565b604080516001600160a01b038681168252602082018890528183018590529151918516917fe9e508bad6d4c3227e881ca19068f099da81b5164dd6d62b2eaf1e8bc6c349319181900360600190a250506068805460ff19166001179055505050505050565b606c546001600160a01b031681565b60006000805160206119318339815191528310610a41576040805162461bcd60e51b815260206004820181905260248201527f5f6c6566742073686f756c6420626520696e7369646520746865206669656c64604482015290519081900360640190fd5b6000805160206119318339815191528210610a8d5760405162461bcd60e51b81526004018080602001828103825260218152602001806118e16021913960400191505060405180910390fd5b6040805163f47d33b560e01b81526004810185905260006024820181905282518693919273__Hasher________________________________9263f47d33b592604480840193829003018186803b158015610ae757600080fd5b505af4158015610afb573d6000803e3d6000fd5b505050506040513d6040811015610b1157600080fd5b5080516020909101519092509050600080516020611931833981519152848308915073__Hasher________________________________63f47d33b583836040518363ffffffff1660e01b81526004018083815260200182815260200192505050604080518083038186803b158015610b8957600080fd5b505af4158015610b9d573d6000803e3d6000fd5b505050506040513d6040811015610bb357600080fd5b505195945050505050565b60008051602061193183398151915281565b60005463ffffffff1681565b606e546001600160a01b031681565b600081610bfa57506000610c59565b60035463ffffffff165b60048163ffffffff1660648110610c1757fe5b0154831415610c2a576001915050610c59565b63ffffffff8116610c39575060645b6003546000199091019063ffffffff80831691161415610c045760009150505b919050565b606b6020526000908152604090205460ff1681565b60695481565b60035463ffffffff1681565b606e546001600160a01b03163314610cce5760405162461bcd60e51b81526004018080602001828103825260258152602001806119a26025913960400191505060405180910390fd5b606c80546001600160a01b0319166001600160a01b0392909216919091179055565b604080518281526020808402820101909152606090828015610d1c578160200160208202803883390190505b50905060005b82811015610d7157610d45848483818110610d3957fe5b90506020020135610eed565b15610d69576001828281518110610d5857fe5b911515602092830291909101909101525b600101610d22565b5092915050565b60685460ff16610dcf576040805162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604482015290519081900360640190fd5b6068805460ff191690556000818152606b602052604090205460ff1615610e275760405162461bcd60e51b81526004018080602001828103825260218152602001806119516021913960400191505060405180910390fd5b6000610e32826111ab565b6000838152606b60205260409020805460ff191660011790559050610e55611342565b6040805163ffffffff83168152426020820152815184927fa945e51eec50ab98c161376f0db4cf2aeba3ec92755fe2fcd388bdbbb80ff196928290030190a250506068805460ff19166001179055565b60035460009060049063ffffffff1660648110610ebe57fe5b0154905090565b60048160648110610ed257fe5b0154905081565b606481565b606d546001600160a01b031681565b6000908152606a602052604090205460ff1690565b60028181548110610f0f57fe5b600091825260209091200154905081565b7f2fe54c60d3acabf3343a35b6eba15db4821b340f76e741e2249685ed4899af6c81565b60018181548110610f0f57fe5b606f546001600160a01b031681565b600354600160201b900463ffffffff1681565b803414610fb15760405162461bcd60e51b815260040180806020018281038252603081526020018061188a6030913960400191505060405180910390fd5b606d5460408051622fcfcb60e31b815290516000926001600160a01b03169163017e7e58916004808301926020929190829003018186803b158015610ff557600080fd5b505afa158015611009573d6000803e3d6000fd5b505050506040513d602081101561101f57600080fd5b5051606d5460408051633b46a6e760e01b815290519293506000926001600160a01b0390921691633b46a6e791600480820192602092909190829003018186803b15801561106c57600080fd5b505afa158015611080573d6000803e3d6000fd5b505050506040513d602081101561109657600080fd5b5051905060006001600160a01b038316158015906110b357508115155b905080156110eb5760006110c96069548461138e565b90506110db88828860695403036113d7565b6110e584826113d7565b506110f9565b6110f98786606954036113d7565b84156111095761110986866113d7565b83156111a2576040516000906001600160a01b0389169086908381818185875af1925050503d806000811461115a576040519150601f19603f3d011682016040523d82523d6000602084013e61115f565b606091505b50509050806111a0576040516001600160a01b0388169086156108fc029087906000818181858888f1935050505015801561119e573d6000803e3d6000fd5b505b505b50505050505050565b60035460008054909163ffffffff600160201b909104811691811660020a168114156112085760405162461bcd60e51b815260040180806020018281038252602f815260200180611831602f913960400191505060405180910390fd5b6003805463ffffffff600160201b80830482166001019091160267ffffffff000000001990911617905582600080805b60005463ffffffff90811690821610156112e0576001851661129c5783925060028163ffffffff168154811061126a57fe5b906000526020600020015491508360018263ffffffff168154811061128b57fe5b6000918252602090912001556112c0565b60018163ffffffff16815481106112af57fe5b906000526020600020015492508391505b6112ca83836109dd565b9350600263ffffffff8616049450600101611238565b5060035460649063ffffffff908116600101166003805463ffffffff19169290910663ffffffff90811692909217908190558491600491166064811061132257fe5b01555050600354600160201b900463ffffffff1660001901949350505050565b341561137f5760405162461bcd60e51b81526004018080602001828103825260308152602001806119726030913960400191505060405180910390fd5b61138c33306069546115a8565b565b60006113d083836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f00000000000081525061178e565b9392505050565b606f54604080516001600160a01b038581166024830152604480830186905283518084039091018152606490920183526020820180516001600160e01b031663a9059cbb60e01b178152925182516000956060959316939282918083835b602083106114545780518252601f199092019160209182019101611435565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d80600081146114b6576040519150601f19603f3d011682016040523d82523d6000602084013e6114bb565b606091505b509150915081611506576040805162461bcd60e51b81526020600482015260116024820152706e6f7420656e6f75676820746f6b656e7360781b604482015290519081900360640190fd5b8051156115a257805160201461154d5760405162461bcd60e51b815260040180806020018281038252602a815260200180611860602a913960400191505060405180910390fd5b80806020019051602081101561156257600080fd5b50519150816115a25760405162461bcd60e51b81526004018080602001828103825260278152602001806118ba6027913960400191505060405180910390fd5b50505050565b606f54604080516001600160a01b0386811660248301528581166044830152606480830186905283518084039091018152608490920183526020820180516001600160e01b03166323b872dd60e01b178152925182516000956060959316939282918083835b6020831061162d5780518252601f19909201916020918201910161160e565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d806000811461168f576040519150601f19603f3d011682016040523d82523d6000602084013e611694565b606091505b5091509150816116eb576040805162461bcd60e51b815260206004820152601960248201527f6e6f7420656e6f75676820616c6c6f77656420746f6b656e7300000000000000604482015290519081900360640190fd5b8051156117875780516020146117325760405162461bcd60e51b815260040180806020018281038252602a815260200180611860602a913960400191505060405180910390fd5b80806020019051602081101561174757600080fd5b50519150816117875760405162461bcd60e51b815260040180806020018281038252602f815260200180611902602f913960400191505060405180910390fd5b5050505050565b6000818361181a5760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b838110156117df5781810151838201526020016117c7565b50505050905090810190601f16801561180c5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b50600083858161182657fe5b049594505050505056fe4d65726b6c6520747265652069732066756c6c2e204e6f206d6f7265206c656166732063616e20626520616464656464617461206c656e6774682073686f756c64206265206569746865722030206f72203332206279746573496e636f727265637420726566756e6420616d6f756e742072656365697665642062792074686520636f6e74726163746e6f7420656e6f75676820746f6b656e732e20546f6b656e2072657475726e732066616c73652e5f72696768742073686f756c6420626520696e7369646520746865206669656c646e6f7420656e6f75676820616c6c6f77656420746f6b656e732e20546f6b656e2072657475726e732066616c73652e30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000154686520636f6d6d69746d656e7420686173206265656e207375626d69747465644554482076616c756520697320737570706f73656420746f206265203020666f7220455243323020696e7374616e63654f6e6c79206f70657261746f722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a7231582028aa7561e325e8422f994b89b4b55657010796368b3736fa5a11d78144123e9264736f6c6343000511003264656e6f6d696e6174696f6e2073686f756c642062652067726561746572207468616e2030405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace5f72696768742073686f756c6420626520696e7369646520746865206669656c645f747265654c6576656c732073686f756c642062652067726561746572207468616e207a65726f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000015f747265654c6576656c732073686f756c64206265206c657373207468616e203332b10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", - "deployedBytecode": "0x6080604052600436106101665760003560e01c806397fc007c116100d1578063d0fb02031161008a578063ec73295911610064578063ec73295914610598578063f178e47c146105ad578063fc0c546a146105d7578063fc7e9c6f146105ec57610166565b8063d0fb02031461052f578063e5285dcc14610544578063e82955881461056e57610166565b806397fc007c146103c05780639fa12d0b146103f3578063b214faa5146104be578063ba70f757146104db578063c2b40ae4146104f0578063cd87a3b41461051a57610166565b80634ecf518b116101235780634ecf518b146102ff578063570ca7351461032d5780636d9833e314610342578063839df9451461036c5780638bca6d161461039657806390eeb02b146103ab57610166565b806306394c9b1461016b57806317cc915c146101a057806321a0adb6146101de5780632b7ac3f31461027757806338bf282e146102a8578063414a37ba146102ea575b600080fd5b34801561017757600080fd5b5061019e6004803603602081101561018e57600080fd5b50356001600160a01b0316610601565b005b3480156101ac57600080fd5b506101ca600480360360208110156101c357600080fd5b503561066c565b604080519115158252519081900360200190f35b61019e600480360360e08110156101f457600080fd5b810190602081018135600160201b81111561020e57600080fd5b82018360208201111561022057600080fd5b803590602001918460018302840111600160201b8311171561024157600080fd5b91935091508035906020810135906001600160a01b03604082013581169160608101359091169060808101359060a00135610681565b34801561028357600080fd5b5061028c6109ce565b604080516001600160a01b039092168252519081900360200190f35b3480156102b457600080fd5b506102d8600480360360408110156102cb57600080fd5b50803590602001356109dd565b60408051918252519081900360200190f35b3480156102f657600080fd5b506102d8610bbe565b34801561030b57600080fd5b50610314610bd0565b6040805163ffffffff9092168252519081900360200190f35b34801561033957600080fd5b5061028c610bdc565b34801561034e57600080fd5b506101ca6004803603602081101561036557600080fd5b5035610beb565b34801561037857600080fd5b506101ca6004803603602081101561038f57600080fd5b5035610c5e565b3480156103a257600080fd5b506102d8610c73565b3480156103b757600080fd5b50610314610c79565b3480156103cc57600080fd5b5061019e600480360360208110156103e357600080fd5b50356001600160a01b0316610c85565b3480156103ff57600080fd5b5061046e6004803603602081101561041657600080fd5b810190602081018135600160201b81111561043057600080fd5b82018360208201111561044257600080fd5b803590602001918460208302840111600160201b8311171561046357600080fd5b509092509050610cf0565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156104aa578181015183820152602001610492565b505050509050019250505060405180910390f35b61019e600480360360208110156104d457600080fd5b5035610d78565b3480156104e757600080fd5b506102d8610ea5565b3480156104fc57600080fd5b506102d86004803603602081101561051357600080fd5b5035610ec5565b34801561052657600080fd5b50610314610ed9565b34801561053b57600080fd5b5061028c610ede565b34801561055057600080fd5b506101ca6004803603602081101561056757600080fd5b5035610eed565b34801561057a57600080fd5b506102d86004803603602081101561059157600080fd5b5035610f02565b3480156105a457600080fd5b506102d8610f20565b3480156105b957600080fd5b506102d8600480360360208110156105d057600080fd5b5035610f44565b3480156105e357600080fd5b5061028c610f51565b3480156105f857600080fd5b50610314610f60565b606e546001600160a01b0316331461064a5760405162461bcd60e51b81526004018080602001828103825260258152602001806119a26025913960400191505060405180910390fd5b606e80546001600160a01b0319166001600160a01b0392909216919091179055565b606a6020526000908152604090205460ff1681565b60685460ff166106d8576040805162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604482015290519081900360640190fd5b6068805460ff19169055606954821115610739576040805162461bcd60e51b815260206004820152601a60248201527f4665652065786365656473207472616e736665722076616c7565000000000000604482015290519081900360640190fd5b6000858152606a602052604090205460ff161561079d576040805162461bcd60e51b815260206004820152601f60248201527f546865206e6f746520686173206265656e20616c7265616479207370656e7400604482015290519081900360640190fd5b6107a686610beb565b6107f7576040805162461bcd60e51b815260206004820152601c60248201527f43616e6e6f742066696e6420796f7572206d65726b6c6520726f6f7400000000604482015290519081900360640190fd5b606c546040805160c08082018352898252602082018990526001600160a01b038881168385015287811660608401526080830187905260a08301869052925163695ef6f960e01b8152929093169263695ef6f9928c928c9290916004810191829160240190849080838360005b8381101561087c578181015183820152602001610864565b505050509050018281038252858582818152602001925080828437600081840152601f19601f820116905080830192505050945050505050602060405180830381600087803b1580156108ce57600080fd5b505af11580156108e2573d6000803e3d6000fd5b505050506040513d60208110156108f857600080fd5b5051610944576040805162461bcd60e51b815260206004820152601660248201527524b73b30b634b2103bb4ba34323930bb90383937b7b360511b604482015290519081900360640190fd5b6000858152606a60205260409020805460ff1916600117905561096984848484610f73565b604080516001600160a01b038681168252602082018890528183018590529151918516917fe9e508bad6d4c3227e881ca19068f099da81b5164dd6d62b2eaf1e8bc6c349319181900360600190a250506068805460ff19166001179055505050505050565b606c546001600160a01b031681565b60006000805160206119318339815191528310610a41576040805162461bcd60e51b815260206004820181905260248201527f5f6c6566742073686f756c6420626520696e7369646520746865206669656c64604482015290519081900360640190fd5b6000805160206119318339815191528210610a8d5760405162461bcd60e51b81526004018080602001828103825260218152602001806118e16021913960400191505060405180910390fd5b6040805163f47d33b560e01b81526004810185905260006024820181905282518693919273__Hasher________________________________9263f47d33b592604480840193829003018186803b158015610ae757600080fd5b505af4158015610afb573d6000803e3d6000fd5b505050506040513d6040811015610b1157600080fd5b5080516020909101519092509050600080516020611931833981519152848308915073__Hasher________________________________63f47d33b583836040518363ffffffff1660e01b81526004018083815260200182815260200192505050604080518083038186803b158015610b8957600080fd5b505af4158015610b9d573d6000803e3d6000fd5b505050506040513d6040811015610bb357600080fd5b505195945050505050565b60008051602061193183398151915281565b60005463ffffffff1681565b606e546001600160a01b031681565b600081610bfa57506000610c59565b60035463ffffffff165b60048163ffffffff1660648110610c1757fe5b0154831415610c2a576001915050610c59565b63ffffffff8116610c39575060645b6003546000199091019063ffffffff80831691161415610c045760009150505b919050565b606b6020526000908152604090205460ff1681565b60695481565b60035463ffffffff1681565b606e546001600160a01b03163314610cce5760405162461bcd60e51b81526004018080602001828103825260258152602001806119a26025913960400191505060405180910390fd5b606c80546001600160a01b0319166001600160a01b0392909216919091179055565b604080518281526020808402820101909152606090828015610d1c578160200160208202803883390190505b50905060005b82811015610d7157610d45848483818110610d3957fe5b90506020020135610eed565b15610d69576001828281518110610d5857fe5b911515602092830291909101909101525b600101610d22565b5092915050565b60685460ff16610dcf576040805162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604482015290519081900360640190fd5b6068805460ff191690556000818152606b602052604090205460ff1615610e275760405162461bcd60e51b81526004018080602001828103825260218152602001806119516021913960400191505060405180910390fd5b6000610e32826111ab565b6000838152606b60205260409020805460ff191660011790559050610e55611342565b6040805163ffffffff83168152426020820152815184927fa945e51eec50ab98c161376f0db4cf2aeba3ec92755fe2fcd388bdbbb80ff196928290030190a250506068805460ff19166001179055565b60035460009060049063ffffffff1660648110610ebe57fe5b0154905090565b60048160648110610ed257fe5b0154905081565b606481565b606d546001600160a01b031681565b6000908152606a602052604090205460ff1690565b60028181548110610f0f57fe5b600091825260209091200154905081565b7f2fe54c60d3acabf3343a35b6eba15db4821b340f76e741e2249685ed4899af6c81565b60018181548110610f0f57fe5b606f546001600160a01b031681565b600354600160201b900463ffffffff1681565b803414610fb15760405162461bcd60e51b815260040180806020018281038252603081526020018061188a6030913960400191505060405180910390fd5b606d5460408051622fcfcb60e31b815290516000926001600160a01b03169163017e7e58916004808301926020929190829003018186803b158015610ff557600080fd5b505afa158015611009573d6000803e3d6000fd5b505050506040513d602081101561101f57600080fd5b5051606d5460408051633b46a6e760e01b815290519293506000926001600160a01b0390921691633b46a6e791600480820192602092909190829003018186803b15801561106c57600080fd5b505afa158015611080573d6000803e3d6000fd5b505050506040513d602081101561109657600080fd5b5051905060006001600160a01b038316158015906110b357508115155b905080156110eb5760006110c96069548461138e565b90506110db88828860695403036113d7565b6110e584826113d7565b506110f9565b6110f98786606954036113d7565b84156111095761110986866113d7565b83156111a2576040516000906001600160a01b0389169086908381818185875af1925050503d806000811461115a576040519150601f19603f3d011682016040523d82523d6000602084013e61115f565b606091505b50509050806111a0576040516001600160a01b0388169086156108fc029087906000818181858888f1935050505015801561119e573d6000803e3d6000fd5b505b505b50505050505050565b60035460008054909163ffffffff600160201b909104811691811660020a168114156112085760405162461bcd60e51b815260040180806020018281038252602f815260200180611831602f913960400191505060405180910390fd5b6003805463ffffffff600160201b80830482166001019091160267ffffffff000000001990911617905582600080805b60005463ffffffff90811690821610156112e0576001851661129c5783925060028163ffffffff168154811061126a57fe5b906000526020600020015491508360018263ffffffff168154811061128b57fe5b6000918252602090912001556112c0565b60018163ffffffff16815481106112af57fe5b906000526020600020015492508391505b6112ca83836109dd565b9350600263ffffffff8616049450600101611238565b5060035460649063ffffffff908116600101166003805463ffffffff19169290910663ffffffff90811692909217908190558491600491166064811061132257fe5b01555050600354600160201b900463ffffffff1660001901949350505050565b341561137f5760405162461bcd60e51b81526004018080602001828103825260308152602001806119726030913960400191505060405180910390fd5b61138c33306069546115a8565b565b60006113d083836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f00000000000081525061178e565b9392505050565b606f54604080516001600160a01b038581166024830152604480830186905283518084039091018152606490920183526020820180516001600160e01b031663a9059cbb60e01b178152925182516000956060959316939282918083835b602083106114545780518252601f199092019160209182019101611435565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d80600081146114b6576040519150601f19603f3d011682016040523d82523d6000602084013e6114bb565b606091505b509150915081611506576040805162461bcd60e51b81526020600482015260116024820152706e6f7420656e6f75676820746f6b656e7360781b604482015290519081900360640190fd5b8051156115a257805160201461154d5760405162461bcd60e51b815260040180806020018281038252602a815260200180611860602a913960400191505060405180910390fd5b80806020019051602081101561156257600080fd5b50519150816115a25760405162461bcd60e51b81526004018080602001828103825260278152602001806118ba6027913960400191505060405180910390fd5b50505050565b606f54604080516001600160a01b0386811660248301528581166044830152606480830186905283518084039091018152608490920183526020820180516001600160e01b03166323b872dd60e01b178152925182516000956060959316939282918083835b6020831061162d5780518252601f19909201916020918201910161160e565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d806000811461168f576040519150601f19603f3d011682016040523d82523d6000602084013e611694565b606091505b5091509150816116eb576040805162461bcd60e51b815260206004820152601960248201527f6e6f7420656e6f75676820616c6c6f77656420746f6b656e7300000000000000604482015290519081900360640190fd5b8051156117875780516020146117325760405162461bcd60e51b815260040180806020018281038252602a815260200180611860602a913960400191505060405180910390fd5b80806020019051602081101561174757600080fd5b50519150816117875760405162461bcd60e51b815260040180806020018281038252602f815260200180611902602f913960400191505060405180910390fd5b5050505050565b6000818361181a5760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b838110156117df5781810151838201526020016117c7565b50505050905090810190601f16801561180c5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b50600083858161182657fe5b049594505050505056fe4d65726b6c6520747265652069732066756c6c2e204e6f206d6f7265206c656166732063616e20626520616464656464617461206c656e6774682073686f756c64206265206569746865722030206f72203332206279746573496e636f727265637420726566756e6420616d6f756e742072656365697665642062792074686520636f6e74726163746e6f7420656e6f75676820746f6b656e732e20546f6b656e2072657475726e732066616c73652e5f72696768742073686f756c6420626520696e7369646520746865206669656c646e6f7420656e6f75676820616c6c6f77656420746f6b656e732e20546f6b656e2072657475726e732066616c73652e30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000154686520636f6d6d69746d656e7420686173206265656e207375626d69747465644554482076616c756520697320737570706f73656420746f206265203020666f7220455243323020696e7374616e63654f6e6c79206f70657261746f722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a7231582028aa7561e325e8422f994b89b4b55657010796368b3736fa5a11d78144123e9264736f6c63430005110032", - "sourceMap": "830:2677:0:-;;;1430:34:3;;;-1:-1:-1;;;;;;1468:27:3;;;892:279:0;5:2:-1;;;;30:1;27;20:12;5:2;892:279:0;;;;;;;;;;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;-1:-1;892:279:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1646:15:3;;;1638:67;;;;-1:-1:-1;;;1638:67:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1733:2;1719:11;:16;;;1711:63;;;;-1:-1:-1;;;1711:63:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1780:6;:20;;-1:-1:-1;;1780:20:3;;;;;;;1854:5;27:10:-1;;-1:-1;23:18;;;45:23;;;1088:77:3;-1:-1:-1;;;;;;;;;;;1854:23:3;;;;;;27:10:-1;;23:18;;;45:23;;1883:32:3;;;;-1:-1:-1;;;;;;;;;;;1883:32:3;;;;;;1922:175;1945:6;;;;;;1941:10;;;;1922:175;;;1980:39;1994:11;;-1:-1:-1;;;;;1980:13:3;:39;:::i;:::-;2027:5;27:10:-1;;39:1;23:18;;;45:23;;;-1:-1;;;;;;;;;;;2027:23:3;;;;27:10:-1;;23:18;;;45:23;;-1:-1;2058:32:3;;;-1:-1:-1;;;;;;;;;;;2058:32:3;;;;1966:53;;-1:-1:-1;1953:3:3;1922:175;;;-1:-1:-1;2114:39:3;2128:11;;-1:-1:-1;;;;;2114:13:3;:39;:::i;:::-;2103:5;2109:1;2103:8;:50;-1:-1:-1;;1421:11:6;:18;;-1:-1:-1;;1421:18:6;1435:4;1421:18;;;1710:17:5;1702:67;;;;-1:-1:-1;;;1702:67:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1775:8;:20;;-1:-1:-1;;;;;;1775:20:5;;;-1:-1:-1;;;;;1775:20:5;;;;;;;1801:10;:24;;;;;;;;;;;;;;1831:8;:20;;;;;;;;;;;;;-1:-1:-1;1857:12:5;:28;1152:5:0;:14;;;;;;;;;;;;;;;-1:-1:-1;830:2677:0;;-1:-1:-1;;;;830:2677:0;2230:445:3;2305:7;-1:-1:-1;;;;;;;;;;;2328:27:3;;2320:72;;;;;-1:-1:-1;;;2320:72:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;;;;;;;2406:28:3;;2398:74;;;;-1:-1:-1;;;2398:74:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2538:23;;;-1:-1:-1;;;2538:23:3;;;;;;;;2478:9;2538:23;;;;;;;;2498:5;;2478:9;;2538:6;;:17;;:23;;;;;;;;;;:6;:23;;;5:2:-1;;;;30:1;27;20:12;5:2;2538:23:3;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2538:23:3;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2538:23:3;;;;;;;;;-1:-1:-1;2538:23:3;-1:-1:-1;;;;;;;;;;;;2589:6:3;2578:1;2571:38;2567:42;;2624:6;:17;2642:1;2645;2624:23;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2624:23:3;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2624:23:3;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2624:23:3;;2230:445;-1:-1:-1;;;;;2230:445:3:o;830:2677:0:-;;;;;;;", - "deployedSourceMap": "830:2677:0:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4843:102:5;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4843:102:5;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4843:102:5;-1:-1:-1;;;;;4843:102:5;;:::i;:::-;;477:47;;8:9:-1;5:2;;;30:1;27;20:12;5:2;477:47:5;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;477:47:5;;:::i;:::-;;;;;;;;;;;;;;;;;;2958:781;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;2958:781:5;;;;;;;;-1:-1:-1;;;5:28;;2:2;;;46:1;43;36:12;2:2;2958:781:5;;35:9:-1;28:4;12:14;8:25;5:40;2:2;;;58:1;55;48:12;2:2;2958:781:5;;;;;;100:9:-1;95:1;81:12;77:20;67:8;63:35;60:50;-1:-1;;;25:12;22:29;11:107;8:2;;;131:1;128;121:12;8:2;2958:781:5;;-1:-1:-1;2958:781:5;-1:-1:-1;2958:781:5;;;;;;;;-1:-1:-1;;;;;2958:781:5;;;;;;;;;;;;;;;;;;;;;;;;:::i;666:25::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:25:5;;;:::i;:::-;;;;-1:-1:-1;;;;;666:25:5;;;;;;;;;;;;;;2230:445:3;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2230:445:3;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2230:445:3;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;933:114;;8:9:-1;5:2;;;30:1;27;20:12;5:2;933:114:3;;;:::i;1209:20::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1209:20:3;;;:::i;:::-;;;;;;;;;;;;;;;;;;;884:23:5;;8:9:-1;5:2;;;30:1;27;20:12;5:2;884:23:5;;;:::i;3553:342:3:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3553:342:3;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;3553:342:3;;:::i;619:43:5:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;619:43:5;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;619:43:5;;:::i;446:27::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;446:27:5;;;:::i;1430:34:3:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1430:34:3;;;:::i;4680:113:5:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4680:113:5;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4680:113:5;-1:-1:-1;;;;;4680:113:5;;:::i;4157:293::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4157:293:5;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;4157:293:5;;;;;;;;-1:-1:-1;;;5:28;;2:2;;;46:1;43;36:12;2:2;4157:293:5;;35:9:-1;28:4;12:14;8:25;5:40;2:2;;;58:1;55;48:12;2:2;4157:293:5;;;;;;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;-1:-1;4157:293:5;;-1:-1:-1;4157:293:5;-1:-1:-1;4157:293:5;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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;4157:293:5;;;;;;;;;;;;;;;;;2138:324;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2138:324:5;;:::i;3941:93:3:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3941:93:3;;;:::i;1549:39::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1549:39:3;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1549:39:3;;:::i;1499:46::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1499:46:3;;;:::i;695:29:5:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;695:29:5;;;:::i;3980:116::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3980:116:5;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;3980:116:5;;:::i;1404:22:3:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1404:22:3;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1404:22:3;;:::i;1051:114::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1051:114:3;;;:::i;1369:31::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1369:31:3;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1369:31:3;;:::i;867:20:0:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;867:20:0;;;:::i;1468:27:3:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1468:27:3;;;:::i;4843:102:5:-;961:8;;-1:-1:-1;;;;;961:8:5;947:10;:22;939:72;;;;-1:-1:-1;;;939:72:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4917:8;:23;;-1:-1:-1;;;;;;4917:23:5;-1:-1:-1;;;;;4917:23:5;;;;;;;;;;4843:102::o;477:47::-;;;;;;;;;;;;;;;:::o;2958:781::-;1934:11:6;;;;1926:55;;;;;-1:-1:-1;;;1926:55:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;2056:11;:19;;-1:-1:-1;;2056:19:6;;;3175:12:5;;3167:20;;;3159:59;;;;;-1:-1:-1;;;3159:59:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;3233:31;;;;:15;:31;;;;;;;;3232:32;3224:76;;;;;-1:-1:-1;;;3224:76:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;3314:18;3326:5;3314:11;:18::i;:::-;3306:59;;;;;-1:-1:-1;;;3306:59:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;3412:8;;:126;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3483:19:5;;;3412:126;;;;3504:17;;;3412:126;;;;;;;;;;;;;;;;;;-1:-1:-1;;;3412:126:5;;:8;;;;;:20;;3433:6;;;;3412:126;;;;;;;;;;;;;;;;:8;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;3412:126:5;;;;;;;;;;;;;;;;;;;;;30:3:-1;22:6;14;1:33;99:1;93:3;85:6;81:16;74:27;137:4;133:9;126:4;121:3;117:14;113:30;106:37;;169:3;161:6;157:16;147:26;;3412:126:5;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3412:126:5;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3412:126:5;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;3412:126:5;3404:161;;;;;-1:-1:-1;;;3404:161:5;;;;;;;;;;;;-1:-1:-1;;;3404:161:5;;;;;;;;;;;;;;;3572:31;;;;:15;:31;;;;;:38;;-1:-1:-1;;3572:38:5;3606:4;3572:38;;;3616:53;3633:10;3645:8;3655:4;3661:7;3616:16;:53::i;:::-;3680:54;;;-1:-1:-1;;;;;3680:54:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;2230:11:6;:18;;-1:-1:-1;;2230:18:6;2244:4;2230:18;;;-1:-1:-1;;;;;;2958:781:5:o;666:25::-;;;-1:-1:-1;;;;;666:25:5;;:::o;2230:445:3:-;2305:7;-1:-1:-1;;;;;;;;;;;2328:27:3;;2320:72;;;;;-1:-1:-1;;;2320:72:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;;;;;;;2406:28:3;;2398:74;;;;-1:-1:-1;;;2398:74:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2538:23;;;-1:-1:-1;;;2538:23:3;;;;;;;;2478:9;2538:23;;;;;;;;2498:5;;2478:9;;2538:6;;:17;;:23;;;;;;;;;;:6;:23;;;5:2:-1;;;;30:1;27;20:12;5:2;2538:23:3;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2538:23:3;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2538:23:3;;;;;;;;;-1:-1:-1;2538:23:3;-1:-1:-1;;;;;;;;;;;;2589:6:3;2578:1;2571:38;2567:42;;2624:6;:17;2642:1;2645;2624:23;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2624:23:3;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2624:23:3;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2624:23:3;;2230:445;-1:-1:-1;;;;;2230:445:3:o;933:114::-;-1:-1:-1;;;;;;;;;;;933:114:3;:::o;1209:20::-;;;;;;:::o;884:23:5:-;;;-1:-1:-1;;;;;884:23:5;;:::o;3553:342:3:-;3609:4;3625:10;3621:43;;-1:-1:-1;3652:5:3;3645:12;;3621:43;3680:16;;;;3702:171;3726:5;3732:1;3726:8;;;;;;;;;;;3717:5;:17;3713:53;;;3753:4;3746:11;;;;;3713:53;3777:6;;;3773:52;;-1:-1:-1;1542:3:3;3773:52;3855:16;;-1:-1:-1;;3832:3:3;;;;3855:16;3850:21;;;3855:16;;3850:21;;3702:171;;3885:5;3878:12;;;3553:342;;;;:::o;619:43:5:-;;;;;;;;;;;;;;;:::o;446:27::-;;;;:::o;1430:34:3:-;;;;;;:::o;4680:113:5:-;961:8;;-1:-1:-1;;;;;961:8:5;947:10;:22;939:72;;;;-1:-1:-1;;;939:72:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4754:8;:34;;-1:-1:-1;;;;;;4754:34:5;-1:-1:-1;;;;;4754:34:5;;;;;;;;;;4680:113::o;4157:293::-;4273:35;;;;;;;;;;;;;;;;4238:19;;4284:16;4273:35;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;4273:35:5;-1:-1:-1;4265:43:5;-1:-1:-1;4318:6:5;4314:132;4330:27;;;4314:132;;;4376:28;4384:16;;4401:1;4384:19;;;;;;;;;;;;;4376:7;:28::i;:::-;4372:68;;;4427:4;4416:5;4422:1;4416:8;;;;;;;;:15;;;:8;;;;;;;;;;;:15;4372:68;4359:3;;4314:132;;;;4157:293;;;;:::o;2138:324::-;1934:11:6;;;;1926:55;;;;;-1:-1:-1;;;1926:55:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;2056:11;:19;;-1:-1:-1;;2056:19:6;;;2070:5;2221:24:5;;;:11;:24;;;;;;2056:19:6;2221:24:5;2220:25;2212:71;;;;-1:-1:-1;;;2212:71:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2290:20;2313;2321:11;2313:7;:20::i;:::-;2339:24;;;;:11;:24;;;;;:31;;-1:-1:-1;;2339:31:5;2366:4;2339:31;;;2290:43;-1:-1:-1;2376:17:5;:15;:17::i;:::-;2405:52;;;;;;;;2441:15;2405:52;;;;;;2413:11;;2405:52;;;;;;;;-1:-1:-1;;2230:11:6;:18;;-1:-1:-1;;2230:18:6;2244:4;2230:18;;;2138:324:5:o;3941:93:3:-;4012:16;;3984:7;;4006:5;;4012:16;;4006:23;;;;;;;;;3999:30;;3941:93;:::o;1549:39::-;;;;;;;;;;;;;-1:-1:-1;1549:39:3;:::o;1499:46::-;1542:3;1499:46;:::o;695:29:5:-;;;-1:-1:-1;;;;;695:29:5;;:::o;3980:116::-;4041:4;4060:31;;;:15;:31;;;;;;;;;3980:116::o;1404:22:3:-;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;1404:22:3;:::o;1051:114::-;1088:77;1051:114;:::o;1369:31::-;;;;;;;;;;867:20:0;;;-1:-1:-1;;;;;867:20:0;;:::o;1468:27:3:-;;;-1:-1:-1;;;1468:27:3;;;;;:::o;1370:993:0:-;1525:7;1512:9;:20;1504:81;;;;-1:-1:-1;;;1504:81:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1608:10;;:18;;;-1:-1:-1;;;1608:18:0;;;;1592:13;;-1:-1:-1;;;;;1608:10:0;;:16;;:18;;;;;;;;;;;;;;:10;:18;;;5:2:-1;;;;30:1;27;20:12;5:2;1608:18:0;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1608:18:0;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1608:18:0;1661:10;;:31;;;-1:-1:-1;;;1661:31:0;;;;1608:18;;-1:-1:-1;1632:26:0;;-1:-1:-1;;;;;1661:10:0;;;;:29;;:31;;;;;1608:18;;1661:31;;;;;;;;:10;:31;;;5:2:-1;;;;30:1;27;20:12;5:2;1661:31:0;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1661:31:0;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1661:31:0;;-1:-1:-1;1699:10:0;-1:-1:-1;;;;;1712:19:0;;;;;;:46;;-1:-1:-1;1735:23:0;;;1712:46;1699:59;;1768:5;1764:301;;;1783:19;1805:46;1818:12;;1832:18;1805:12;:46::i;:::-;1783:68;;1859:73;1878:10;1920:11;1905:12;1890;;:27;:41;1859:18;:73::i;:::-;1940:38;1959:5;1966:11;1940:18;:38::i;:::-;1764:301;;;;1999:59;2018:10;2045:12;2030;;:27;1999:18;:59::i;:::-;2075:16;;2071:79;;2101:42;2120:8;2130:12;2101:18;:42::i;:::-;2160:11;;2156:203;;2200:34;;2182:12;;-1:-1:-1;;;;;2200:15:0;;;2222:7;;2182:12;2200:34;2182:12;2200:34;2222:7;2200:15;:34;;;;;;;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;;2181:53:0;;;2247:7;2242:111;;2318:26;;-1:-1:-1;;;;;2318:17:0;;;:26;;;;;2336:7;;2318:26;;;;2336:7;2318:17;:26;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2318:26:0;2242:111;2156:203;;1370:993;;;;;;;:::o;2679:802:3:-;2770:9;;2728:12;2820:6;;2728:12;;2770:9;-1:-1:-1;;;2770:9:3;;;;;;2820:6;;2816:1;2809:17;2793:33;;;;2785:93;;;;-1:-1:-1;;;2785:93:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2884:9;:14;;;-1:-1:-1;;;2884:14:3;;;;;2897:1;2884:14;;;;;-1:-1:-1;;2884:14:3;;;;;;2931:5;-1:-1:-1;;;2980:355:3;3003:6;;;;;;2999:10;;;;2980:355;;;3028:16;;;3024:225;;3068:16;3061:23;;3102:5;3108:1;3102:8;;;;;;;;;;;;;;;;;;3094:16;;3141;3121:14;3136:1;3121:17;;;;;;;;;;;;;;;;;;;:36;3024:225;;;3189:14;3204:1;3189:17;;;;;;;;;;;;;;;;;;3182:24;;3224:16;3216:24;;3024:225;3276:26;3290:4;3296:5;3276:13;:26::i;:::-;3257:45;-1:-1:-1;3327:1:3;3311:17;;;;;-1:-1:-1;3011:3:3;;2980:355;;;-1:-1:-1;3361:16:3;;1542:3;;3360:42;3361:16;;;;:20;3360:42;3341:16;:61;;-1:-1:-1;;3341:61:3;3360:42;;;;3341:61;;;;;;;;;;;;3434:16;;3408:5;;3414:16;3408:23;;;;;;;;:42;-1:-1:-1;;3463:9:3;;-1:-1:-1;;;3463:9:3;;;;-1:-1:-1;;3463:13:3;;2679:802;-1:-1:-1;;;;2679:802:3:o;1175:191:0:-;1225:9;:14;1217:75;;;;-1:-1:-1;;;1217:75:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1298:63;1321:10;1341:4;1348:12;;1298:22;:63::i;:::-;1175:191::o;3187:130:4:-;3245:7;3271:39;3275:1;3278;3271:39;;;;;;;;;;;;;;;;;:3;:39::i;:::-;3264:46;3187:130;-1:-1:-1;;;3187:130:4:o;2961:544:0:-;3070:5;;3081:63;;;-1:-1:-1;;;;;3081:63:0;;;;;;;;;;;;;;;;26:21:-1;;;22:32;;;6:49;;3081:63:0;;;;;;;25:18:-1;;61:17;;-1:-1;;;;;182:15;-1:-1;;;179:29;160:49;;3070:75:0;;;;3035:12;;3049:17;;3070:5;;;3081:63;3070:75;;;;25:18:-1;36:153;66:2;61:3;58:11;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;3070:75:0;;;;;;;;;;;;;;;;;;;;;;;;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;;3034:111:0;;;;3159:7;3151:37;;;;;-1:-1:-1;;;3151:37:0;;;;;;;;;;;;-1:-1:-1;;;3151:37:0;;;;;;;;;;;;;;;3288:11;;:15;3284:217;;3321:4;:11;3336:2;3321:17;3313:72;;;;-1:-1:-1;;;3313:72:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3414:4;3403:24;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;3403:24:0;;-1:-1:-1;3403:24:0;3435:59;;;;-1:-1:-1;;;3435:59:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2961:544;;;;:::o;2367:590::-;2495:5;;2506:74;;;-1:-1:-1;;;;;2506:74:0;;;;;;;;;;;;;;;;;;;;;;;26:21:-1;;;22:32;;;6:49;;2506:74:0;;;;;;;25:18:-1;;61:17;;-1:-1;;;;;182:15;-1:-1;;;179:29;160:49;;2495:86:0;;;;2460:12;;2474:17;;2495:5;;;2506:74;2495:86;;;;25:18:-1;36:153;66:2;61:3;58:11;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2495:86:0;;;;;;;;;;;;;;;;;;;;;;;;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;;2459:122:0;;;;2595:7;2587:45;;;;;-1:-1:-1;;;2587:45:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;2732:11;;:15;2728:225;;2765:4;:11;2780:2;2765:17;2757:72;;;;-1:-1:-1;;;2757:72:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2858:4;2847:24;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2847:24:0;;-1:-1:-1;2847:24:0;2879:67;;;;-1:-1:-1;;;2879:67:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2367:590;;;;;:::o;3832:338:4:-;3918:7;4018:12;4011:5;4003:28;;;;-1:-1:-1;;;4003:28:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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;4003:28:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4041:9;4057:1;4053;:5;;;;;;;3832:338;-1:-1:-1;;;;;3832:338:4:o", - "source": "// https://tornado.cash\n/*\n* d888888P dP a88888b. dP\n* 88 88 d8' `88 88\n* 88 .d8888b. 88d888b. 88d888b. .d8888b. .d888b88 .d8888b. 88 .d8888b. .d8888b. 88d888b.\n* 88 88' `88 88' `88 88' `88 88' `88 88' `88 88' `88 88 88' `88 Y8ooooo. 88' `88\n* 88 88. .88 88 88 88 88. .88 88. .88 88. .88 dP Y8. .88 88. .88 88 88 88\n* dP `88888P' dP dP dP `88888P8 `88888P8 `88888P' 88 Y88888P' `88888P8 `88888P' dP dP\n* ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\n*/\n\npragma solidity 0.5.17;\n\nimport \"./Tornado.sol\";\nimport \"./SafeMath.sol\";\n\ncontract ERC20Tornado is Tornado {\n address public token;\n\n constructor(\n IVerifier _verifier,\n IFeeManager _feeManager,\n uint256 _denomination,\n uint32 _merkleTreeHeight,\n address _operator,\n address _token\n ) Tornado(_verifier, _feeManager, _denomination, _merkleTreeHeight, _operator) public {\n token = _token;\n }\n\n function _processDeposit() internal {\n require(msg.value == 0, \"ETH value is supposed to be 0 for ERC20 instance\");\n _safeErc20TransferFrom(msg.sender, address(this), denomination);\n }\n\n function _processWithdraw(address payable _recipient, address payable _relayer, uint256 _relayer_fee, uint256 _refund) internal {\n require(msg.value == _refund, \"Incorrect refund amount received by the contract\");\n\n address feeTo = feeManager.feeTo();\n uint256 protocolFeeDivisor = feeManager.protocolFeeDivisor();\n\n bool feeOn = feeTo != address(0) && protocolFeeDivisor != 0;\n if (feeOn) {\n uint256 protocolFee = SafeMath.div(denomination, protocolFeeDivisor);\n _safeErc20Transfer(_recipient, denomination - _relayer_fee - protocolFee);\n _safeErc20Transfer(feeTo, protocolFee);\n } else {\n _safeErc20Transfer(_recipient, denomination - _relayer_fee);\n }\n\n if (_relayer_fee > 0) {\n _safeErc20Transfer(_relayer, _relayer_fee);\n }\n\n if (_refund > 0) {\n (bool success, ) = _recipient.call.value(_refund)(\"\");\n if (!success) {\n // let's return _refund back to the relayer\n _relayer.transfer(_refund);\n }\n }\n }\n\n function _safeErc20TransferFrom(address _from, address _to, uint256 _amount) internal {\n (bool success, bytes memory data) = token.call(abi.encodeWithSelector(0x23b872dd /* transferFrom */, _from, _to, _amount));\n require(success, \"not enough allowed tokens\");\n\n // if contract returns some data lets make sure that is `true` according to standard\n if (data.length > 0) {\n require(data.length == 32, \"data length should be either 0 or 32 bytes\");\n success = abi.decode(data, (bool));\n require(success, \"not enough allowed tokens. Token returns false.\");\n }\n }\n\n function _safeErc20Transfer(address _to, uint256 _amount) internal {\n (bool success, bytes memory data) = token.call(abi.encodeWithSelector(0xa9059cbb /* transfer */, _to, _amount));\n require(success, \"not enough tokens\");\n\n // if contract returns some data lets make sure that is `true` according to standard\n if (data.length > 0) {\n require(data.length == 32, \"data length should be either 0 or 32 bytes\");\n success = abi.decode(data, (bool));\n require(success, \"not enough tokens. Token returns false.\");\n }\n }\n}\n", + "metadata": "{\"compiler\":{\"version\":\"0.5.17+commit.d19bba13\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"contract IVerifier\",\"name\":\"_verifier\",\"type\":\"address\"},{\"internalType\":\"contract IFeeManager\",\"name\":\"_feeManager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_denomination\",\"type\":\"uint256\"},{\"internalType\":\"uint32\",\"name\":\"_merkleTreeHeight\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"_operator\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_token\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"commitment\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"leafIndex\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"}],\"name\":\"Deposit\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"encryptedNote\",\"type\":\"bytes\"}],\"name\":\"EncryptedNote\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"previousOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"nullifierHash\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"relayer\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"fee\",\"type\":\"uint256\"}],\"name\":\"Withdrawal\",\"type\":\"event\"},{\"constant\":true,\"inputs\":[],\"name\":\"FIELD_SIZE\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"ROOT_HISTORY_SIZE\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"ZERO_VALUE\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newOperator\",\"type\":\"address\"}],\"name\":\"changeOperator\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"commitments\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"currentRootIndex\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"denomination\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_commitment\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"_encryptedNote\",\"type\":\"bytes\"}],\"name\":\"deposit\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"feeManager\",\"outputs\":[{\"internalType\":\"contract IFeeManager\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"filledSubtrees\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"getLastRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_left\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"_right\",\"type\":\"bytes32\"}],\"name\":\"hashLeftRight\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"pure\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_root\",\"type\":\"bytes32\"}],\"name\":\"isKnownRoot\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_nullifierHash\",\"type\":\"bytes32\"}],\"name\":\"isSpent\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32[]\",\"name\":\"_nullifierHashes\",\"type\":\"bytes32[]\"}],\"name\":\"isSpentArray\",\"outputs\":[{\"internalType\":\"bool[]\",\"name\":\"spent\",\"type\":\"bool[]\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"levels\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"nextIndex\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"nullifierHashes\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"operator\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"roots\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"token\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newVerifier\",\"type\":\"address\"}],\"name\":\"updateVerifier\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"verifier\",\"outputs\":[{\"internalType\":\"contract IVerifier\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_proof\",\"type\":\"bytes\"},{\"internalType\":\"bytes32\",\"name\":\"_root\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"_nullifierHash\",\"type\":\"bytes32\"},{\"internalType\":\"address payable\",\"name\":\"_recipient\",\"type\":\"address\"},{\"internalType\":\"address payable\",\"name\":\"_relayer\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_refund\",\"type\":\"uint256\"}],\"name\":\"withdraw\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"zeros\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{\"changeOperator(address)\":{\"details\":\"operator can change his address \"},\"deposit(bytes32,bytes)\":{\"details\":\"Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\",\"params\":{\"_commitment\":\"the note commitment, which is PedersenHash(nullifier + secret)\"}},\"getLastRoot()\":{\"details\":\"Returns the last root\"},\"hashLeftRight(bytes32,bytes32)\":{\"details\":\"Hash 2 tree leaves, returns MiMC(_left, _right)\"},\"isKnownRoot(bytes32)\":{\"details\":\"Whether the root is present in the root history\"},\"isSpent(bytes32)\":{\"details\":\"whether a note is already spent \"},\"isSpentArray(bytes32[])\":{\"details\":\"whether an array of notes is already spent \"},\"updateVerifier(address)\":{\"details\":\"allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held. After that operator rights are supposed to be transferred to zero address\"},\"withdraw(bytes,bytes32,bytes32,address,address,uint256,uint256)\":{\"details\":\"Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs `input` array consists of: - merkle root of all deposits in the contract - hash of unique deposit nullifier to prevent double spends - the recipient of funds - optional fee that goes to the transaction sender (usually a relay)\"}}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/home/dotfiles/tornado-core/contracts/ERC20Tornado.sol\":\"ERC20Tornado\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/home/dotfiles/tornado-core/contracts/ERC20Tornado.sol\":{\"keccak256\":\"0xa6dcc0fb4b8a500089ffa6ae8d56c9f6a16d996cb4c22e06e25f6b6358083e75\",\"urls\":[\"bzz-raw://cbccf1d3683c264407ca0fb9650f6252b6cb4109bdf88b0cec16ab2cffb67b84\",\"dweb:/ipfs/QmRMbu7RfrXMrq3sGEG8919hD3U7PckzhSJ8KtM5tSiAZm\"]},\"/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol\":{\"keccak256\":\"0x671cc9268dd70c47d18795f7e37fc4df11763fcbcca026edcf163f4239036254\",\"urls\":[\"bzz-raw://9c36a207ed164b60a514eae89bfb15e5b4de4b346c4a89a7a1cb50a940bc699d\",\"dweb:/ipfs/QmbPEqFJAGMpYduLEFsbPazyBsYWcjRtpth8X26wCHALwk\"]},\"/home/home/dotfiles/tornado-core/contracts/SafeMath.sol\":{\"keccak256\":\"0x92dbc60a1308f6f7fc49158be2792c9eb7d4cb2a828628b9ac67b09402caeaf9\",\"urls\":[\"bzz-raw://875473c162bd502c1dd2c1f40f812e337a16da7c27475d7ffc4f9dd72db65c49\",\"dweb:/ipfs/QmUVCJUnPDkQ6AV78uFvegmKJUMtFNb1Jy7cKYJLvHLu2E\"]},\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":{\"keccak256\":\"0xf81220c0ba8ed77606f414c085676c1a46d09bc286ddf6aeffa22d4e1504fc0c\",\"urls\":[\"bzz-raw://962b946c3ed0b58fa24c9b6668443a58c49527b8d01593734fece90669e07955\",\"dweb:/ipfs/QmfFRroF2gQGXHPJ9t4HJz2SMkSzLcrKugmXiJ1H6V45iP\"]},\"@openzeppelin/contracts/utils/ReentrancyGuard.sol\":{\"keccak256\":\"0xb63221b23818d622bfd83d18e0968307e4fcb7a35536bdceded76e1cf8349acd\",\"urls\":[\"bzz-raw://44e1e8c22362c4708a8c3362735f1465f5b05e2f7315e16c7010d694ce019d73\",\"dweb:/ipfs/QmWj9g8X1hxkXRre2kwkEjLBetjuzmSbWHD81bsSojnBkS\"]}},\"version\":1}", + "bytecode": "0x6080604052600380546001600160401b03191690553480156200002157600080fd5b506040516200219e3803806200219e833981810160405260c08110156200004757600080fd5b508051602082015160408301516060840151608085015160a090950151939492939192909185858585858163ffffffff8116620000b65760405162461bcd60e51b8152600401808060200182810382526027815260200180620021156027913960400191505060405180910390fd5b60208163ffffffff1610620000fd5760405162461bcd60e51b81526004018080602001828103825260228152602001806200215c6022913960400191505060405180910390fd5b6000805463ffffffff191663ffffffff83161781556002805460018181019092557f2fe54c60d3acabf3343a35b6eba15db4821b340f76e741e2249685ed4899af6c600080516020620020d483398151915290910181905581548083018355928290526000805160206200217e8339815191529092018290555b60005463ffffffff9081169082161015620001eb57620001a182806001600160e01b03620002b316565b600280546001818101909255600080516020620020d4833981519152018290558054808201825560008290526000805160206200217e833981519152018290559092500162000177565b506200020181806001600160e01b03620002b316565b60046000015550506068805460ff1916600117905582620002545760405162461bcd60e51b8152600401808060200182810382526025815260200180620020af6025913960400191505060405180910390fd5b606c80546001600160a01b03199081166001600160a01b0397881617909155606d8054821695871695909517909455606e8054851691861691909117905550606955606f80549091169290911691909117905550620004a09350505050565b60006000805160206200213c833981519152831062000319576040805162461bcd60e51b815260206004820181905260248201527f5f6c6566742073686f756c6420626520696e7369646520746865206669656c64604482015290519081900360640190fd5b6000805160206200213c8339815191528210620003685760405162461bcd60e51b8152600401808060200182810382526021815260200180620020f46021913960400191505060405180910390fd5b6040805163f47d33b560e01b81526004810185905260006024820181905282518693919273__Hasher________________________________9263f47d33b592604480840193829003018186803b158015620003c357600080fd5b505af4158015620003d8573d6000803e3d6000fd5b505050506040513d6040811015620003ef57600080fd5b50805160209091015190925090506000805160206200213c833981519152848308915073__Hasher________________________________63f47d33b583836040518363ffffffff1660e01b81526004018083815260200182815260200192505050604080518083038186803b1580156200046957600080fd5b505af41580156200047e573d6000803e3d6000fd5b505050506040513d60408110156200049557600080fd5b505195945050505050565b611bff80620004b06000396000f3fe6080604052600436106101665760003560e01c806397fc007c116100d1578063e29973fc1161008a578063ec73295911610064578063ec732959146105f0578063f178e47c14610605578063fc0c546a1461062f578063fc7e9c6f1461064457610166565b8063e29973fc14610527578063e5285dcc1461059c578063e8295588146105c657610166565b806397fc007c146103c05780639fa12d0b146103f3578063ba70f757146104be578063c2b40ae4146104d3578063cd87a3b4146104fd578063d0fb02031461051257610166565b80634ecf518b116101235780634ecf518b146102ff578063570ca7351461032d5780636d9833e314610342578063839df9451461036c5780638bca6d161461039657806390eeb02b146103ab57610166565b806306394c9b1461016b57806317cc915c146101a057806321a0adb6146101de5780632b7ac3f31461027757806338bf282e146102a8578063414a37ba146102ea575b600080fd5b34801561017757600080fd5b5061019e6004803603602081101561018e57600080fd5b50356001600160a01b0316610659565b005b3480156101ac57600080fd5b506101ca600480360360208110156101c357600080fd5b50356106fe565b604080519115158252519081900360200190f35b61019e600480360360e08110156101f457600080fd5b810190602081018135600160201b81111561020e57600080fd5b82018360208201111561022057600080fd5b803590602001918460018302840111600160201b8311171561024157600080fd5b91935091508035906020810135906001600160a01b03604082013581169160608101359091169060808101359060a00135610713565b34801561028357600080fd5b5061028c610a60565b604080516001600160a01b039092168252519081900360200190f35b3480156102b457600080fd5b506102d8600480360360408110156102cb57600080fd5b5080359060200135610a6f565b60408051918252519081900360200190f35b3480156102f657600080fd5b506102d8610c50565b34801561030b57600080fd5b50610314610c62565b6040805163ffffffff9092168252519081900360200190f35b34801561033957600080fd5b5061028c610c6e565b34801561034e57600080fd5b506101ca6004803603602081101561036557600080fd5b5035610c7d565b34801561037857600080fd5b506101ca6004803603602081101561038f57600080fd5b5035610cf0565b3480156103a257600080fd5b506102d8610d05565b3480156103b757600080fd5b50610314610d0b565b3480156103cc57600080fd5b5061019e600480360360208110156103e357600080fd5b50356001600160a01b0316610d17565b3480156103ff57600080fd5b5061046e6004803603602081101561041657600080fd5b810190602081018135600160201b81111561043057600080fd5b82018360208201111561044257600080fd5b803590602001918460208302840111600160201b8311171561046357600080fd5b509092509050610d82565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156104aa578181015183820152602001610492565b505050509050019250505060405180910390f35b3480156104ca57600080fd5b506102d8610e0a565b3480156104df57600080fd5b506102d8600480360360208110156104f657600080fd5b5035610e2a565b34801561050957600080fd5b50610314610e3e565b34801561051e57600080fd5b5061028c610e43565b61019e6004803603604081101561053d57600080fd5b81359190810190604081016020820135600160201b81111561055e57600080fd5b82018360208201111561057057600080fd5b803590602001918460018302840111600160201b8311171561059157600080fd5b509092509050610e52565b3480156105a857600080fd5b506101ca600480360360208110156105bf57600080fd5b5035610feb565b3480156105d257600080fd5b506102d8600480360360208110156105e957600080fd5b5035611000565b3480156105fc57600080fd5b506102d861101e565b34801561061157600080fd5b506102d86004803603602081101561062857600080fd5b5035611042565b34801561063b57600080fd5b5061028c61104f565b34801561065057600080fd5b5061031461105e565b606e546001600160a01b031633146106a25760405162461bcd60e51b8152600401808060200182810382526025815260200180611ba66025913960400191505060405180910390fd5b606e546040516001600160a01b038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a3606e80546001600160a01b0319166001600160a01b0392909216919091179055565b606a6020526000908152604090205460ff1681565b60685460ff1661076a576040805162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604482015290519081900360640190fd5b6068805460ff191690556069548211156107cb576040805162461bcd60e51b815260206004820152601a60248201527f4665652065786365656473207472616e736665722076616c7565000000000000604482015290519081900360640190fd5b6000858152606a602052604090205460ff161561082f576040805162461bcd60e51b815260206004820152601f60248201527f546865206e6f746520686173206265656e20616c7265616479207370656e7400604482015290519081900360640190fd5b61083886610c7d565b610889576040805162461bcd60e51b815260206004820152601c60248201527f43616e6e6f742066696e6420796f7572206d65726b6c6520726f6f7400000000604482015290519081900360640190fd5b606c546040805160c08082018352898252602082018990526001600160a01b038881168385015287811660608401526080830187905260a08301869052925163695ef6f960e01b8152929093169263695ef6f9928c928c9290916004810191829160240190849080838360005b8381101561090e5781810151838201526020016108f6565b505050509050018281038252858582818152602001925080828437600081840152601f19601f820116905080830192505050945050505050602060405180830381600087803b15801561096057600080fd5b505af1158015610974573d6000803e3d6000fd5b505050506040513d602081101561098a57600080fd5b50516109d6576040805162461bcd60e51b815260206004820152601660248201527524b73b30b634b2103bb4ba34323930bb90383937b7b360511b604482015290519081900360640190fd5b6000858152606a60205260409020805460ff191660011790556109fb84848484611071565b604080516001600160a01b038681168252602082018890528183018590529151918516917fe9e508bad6d4c3227e881ca19068f099da81b5164dd6d62b2eaf1e8bc6c349319181900360600190a250506068805460ff19166001179055505050505050565b606c546001600160a01b031681565b6000600080516020611b358339815191528310610ad3576040805162461bcd60e51b815260206004820181905260248201527f5f6c6566742073686f756c6420626520696e7369646520746865206669656c64604482015290519081900360640190fd5b600080516020611b358339815191528210610b1f5760405162461bcd60e51b8152600401808060200182810382526021815260200180611ae56021913960400191505060405180910390fd5b6040805163f47d33b560e01b81526004810185905260006024820181905282518693919273__Hasher________________________________9263f47d33b592604480840193829003018186803b158015610b7957600080fd5b505af4158015610b8d573d6000803e3d6000fd5b505050506040513d6040811015610ba357600080fd5b5080516020909101519092509050600080516020611b35833981519152848308915073__Hasher________________________________63f47d33b583836040518363ffffffff1660e01b81526004018083815260200182815260200192505050604080518083038186803b158015610c1b57600080fd5b505af4158015610c2f573d6000803e3d6000fd5b505050506040513d6040811015610c4557600080fd5b505195945050505050565b600080516020611b3583398151915281565b60005463ffffffff1681565b606e546001600160a01b031681565b600081610c8c57506000610ceb565b60035463ffffffff165b60048163ffffffff1660648110610ca957fe5b0154831415610cbc576001915050610ceb565b63ffffffff8116610ccb575060645b6003546000199091019063ffffffff80831691161415610c965760009150505b919050565b606b6020526000908152604090205460ff1681565b60695481565b60035463ffffffff1681565b606e546001600160a01b03163314610d605760405162461bcd60e51b8152600401808060200182810382526025815260200180611ba66025913960400191505060405180910390fd5b606c80546001600160a01b0319166001600160a01b0392909216919091179055565b604080518281526020808402820101909152606090828015610dae578160200160208202803883390190505b50905060005b82811015610e0357610dd7848483818110610dcb57fe5b90506020020135610feb565b15610dfb576001828281518110610dea57fe5b911515602092830291909101909101525b600101610db4565b5092915050565b60035460009060049063ffffffff1660648110610e2357fe5b0154905090565b60048160648110610e3757fe5b0154905081565b606481565b606d546001600160a01b031681565b60685460ff16610ea9576040805162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604482015290519081900360640190fd5b6068805460ff191690556000838152606b602052604090205460ff1615610f015760405162461bcd60e51b8152600401808060200182810382526021815260200180611b556021913960400191505060405180910390fd5b6000610f0c846112b9565b6000858152606b60205260409020805460ff191660011790559050610f2f611450565b6040805163ffffffff83168152426020820152815186927fa945e51eec50ab98c161376f0db4cf2aeba3ec92755fe2fcd388bdbbb80ff196928290030190a2336001600160a01b03167ffa28df43db3553771f7209dcef046f3bdfea15870ab625dcda30ac58b82b4008848460405180806020018281038252848482818152602001925080828437600083820152604051601f909101601f19169092018290039550909350505050a250506068805460ff191660011790555050565b6000908152606a602052604090205460ff1690565b6002818154811061100d57fe5b600091825260209091200154905081565b7f2fe54c60d3acabf3343a35b6eba15db4821b340f76e741e2249685ed4899af6c81565b6001818154811061100d57fe5b606f546001600160a01b031681565b600354600160201b900463ffffffff1681565b8034146110af5760405162461bcd60e51b8152600401808060200182810382526030815260200180611a8e6030913960400191505060405180910390fd5b606d5460408051622fcfcb60e31b815290516000926001600160a01b03169163017e7e58916004808301926020929190829003018186803b1580156110f357600080fd5b505afa158015611107573d6000803e3d6000fd5b505050506040513d602081101561111d57600080fd5b5051606d5460408051633b46a6e760e01b815290519293506000926001600160a01b0390921691633b46a6e791600480820192602092909190829003018186803b15801561116a57600080fd5b505afa15801561117e573d6000803e3d6000fd5b505050506040513d602081101561119457600080fd5b5051905060006001600160a01b038316158015906111b157508115155b905080156111f75760006111c76069548461149c565b90506111e7886111e26069546111dd8a866114e5565b61153f565b611581565b6111f18482611581565b50611207565b611207876111e26069548861153f565b8415611217576112178686611581565b83156112b0576040516000906001600160a01b0389169086908381818185875af1925050503d8060008114611268576040519150601f19603f3d011682016040523d82523d6000602084013e61126d565b606091505b50509050806112ae576040516001600160a01b0388169086156108fc029087906000818181858888f193505050501580156112ac573d6000803e3d6000fd5b505b505b50505050505050565b60035460008054909163ffffffff600160201b909104811691811660020a168114156113165760405162461bcd60e51b815260040180806020018281038252602f815260200180611a35602f913960400191505060405180910390fd5b6003805463ffffffff600160201b80830482166001019091160267ffffffff000000001990911617905582600080805b60005463ffffffff90811690821610156113ee57600185166113aa5783925060028163ffffffff168154811061137857fe5b906000526020600020015491508360018263ffffffff168154811061139957fe5b6000918252602090912001556113ce565b60018163ffffffff16815481106113bd57fe5b906000526020600020015492508391505b6113d88383610a6f565b9350600263ffffffff8616049450600101611346565b5060035460649063ffffffff908116600101166003805463ffffffff19169290910663ffffffff90811692909217908190558491600491166064811061143057fe5b01555050600354600160201b900463ffffffff1660001901949350505050565b341561148d5760405162461bcd60e51b8152600401808060200182810382526030815260200180611b766030913960400191505060405180910390fd5b61149a3330606954611752565b565b60006114de83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250611938565b9392505050565b6000828201838110156114de576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b60006114de83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f7700008152506119da565b606f54604080516001600160a01b038581166024830152604480830186905283518084039091018152606490920183526020820180516001600160e01b031663a9059cbb60e01b178152925182516000956060959316939282918083835b602083106115fe5780518252601f1990920191602091820191016115df565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114611660576040519150601f19603f3d011682016040523d82523d6000602084013e611665565b606091505b5091509150816116b0576040805162461bcd60e51b81526020600482015260116024820152706e6f7420656e6f75676820746f6b656e7360781b604482015290519081900360640190fd5b80511561174c5780516020146116f75760405162461bcd60e51b815260040180806020018281038252602a815260200180611a64602a913960400191505060405180910390fd5b80806020019051602081101561170c57600080fd5b505191508161174c5760405162461bcd60e51b8152600401808060200182810382526027815260200180611abe6027913960400191505060405180910390fd5b50505050565b606f54604080516001600160a01b0386811660248301528581166044830152606480830186905283518084039091018152608490920183526020820180516001600160e01b03166323b872dd60e01b178152925182516000956060959316939282918083835b602083106117d75780518252601f1990920191602091820191016117b8565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114611839576040519150601f19603f3d011682016040523d82523d6000602084013e61183e565b606091505b509150915081611895576040805162461bcd60e51b815260206004820152601960248201527f6e6f7420656e6f75676820616c6c6f77656420746f6b656e7300000000000000604482015290519081900360640190fd5b8051156119315780516020146118dc5760405162461bcd60e51b815260040180806020018281038252602a815260200180611a64602a913960400191505060405180910390fd5b8080602001905160208110156118f157600080fd5b50519150816119315760405162461bcd60e51b815260040180806020018281038252602f815260200180611b06602f913960400191505060405180910390fd5b5050505050565b600081836119c45760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015611989578181015183820152602001611971565b50505050905090810190601f1680156119b65780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b5060008385816119d057fe5b0495945050505050565b60008184841115611a2c5760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315611989578181015183820152602001611971565b50505090039056fe4d65726b6c6520747265652069732066756c6c2e204e6f206d6f7265206c656166732063616e20626520616464656464617461206c656e6774682073686f756c64206265206569746865722030206f72203332206279746573496e636f727265637420726566756e6420616d6f756e742072656365697665642062792074686520636f6e74726163746e6f7420656e6f75676820746f6b656e732e20546f6b656e2072657475726e732066616c73652e5f72696768742073686f756c6420626520696e7369646520746865206669656c646e6f7420656e6f75676820616c6c6f77656420746f6b656e732e20546f6b656e2072657475726e732066616c73652e30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000154686520636f6d6d69746d656e7420686173206265656e207375626d69747465644554482076616c756520697320737570706f73656420746f206265203020666f7220455243323020696e7374616e63654f6e6c79206f70657261746f722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a723158204d4ae3e08303d800141bbbac1b3ffb646cf56804088b7e609ad6d12006bae44864736f6c6343000511003264656e6f6d696e6174696f6e2073686f756c642062652067726561746572207468616e2030405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace5f72696768742073686f756c6420626520696e7369646520746865206669656c645f747265654c6576656c732073686f756c642062652067726561746572207468616e207a65726f30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000015f747265654c6576656c732073686f756c64206265206c657373207468616e203332b10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", + "deployedBytecode": "0x6080604052600436106101665760003560e01c806397fc007c116100d1578063e29973fc1161008a578063ec73295911610064578063ec732959146105f0578063f178e47c14610605578063fc0c546a1461062f578063fc7e9c6f1461064457610166565b8063e29973fc14610527578063e5285dcc1461059c578063e8295588146105c657610166565b806397fc007c146103c05780639fa12d0b146103f3578063ba70f757146104be578063c2b40ae4146104d3578063cd87a3b4146104fd578063d0fb02031461051257610166565b80634ecf518b116101235780634ecf518b146102ff578063570ca7351461032d5780636d9833e314610342578063839df9451461036c5780638bca6d161461039657806390eeb02b146103ab57610166565b806306394c9b1461016b57806317cc915c146101a057806321a0adb6146101de5780632b7ac3f31461027757806338bf282e146102a8578063414a37ba146102ea575b600080fd5b34801561017757600080fd5b5061019e6004803603602081101561018e57600080fd5b50356001600160a01b0316610659565b005b3480156101ac57600080fd5b506101ca600480360360208110156101c357600080fd5b50356106fe565b604080519115158252519081900360200190f35b61019e600480360360e08110156101f457600080fd5b810190602081018135600160201b81111561020e57600080fd5b82018360208201111561022057600080fd5b803590602001918460018302840111600160201b8311171561024157600080fd5b91935091508035906020810135906001600160a01b03604082013581169160608101359091169060808101359060a00135610713565b34801561028357600080fd5b5061028c610a60565b604080516001600160a01b039092168252519081900360200190f35b3480156102b457600080fd5b506102d8600480360360408110156102cb57600080fd5b5080359060200135610a6f565b60408051918252519081900360200190f35b3480156102f657600080fd5b506102d8610c50565b34801561030b57600080fd5b50610314610c62565b6040805163ffffffff9092168252519081900360200190f35b34801561033957600080fd5b5061028c610c6e565b34801561034e57600080fd5b506101ca6004803603602081101561036557600080fd5b5035610c7d565b34801561037857600080fd5b506101ca6004803603602081101561038f57600080fd5b5035610cf0565b3480156103a257600080fd5b506102d8610d05565b3480156103b757600080fd5b50610314610d0b565b3480156103cc57600080fd5b5061019e600480360360208110156103e357600080fd5b50356001600160a01b0316610d17565b3480156103ff57600080fd5b5061046e6004803603602081101561041657600080fd5b810190602081018135600160201b81111561043057600080fd5b82018360208201111561044257600080fd5b803590602001918460208302840111600160201b8311171561046357600080fd5b509092509050610d82565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156104aa578181015183820152602001610492565b505050509050019250505060405180910390f35b3480156104ca57600080fd5b506102d8610e0a565b3480156104df57600080fd5b506102d8600480360360208110156104f657600080fd5b5035610e2a565b34801561050957600080fd5b50610314610e3e565b34801561051e57600080fd5b5061028c610e43565b61019e6004803603604081101561053d57600080fd5b81359190810190604081016020820135600160201b81111561055e57600080fd5b82018360208201111561057057600080fd5b803590602001918460018302840111600160201b8311171561059157600080fd5b509092509050610e52565b3480156105a857600080fd5b506101ca600480360360208110156105bf57600080fd5b5035610feb565b3480156105d257600080fd5b506102d8600480360360208110156105e957600080fd5b5035611000565b3480156105fc57600080fd5b506102d861101e565b34801561061157600080fd5b506102d86004803603602081101561062857600080fd5b5035611042565b34801561063b57600080fd5b5061028c61104f565b34801561065057600080fd5b5061031461105e565b606e546001600160a01b031633146106a25760405162461bcd60e51b8152600401808060200182810382526025815260200180611ba66025913960400191505060405180910390fd5b606e546040516001600160a01b038084169216907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a3606e80546001600160a01b0319166001600160a01b0392909216919091179055565b606a6020526000908152604090205460ff1681565b60685460ff1661076a576040805162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604482015290519081900360640190fd5b6068805460ff191690556069548211156107cb576040805162461bcd60e51b815260206004820152601a60248201527f4665652065786365656473207472616e736665722076616c7565000000000000604482015290519081900360640190fd5b6000858152606a602052604090205460ff161561082f576040805162461bcd60e51b815260206004820152601f60248201527f546865206e6f746520686173206265656e20616c7265616479207370656e7400604482015290519081900360640190fd5b61083886610c7d565b610889576040805162461bcd60e51b815260206004820152601c60248201527f43616e6e6f742066696e6420796f7572206d65726b6c6520726f6f7400000000604482015290519081900360640190fd5b606c546040805160c08082018352898252602082018990526001600160a01b038881168385015287811660608401526080830187905260a08301869052925163695ef6f960e01b8152929093169263695ef6f9928c928c9290916004810191829160240190849080838360005b8381101561090e5781810151838201526020016108f6565b505050509050018281038252858582818152602001925080828437600081840152601f19601f820116905080830192505050945050505050602060405180830381600087803b15801561096057600080fd5b505af1158015610974573d6000803e3d6000fd5b505050506040513d602081101561098a57600080fd5b50516109d6576040805162461bcd60e51b815260206004820152601660248201527524b73b30b634b2103bb4ba34323930bb90383937b7b360511b604482015290519081900360640190fd5b6000858152606a60205260409020805460ff191660011790556109fb84848484611071565b604080516001600160a01b038681168252602082018890528183018590529151918516917fe9e508bad6d4c3227e881ca19068f099da81b5164dd6d62b2eaf1e8bc6c349319181900360600190a250506068805460ff19166001179055505050505050565b606c546001600160a01b031681565b6000600080516020611b358339815191528310610ad3576040805162461bcd60e51b815260206004820181905260248201527f5f6c6566742073686f756c6420626520696e7369646520746865206669656c64604482015290519081900360640190fd5b600080516020611b358339815191528210610b1f5760405162461bcd60e51b8152600401808060200182810382526021815260200180611ae56021913960400191505060405180910390fd5b6040805163f47d33b560e01b81526004810185905260006024820181905282518693919273__Hasher________________________________9263f47d33b592604480840193829003018186803b158015610b7957600080fd5b505af4158015610b8d573d6000803e3d6000fd5b505050506040513d6040811015610ba357600080fd5b5080516020909101519092509050600080516020611b35833981519152848308915073__Hasher________________________________63f47d33b583836040518363ffffffff1660e01b81526004018083815260200182815260200192505050604080518083038186803b158015610c1b57600080fd5b505af4158015610c2f573d6000803e3d6000fd5b505050506040513d6040811015610c4557600080fd5b505195945050505050565b600080516020611b3583398151915281565b60005463ffffffff1681565b606e546001600160a01b031681565b600081610c8c57506000610ceb565b60035463ffffffff165b60048163ffffffff1660648110610ca957fe5b0154831415610cbc576001915050610ceb565b63ffffffff8116610ccb575060645b6003546000199091019063ffffffff80831691161415610c965760009150505b919050565b606b6020526000908152604090205460ff1681565b60695481565b60035463ffffffff1681565b606e546001600160a01b03163314610d605760405162461bcd60e51b8152600401808060200182810382526025815260200180611ba66025913960400191505060405180910390fd5b606c80546001600160a01b0319166001600160a01b0392909216919091179055565b604080518281526020808402820101909152606090828015610dae578160200160208202803883390190505b50905060005b82811015610e0357610dd7848483818110610dcb57fe5b90506020020135610feb565b15610dfb576001828281518110610dea57fe5b911515602092830291909101909101525b600101610db4565b5092915050565b60035460009060049063ffffffff1660648110610e2357fe5b0154905090565b60048160648110610e3757fe5b0154905081565b606481565b606d546001600160a01b031681565b60685460ff16610ea9576040805162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604482015290519081900360640190fd5b6068805460ff191690556000838152606b602052604090205460ff1615610f015760405162461bcd60e51b8152600401808060200182810382526021815260200180611b556021913960400191505060405180910390fd5b6000610f0c846112b9565b6000858152606b60205260409020805460ff191660011790559050610f2f611450565b6040805163ffffffff83168152426020820152815186927fa945e51eec50ab98c161376f0db4cf2aeba3ec92755fe2fcd388bdbbb80ff196928290030190a2336001600160a01b03167ffa28df43db3553771f7209dcef046f3bdfea15870ab625dcda30ac58b82b4008848460405180806020018281038252848482818152602001925080828437600083820152604051601f909101601f19169092018290039550909350505050a250506068805460ff191660011790555050565b6000908152606a602052604090205460ff1690565b6002818154811061100d57fe5b600091825260209091200154905081565b7f2fe54c60d3acabf3343a35b6eba15db4821b340f76e741e2249685ed4899af6c81565b6001818154811061100d57fe5b606f546001600160a01b031681565b600354600160201b900463ffffffff1681565b8034146110af5760405162461bcd60e51b8152600401808060200182810382526030815260200180611a8e6030913960400191505060405180910390fd5b606d5460408051622fcfcb60e31b815290516000926001600160a01b03169163017e7e58916004808301926020929190829003018186803b1580156110f357600080fd5b505afa158015611107573d6000803e3d6000fd5b505050506040513d602081101561111d57600080fd5b5051606d5460408051633b46a6e760e01b815290519293506000926001600160a01b0390921691633b46a6e791600480820192602092909190829003018186803b15801561116a57600080fd5b505afa15801561117e573d6000803e3d6000fd5b505050506040513d602081101561119457600080fd5b5051905060006001600160a01b038316158015906111b157508115155b905080156111f75760006111c76069548461149c565b90506111e7886111e26069546111dd8a866114e5565b61153f565b611581565b6111f18482611581565b50611207565b611207876111e26069548861153f565b8415611217576112178686611581565b83156112b0576040516000906001600160a01b0389169086908381818185875af1925050503d8060008114611268576040519150601f19603f3d011682016040523d82523d6000602084013e61126d565b606091505b50509050806112ae576040516001600160a01b0388169086156108fc029087906000818181858888f193505050501580156112ac573d6000803e3d6000fd5b505b505b50505050505050565b60035460008054909163ffffffff600160201b909104811691811660020a168114156113165760405162461bcd60e51b815260040180806020018281038252602f815260200180611a35602f913960400191505060405180910390fd5b6003805463ffffffff600160201b80830482166001019091160267ffffffff000000001990911617905582600080805b60005463ffffffff90811690821610156113ee57600185166113aa5783925060028163ffffffff168154811061137857fe5b906000526020600020015491508360018263ffffffff168154811061139957fe5b6000918252602090912001556113ce565b60018163ffffffff16815481106113bd57fe5b906000526020600020015492508391505b6113d88383610a6f565b9350600263ffffffff8616049450600101611346565b5060035460649063ffffffff908116600101166003805463ffffffff19169290910663ffffffff90811692909217908190558491600491166064811061143057fe5b01555050600354600160201b900463ffffffff1660001901949350505050565b341561148d5760405162461bcd60e51b8152600401808060200182810382526030815260200180611b766030913960400191505060405180910390fd5b61149a3330606954611752565b565b60006114de83836040518060400160405280601a81526020017f536166654d6174683a206469766973696f6e206279207a65726f000000000000815250611938565b9392505050565b6000828201838110156114de576040805162461bcd60e51b815260206004820152601b60248201527f536166654d6174683a206164646974696f6e206f766572666c6f770000000000604482015290519081900360640190fd5b60006114de83836040518060400160405280601e81526020017f536166654d6174683a207375627472616374696f6e206f766572666c6f7700008152506119da565b606f54604080516001600160a01b038581166024830152604480830186905283518084039091018152606490920183526020820180516001600160e01b031663a9059cbb60e01b178152925182516000956060959316939282918083835b602083106115fe5780518252601f1990920191602091820191016115df565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114611660576040519150601f19603f3d011682016040523d82523d6000602084013e611665565b606091505b5091509150816116b0576040805162461bcd60e51b81526020600482015260116024820152706e6f7420656e6f75676820746f6b656e7360781b604482015290519081900360640190fd5b80511561174c5780516020146116f75760405162461bcd60e51b815260040180806020018281038252602a815260200180611a64602a913960400191505060405180910390fd5b80806020019051602081101561170c57600080fd5b505191508161174c5760405162461bcd60e51b8152600401808060200182810382526027815260200180611abe6027913960400191505060405180910390fd5b50505050565b606f54604080516001600160a01b0386811660248301528581166044830152606480830186905283518084039091018152608490920183526020820180516001600160e01b03166323b872dd60e01b178152925182516000956060959316939282918083835b602083106117d75780518252601f1990920191602091820191016117b8565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114611839576040519150601f19603f3d011682016040523d82523d6000602084013e61183e565b606091505b509150915081611895576040805162461bcd60e51b815260206004820152601960248201527f6e6f7420656e6f75676820616c6c6f77656420746f6b656e7300000000000000604482015290519081900360640190fd5b8051156119315780516020146118dc5760405162461bcd60e51b815260040180806020018281038252602a815260200180611a64602a913960400191505060405180910390fd5b8080602001905160208110156118f157600080fd5b50519150816119315760405162461bcd60e51b815260040180806020018281038252602f815260200180611b06602f913960400191505060405180910390fd5b5050505050565b600081836119c45760405162461bcd60e51b81526004018080602001828103825283818151815260200191508051906020019080838360005b83811015611989578181015183820152602001611971565b50505050905090810190601f1680156119b65780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b5060008385816119d057fe5b0495945050505050565b60008184841115611a2c5760405162461bcd60e51b8152602060048201818152835160248401528351909283926044909101919085019080838360008315611989578181015183820152602001611971565b50505090039056fe4d65726b6c6520747265652069732066756c6c2e204e6f206d6f7265206c656166732063616e20626520616464656464617461206c656e6774682073686f756c64206265206569746865722030206f72203332206279746573496e636f727265637420726566756e6420616d6f756e742072656365697665642062792074686520636f6e74726163746e6f7420656e6f75676820746f6b656e732e20546f6b656e2072657475726e732066616c73652e5f72696768742073686f756c6420626520696e7369646520746865206669656c646e6f7420656e6f75676820616c6c6f77656420746f6b656e732e20546f6b656e2072657475726e732066616c73652e30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000154686520636f6d6d69746d656e7420686173206265656e207375626d69747465644554482076616c756520697320737570706f73656420746f206265203020666f7220455243323020696e7374616e63654f6e6c79206f70657261746f722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a723158204d4ae3e08303d800141bbbac1b3ffb646cf56804088b7e609ad6d12006bae44864736f6c63430005110032", + "sourceMap": "830:2716:0:-;;;1430:34:2;;;-1:-1:-1;;;;;;1468:27:2;;;892:279:0;5:2:-1;;;;30:1;27;20:12;5:2;892:279:0;;;;;;;;;;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;-1:-1;892:279:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1646:15:2;;;1638:67;;;;-1:-1:-1;;;1638:67:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1733:2;1719:11;:16;;;1711:63;;;;-1:-1:-1;;;1711:63:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1780:6;:20;;-1:-1:-1;;1780:20:2;;;;;;;1854:5;27:10:-1;;-1:-1;23:18;;;45:23;;;1088:77:2;-1:-1:-1;;;;;;;;;;;1854:23:2;;;;;;27:10:-1;;23:18;;;45:23;;1883:32:2;;;;-1:-1:-1;;;;;;;;;;;1883:32:2;;;;;;1922:175;1945:6;;;;;;1941:10;;;;1922:175;;;1980:39;1994:11;;-1:-1:-1;;;;;1980:13:2;:39;:::i;:::-;2027:5;27:10:-1;;39:1;23:18;;;45:23;;;-1:-1;;;;;;;;;;;2027:23:2;;;;27:10:-1;;23:18;;;45:23;;-1:-1;2058:32:2;;;-1:-1:-1;;;;;;;;;;;2058:32:2;;;;1966:53;;-1:-1:-1;1953:3:2;1922:175;;;-1:-1:-1;2114:39:2;2128:11;;-1:-1:-1;;;;;2114:13:2;:39;:::i;:::-;2103:5;2109:1;2103:8;:50;-1:-1:-1;;1421:11:5;:18;;-1:-1:-1;;1421:18:5;1435:4;1421:18;;;1865:17:4;1857:67;;;;-1:-1:-1;;;1857:67:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1930:8;:20;;-1:-1:-1;;;;;;1930:20:4;;;-1:-1:-1;;;;;1930:20:4;;;;;;;1956:10;:24;;;;;;;;;;;;;;1986:8;:20;;;;;;;;;;;;;-1:-1:-1;2012:12:4;:28;1152:5:0;:14;;;;;;;;;;;;;;;-1:-1:-1;830:2716:0;;-1:-1:-1;;;;830:2716:0;2230:445:2;2305:7;-1:-1:-1;;;;;;;;;;;2328:27:2;;2320:72;;;;;-1:-1:-1;;;2320:72:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;;;;;;;2406:28:2;;2398:74;;;;-1:-1:-1;;;2398:74:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2538:23;;;-1:-1:-1;;;2538:23:2;;;;;;;;2478:9;2538:23;;;;;;;;2498:5;;2478:9;;2538:6;;:17;;:23;;;;;;;;;;:6;:23;;;5:2:-1;;;;30:1;27;20:12;5:2;2538:23:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2538:23:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2538:23:2;;;;;;;;;-1:-1:-1;2538:23:2;-1:-1:-1;;;;;;;;;;;;2589:6:2;2578:1;2571:38;2567:42;;2624:6;:17;2642:1;2645;2624:23;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2624:23:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2624:23:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2624:23:2;;2230:445;-1:-1:-1;;;;;2230:445:2:o;830:2716:0:-;;;;;;;", + "deployedSourceMap": "830:2716:0:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5081:157:4;;8:9:-1;5:2;;;30:1;27;20:12;5:2;5081:157:4;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;5081:157:4;-1:-1:-1;;;;;5081:157:4;;:::i;:::-;;477:47;;8:9:-1;5:2;;;30:1;27;20:12;5:2;477:47:4;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;477:47:4;;:::i;:::-;;;;;;;;;;;;;;;;;;3196:781;;;;;;13:3:-1;8;5:12;2:2;;;30:1;27;20:12;2:2;3196:781:4;;;;;;;;-1:-1:-1;;;5:28;;2:2;;;46:1;43;36:12;2:2;3196:781:4;;35:9:-1;28:4;12:14;8:25;5:40;2:2;;;58:1;55;48:12;2:2;3196:781:4;;;;;;100:9:-1;95:1;81:12;77:20;67:8;63:35;60:50;-1:-1;;;25:12;22:29;11:107;8:2;;;131:1;128;121:12;8:2;3196:781:4;;-1:-1:-1;3196:781:4;-1:-1:-1;3196:781:4;;;;;;;;-1:-1:-1;;;;;3196:781:4;;;;;;;;;;;;;;;;;;;;;;;;:::i;666:25::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;666:25:4;;;:::i;:::-;;;;-1:-1:-1;;;;;666:25:4;;;;;;;;;;;;;;2230:445:2;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2230:445:2;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2230:445:2;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;933:114;;8:9:-1;5:2;;;30:1;27;20:12;5:2;933:114:2;;;:::i;1209:20::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1209:20:2;;;:::i;:::-;;;;;;;;;;;;;;;;;;;884:23:4;;8:9:-1;5:2;;;30:1;27;20:12;5:2;884:23:4;;;:::i;3553:342:2:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3553:342:2;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;3553:342:2;;:::i;619:43:4:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;619:43:4;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;619:43:4;;:::i;446:27::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;446:27:4;;;:::i;1430:34:2:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1430:34:2;;;:::i;4918:113:4:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4918:113:4;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4918:113:4;-1:-1:-1;;;;;4918:113:4;;:::i;4395:293::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4395:293:4;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;4395:293:4;;;;;;;;-1:-1:-1;;;5:28;;2:2;;;46:1;43;36:12;2:2;4395:293:4;;35:9:-1;28:4;12:14;8:25;5:40;2:2;;;58:1;55;48:12;2:2;4395:293:4;;;;;;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;-1:-1;4395:293:4;;-1:-1:-1;4395:293:4;-1:-1:-1;4395:293:4;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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;4395:293:4;;;;;;;;;;;;;;;;;3941:93:2;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3941:93:2;;;:::i;1549:39::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1549:39:2;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1549:39:2;;:::i;1499:46::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1499:46:2;;;:::i;695:29:4:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;695:29:4;;;:::i;2293:407::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;2293:407:4;;;;;;;;;;;;;;-1:-1:-1;;;5:28;;2:2;;;46:1;43;36:12;2:2;2293:407:4;;35:9:-1;28:4;12:14;8:25;5:40;2:2;;;58:1;55;48:12;2:2;2293:407:4;;;;;;100:9:-1;95:1;81:12;77:20;67:8;63:35;60:50;-1:-1;;;25:12;22:29;11:107;8:2;;;131:1;128;121:12;8:2;-1:-1;2293:407:4;;-1:-1:-1;2293:407:4;-1:-1:-1;2293:407:4;:::i;4218:116::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;4218:116:4;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;4218:116:4;;:::i;1404:22:2:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1404:22:2;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1404:22:2;;:::i;1051:114::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1051:114:2;;;:::i;1369:31::-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1369:31:2;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1369:31:2;;:::i;867:20:0:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;867:20:0;;;:::i;1468:27:2:-;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1468:27:2;;;:::i;5081:157:4:-;961:8;;-1:-1:-1;;;;;961:8:4;947:10;:22;939:72;;;;-1:-1:-1;;;939:72:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5181:8;;5160:44;;-1:-1:-1;;;;;5160:44:4;;;;5181:8;;5160:44;;5181:8;;5160:44;5210:8;:23;;-1:-1:-1;;;;;;5210:23:4;-1:-1:-1;;;;;5210:23:4;;;;;;;;;;5081:157::o;477:47::-;;;;;;;;;;;;;;;:::o;3196:781::-;1934:11:5;;;;1926:55;;;;;-1:-1:-1;;;1926:55:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;2056:11;:19;;-1:-1:-1;;2056:19:5;;;3413:12:4;;3405:20;;;3397:59;;;;;-1:-1:-1;;;3397:59:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;3471:31;;;;:15;:31;;;;;;;;3470:32;3462:76;;;;;-1:-1:-1;;;3462:76:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;3552:18;3564:5;3552:11;:18::i;:::-;3544:59;;;;;-1:-1:-1;;;3544:59:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;3650:8;;:126;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;3721:19:4;;;3650:126;;;;3742:17;;;3650:126;;;;;;;;;;;;;;;;;;-1:-1:-1;;;3650:126:4;;:8;;;;;:20;;3671:6;;;;3650:126;;;;;;;;;;;;;;;;:8;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;3650:126:4;;;;;;;;;;;;;;;;;;;;;30:3:-1;22:6;14;1:33;99:1;93:3;85:6;81:16;74:27;137:4;133:9;126:4;121:3;117:14;113:30;106:37;;169:3;161:6;157:16;147:26;;3650:126:4;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;3650:126:4;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;3650:126:4;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;3650:126:4;3642:161;;;;;-1:-1:-1;;;3642:161:4;;;;;;;;;;;;-1:-1:-1;;;3642:161:4;;;;;;;;;;;;;;;3810:31;;;;:15;:31;;;;;:38;;-1:-1:-1;;3810:38:4;3844:4;3810:38;;;3854:53;3871:10;3883:8;3893:4;3899:7;3854:16;:53::i;:::-;3918:54;;;-1:-1:-1;;;;;3918:54:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;2230:11:5;:18;;-1:-1:-1;;2230:18:5;2244:4;2230:18;;;-1:-1:-1;;;;;;3196:781:4:o;666:25::-;;;-1:-1:-1;;;;;666:25:4;;:::o;2230:445:2:-;2305:7;-1:-1:-1;;;;;;;;;;;2328:27:2;;2320:72;;;;;-1:-1:-1;;;2320:72:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;;;;;;;2406:28:2;;2398:74;;;;-1:-1:-1;;;2398:74:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2538:23;;;-1:-1:-1;;;2538:23:2;;;;;;;;2478:9;2538:23;;;;;;;;2498:5;;2478:9;;2538:6;;:17;;:23;;;;;;;;;;:6;:23;;;5:2:-1;;;;30:1;27;20:12;5:2;2538:23:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2538:23:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2538:23:2;;;;;;;;;-1:-1:-1;2538:23:2;-1:-1:-1;;;;;;;;;;;;2589:6:2;2578:1;2571:38;2567:42;;2624:6;:17;2642:1;2645;2624:23;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;2624:23:2;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2624:23:2;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2624:23:2;;2230:445;-1:-1:-1;;;;;2230:445:2:o;933:114::-;-1:-1:-1;;;;;;;;;;;933:114:2;:::o;1209:20::-;;;;;;:::o;884:23:4:-;;;-1:-1:-1;;;;;884:23:4;;:::o;3553:342:2:-;3609:4;3625:10;3621:43;;-1:-1:-1;3652:5:2;3645:12;;3621:43;3680:16;;;;3702:171;3726:5;3732:1;3726:8;;;;;;;;;;;3717:5;:17;3713:53;;;3753:4;3746:11;;;;;3713:53;3777:6;;;3773:52;;-1:-1:-1;1542:3:2;3773:52;3855:16;;-1:-1:-1;;3832:3:2;;;;3855:16;3850:21;;;3855:16;;3850:21;;3702:171;;3885:5;3878:12;;;3553:342;;;;:::o;619:43:4:-;;;;;;;;;;;;;;;:::o;446:27::-;;;;:::o;1430:34:2:-;;;;;;:::o;4918:113:4:-;961:8;;-1:-1:-1;;;;;961:8:4;947:10;:22;939:72;;;;-1:-1:-1;;;939:72:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4992:8;:34;;-1:-1:-1;;;;;;4992:34:4;-1:-1:-1;;;;;4992:34:4;;;;;;;;;;4918:113::o;4395:293::-;4511:35;;;;;;;;;;;;;;;;4476:19;;4522:16;4511:35;;;;;;;29:2:-1;21:6;17:15;117:4;105:10;97:6;88:34;136:17;;-1:-1;4511:35:4;-1:-1:-1;4503:43:4;-1:-1:-1;4556:6:4;4552:132;4568:27;;;4552:132;;;4614:28;4622:16;;4639:1;4622:19;;;;;;;;;;;;;4614:7;:28::i;:::-;4610:68;;;4665:4;4654:5;4660:1;4654:8;;;;;;;;:15;;;:8;;;;;;;;;;;:15;4610:68;4597:3;;4552:132;;;;4395:293;;;;:::o;3941:93:2:-;4012:16;;3984:7;;4006:5;;4012:16;;4006:23;;;;;;;;;3999:30;;3941:93;:::o;1549:39::-;;;;;;;;;;;;;-1:-1:-1;1549:39:2;:::o;1499:46::-;1542:3;1499:46;:::o;695:29:4:-;;;-1:-1:-1;;;;;695:29:4;;:::o;2293:407::-;1934:11:5;;;;1926:55;;;;;-1:-1:-1;;;1926:55:5;;;;;;;;;;;;;;;;;;;;;;;;;;;;2056:11;:19;;-1:-1:-1;;2056:19:5;;;2070:5;2407:24:4;;;:11;:24;;;;;;2056:19:5;2407:24:4;2406:25;2398:71;;;;-1:-1:-1;;;2398:71:4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2476:20;2499;2507:11;2499:7;:20::i;:::-;2525:24;;;;:11;:24;;;;;:31;;-1:-1:-1;;2525:31:4;2552:4;2525:31;;;2476:43;-1:-1:-1;2562:17:4;:15;:17::i;:::-;2591:52;;;;;;;;2627:15;2591:52;;;;;;2599:11;;2591:52;;;;;;;;2668:10;-1:-1:-1;;;;;2654:41:4;;2680:14;;2654:41;;;;;;;;;;;;;;;;;;;;;30:3:-1;22:6;14;1:33;99:1;81:16;;;74:27;2654:41:4;;137:4:-1;117:14;;;-1:-1;;113:30;157:16;;;2654:41:4;;;;-1:-1:-1;2654:41:4;;-1:-1:-1;;;;2654:41:4;-1:-1:-1;;2230:11:5;:18;;-1:-1:-1;;2230:18:5;2244:4;2230:18;;;-1:-1:-1;;2293:407:4:o;4218:116::-;4279:4;4298:31;;;:15;:31;;;;;;;;;4218:116::o;1404:22:2:-;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;1404:22:2;:::o;1051:114::-;1088:77;1051:114;:::o;1369:31::-;;;;;;;;;;867:20:0;;;-1:-1:-1;;;;;867:20:0;;:::o;1468:27:2:-;;;-1:-1:-1;;;1468:27:2;;;;;:::o;1370:1032:0:-;1525:7;1512:9;:20;1504:81;;;;-1:-1:-1;;;1504:81:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1608:10;;:18;;;-1:-1:-1;;;1608:18:0;;;;1592:13;;-1:-1:-1;;;;;1608:10:0;;:16;;:18;;;;;;;;;;;;;;:10;:18;;;5:2:-1;;;;30:1;27;20:12;5:2;1608:18:0;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1608:18:0;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1608:18:0;1661:10;;:31;;;-1:-1:-1;;;1661:31:0;;;;1608:18;;-1:-1:-1;1632:26:0;;-1:-1:-1;;;;;1661:10:0;;;;:29;;:31;;;;;1608:18;;1661:31;;;;;;;;:10;:31;;;5:2:-1;;;;30:1;27;20:12;5:2;1661:31:0;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1661:31:0;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;1661:31:0;;-1:-1:-1;1699:10:0;-1:-1:-1;;;;;1712:19:0;;;;;;:46;;-1:-1:-1;1735:23:0;;;1712:46;1699:59;;1768:5;1764:340;;;1783:19;1805:46;1818:12;;1832:18;1805:12;:46::i;:::-;1783:68;;1859:99;1878:10;1890:67;1903:12;;1917:39;1930:12;1944:11;1917:12;:39::i;:::-;1890:12;:67::i;:::-;1859:18;:99::i;:::-;1966:38;1985:5;1992:11;1966:18;:38::i;:::-;1764:340;;;;2025:72;2044:10;2056:40;2069:12;;2083;2056;:40::i;2025:72::-;2114:16;;2110:79;;2140:42;2159:8;2169:12;2140:18;:42::i;:::-;2199:11;;2195:203;;2239:34;;2221:12;;-1:-1:-1;;;;;2239:15:0;;;2261:7;;2221:12;2239:34;2221:12;2239:34;2261:7;2239:15;:34;;;;;;;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;;2220:53:0;;;2286:7;2281:111;;2357:26;;-1:-1:-1;;;;;2357:17:0;;;:26;;;;;2375:7;;2357:26;;;;2375:7;2357:17;:26;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;2357:26:0;2281:111;2195:203;;1370:1032;;;;;;;:::o;2679:802:2:-;2770:9;;2728:12;2820:6;;2728:12;;2770:9;-1:-1:-1;;;2770:9:2;;;;;;2820:6;;2816:1;2809:17;2793:33;;;;2785:93;;;;-1:-1:-1;;;2785:93:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2884:9;:14;;;-1:-1:-1;;;2884:14:2;;;;;2897:1;2884:14;;;;;-1:-1:-1;;2884:14:2;;;;;;2931:5;-1:-1:-1;;;2980:355:2;3003:6;;;;;;2999:10;;;;2980:355;;;3028:16;;;3024:225;;3068:16;3061:23;;3102:5;3108:1;3102:8;;;;;;;;;;;;;;;;;;3094:16;;3141;3121:14;3136:1;3121:17;;;;;;;;;;;;;;;;;;;:36;3024:225;;;3189:14;3204:1;3189:17;;;;;;;;;;;;;;;;;;3182:24;;3224:16;3216:24;;3024:225;3276:26;3290:4;3296:5;3276:13;:26::i;:::-;3257:45;-1:-1:-1;3327:1:2;3311:17;;;;;-1:-1:-1;3011:3:2;;2980:355;;;-1:-1:-1;3361:16:2;;1542:3;;3360:42;3361:16;;;;:20;3360:42;3341:16;:61;;-1:-1:-1;;3341:61:2;3360:42;;;;3341:61;;;;;;;;;;;;3434:16;;3408:5;;3414:16;3408:23;;;;;;;;:42;-1:-1:-1;;3463:9:2;;-1:-1:-1;;;3463:9:2;;;;-1:-1:-1;;3463:13:2;;2679:802;-1:-1:-1;;;;2679:802:2:o;1175:191:0:-;1225:9;:14;1217:75;;;;-1:-1:-1;;;1217:75:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1298:63;1321:10;1341:4;1348:12;;1298:22;:63::i;:::-;1175:191::o;3187:130:3:-;3245:7;3271:39;3275:1;3278;3271:39;;;;;;;;;;;;;;;;;:3;:39::i;:::-;3264:46;3187:130;-1:-1:-1;;;3187:130:3:o;948:176::-;1006:7;1037:5;;;1060:6;;;;1052:46;;;;;-1:-1:-1;;;1052:46:3;;;;;;;;;;;;;;;;;;;;;;;;;;;1388:134;1446:7;1472:43;1476:1;1479;1472:43;;;;;;;;;;;;;;;;;:3;:43::i;3000:544:0:-;3109:5;;3120:63;;;-1:-1:-1;;;;;3120:63:0;;;;;;;;;;;;;;;;26:21:-1;;;22:32;;;6:49;;3120:63:0;;;;;;;25:18:-1;;61:17;;-1:-1;;;;;182:15;-1:-1;;;179:29;160:49;;3109:75:0;;;;3074:12;;3088:17;;3109:5;;;3120:63;3109:75;;;;25:18:-1;36:153;66:2;61:3;58:11;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;3109:75:0;;;;;;;;;;;;;;;;;;;;;;;;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;;3073:111:0;;;;3198:7;3190:37;;;;;-1:-1:-1;;;3190:37:0;;;;;;;;;;;;-1:-1:-1;;;3190:37:0;;;;;;;;;;;;;;;3327:11;;:15;3323:217;;3360:4;:11;3375:2;3360:17;3352:72;;;;-1:-1:-1;;;3352:72:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3453:4;3442:24;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;3442:24:0;;-1:-1:-1;3442:24:0;3474:59;;;;-1:-1:-1;;;3474:59:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3000:544;;;;:::o;2406:590::-;2534:5;;2545:74;;;-1:-1:-1;;;;;2545:74:0;;;;;;;;;;;;;;;;;;;;;;;26:21:-1;;;22:32;;;6:49;;2545:74:0;;;;;;;25:18:-1;;61:17;;-1:-1;;;;;182:15;-1:-1;;;179:29;160:49;;2534:86:0;;;;2499:12;;2513:17;;2534:5;;;2545:74;2534:86;;;;25:18:-1;36:153;66:2;61:3;58:11;36:153;;176:10;;164:23;;-1:-1;;139:12;;;;98:2;89:12;;;;114;36:153;;;274:1;267:3;263:2;259:12;254:3;250:22;246:30;315:4;311:9;305:3;299:10;295:26;356:4;350:3;344:10;340:21;389:7;380;377:20;372:3;365:33;3:399;;;2534:86:0;;;;;;;;;;;;;;;;;;;;;;;;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;;2498:122:0;;;;2634:7;2626:45;;;;;-1:-1:-1;;;2626:45:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;2771:11;;:15;2767:225;;2804:4;:11;2819:2;2804:17;2796:72;;;;-1:-1:-1;;;2796:72:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2897:4;2886:24;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;2886:24:0;;-1:-1:-1;2886:24:0;2918:67;;;;-1:-1:-1;;;2918:67:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2406:590;;;;;:::o;3832:338:3:-;3918:7;4018:12;4011:5;4003:28;;;;-1:-1:-1;;;4003:28:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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;4003:28:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4041:9;4057:1;4053;:5;;;;;;;3832:338;-1:-1:-1;;;;;3832:338:3:o;1846:187::-;1932:7;1967:12;1959:6;;;;1951:29;;;;-1:-1:-1;;;1951:29:3;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;27:10:-1;;8:100;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;1951:29:3;-1:-1:-1;;;2002:5:3;;;1846:187::o", + "source": "// https://tornado.cash\n/*\n* d888888P dP a88888b. dP\n* 88 88 d8' `88 88\n* 88 .d8888b. 88d888b. 88d888b. .d8888b. .d888b88 .d8888b. 88 .d8888b. .d8888b. 88d888b.\n* 88 88' `88 88' `88 88' `88 88' `88 88' `88 88' `88 88 88' `88 Y8ooooo. 88' `88\n* 88 88. .88 88 88 88 88. .88 88. .88 88. .88 dP Y8. .88 88. .88 88 88 88\n* dP `88888P' dP dP dP `88888P8 `88888P8 `88888P' 88 Y88888P' `88888P8 `88888P' dP dP\n* ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\n*/\n\npragma solidity 0.5.17;\n\nimport \"./Tornado.sol\";\nimport \"./SafeMath.sol\";\n\ncontract ERC20Tornado is Tornado {\n address public token;\n\n constructor(\n IVerifier _verifier,\n IFeeManager _feeManager,\n uint256 _denomination,\n uint32 _merkleTreeHeight,\n address _operator,\n address _token\n ) Tornado(_verifier, _feeManager, _denomination, _merkleTreeHeight, _operator) public {\n token = _token;\n }\n\n function _processDeposit() internal {\n require(msg.value == 0, \"ETH value is supposed to be 0 for ERC20 instance\");\n _safeErc20TransferFrom(msg.sender, address(this), denomination);\n }\n\n function _processWithdraw(address payable _recipient, address payable _relayer, uint256 _relayer_fee, uint256 _refund) internal {\n require(msg.value == _refund, \"Incorrect refund amount received by the contract\");\n\n address feeTo = feeManager.feeTo();\n uint256 protocolFeeDivisor = feeManager.protocolFeeDivisor();\n\n bool feeOn = feeTo != address(0) && protocolFeeDivisor != 0;\n if (feeOn) {\n uint256 protocolFee = SafeMath.div(denomination, protocolFeeDivisor);\n _safeErc20Transfer(_recipient, SafeMath.sub(denomination, SafeMath.add(_relayer_fee, protocolFee)));\n _safeErc20Transfer(feeTo, protocolFee);\n } else {\n _safeErc20Transfer(_recipient, SafeMath.sub(denomination, _relayer_fee));\n }\n\n if (_relayer_fee > 0) {\n _safeErc20Transfer(_relayer, _relayer_fee);\n }\n\n if (_refund > 0) {\n (bool success, ) = _recipient.call.value(_refund)(\"\");\n if (!success) {\n // let's return _refund back to the relayer\n _relayer.transfer(_refund);\n }\n }\n }\n\n function _safeErc20TransferFrom(address _from, address _to, uint256 _amount) internal {\n (bool success, bytes memory data) = token.call(abi.encodeWithSelector(0x23b872dd /* transferFrom */, _from, _to, _amount));\n require(success, \"not enough allowed tokens\");\n\n // if contract returns some data lets make sure that is `true` according to standard\n if (data.length > 0) {\n require(data.length == 32, \"data length should be either 0 or 32 bytes\");\n success = abi.decode(data, (bool));\n require(success, \"not enough allowed tokens. Token returns false.\");\n }\n }\n\n function _safeErc20Transfer(address _to, uint256 _amount) internal {\n (bool success, bytes memory data) = token.call(abi.encodeWithSelector(0xa9059cbb /* transfer */, _to, _amount));\n require(success, \"not enough tokens\");\n\n // if contract returns some data lets make sure that is `true` according to standard\n if (data.length > 0) {\n require(data.length == 32, \"data length should be either 0 or 32 bytes\");\n success = abi.decode(data, (bool));\n require(success, \"not enough tokens. Token returns false.\");\n }\n }\n}\n", "sourcePath": "/home/home/dotfiles/tornado-core/contracts/ERC20Tornado.sol", "ast": { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/ERC20Tornado.sol", "exportedSymbols": { "ERC20Tornado": [ - 281 + 287 ] }, - "id": 282, + "id": 288, "nodeType": "SourceUnit", "nodes": [ { @@ -591,8 +634,8 @@ "file": "./Tornado.sol", "id": 2, "nodeType": "ImportDirective", - "scope": 282, - "sourceUnit": 1364, + "scope": 288, + "sourceUnit": 1321, "src": "780:23:0", "symbolAliases": [], "unitAlias": "" @@ -602,8 +645,8 @@ "file": "./SafeMath.sol", "id": 3, "nodeType": "ImportDirective", - "scope": 282, - "sourceUnit": 1026, + "scope": 288, + "sourceUnit": 958, "src": "804:24:0", "symbolAliases": [], "unitAlias": "" @@ -617,10 +660,10 @@ "id": 4, "name": "Tornado", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1363, + "referencedDeclaration": 1320, "src": "855:7:0", "typeDescriptions": { - "typeIdentifier": "t_contract$_Tornado_$1363", + "typeIdentifier": "t_contract$_Tornado_$1320", "typeString": "contract Tornado" } }, @@ -630,19 +673,19 @@ } ], "contractDependencies": [ - 838, - 1363, - 1393 + 770, + 1320, + 1350 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 281, + "id": 287, "linearizedBaseContracts": [ - 281, - 1363, - 1393, - 838 + 287, + 1320, + 1350, + 770 ], "name": "ERC20Tornado", "nodeType": "ContractDefinition", @@ -652,7 +695,7 @@ "id": 7, "name": "token", "nodeType": "VariableDeclaration", - "scope": 281, + "scope": 287, "src": "867:20:0", "stateVariable": true, "storageLocation": "default", @@ -744,7 +787,7 @@ "referencedDeclaration": 9, "src": "1070:9:0", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -757,7 +800,7 @@ "referencedDeclaration": 11, "src": "1081:11:0", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -808,10 +851,10 @@ "name": "Tornado", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1363, + "referencedDeclaration": 1320, "src": "1062:7:0", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_Tornado_$1363_$", + "typeIdentifier": "t_type$_t_contract$_Tornado_$1320_$", "typeString": "type(contract Tornado)" } }, @@ -835,7 +878,7 @@ "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" }, "typeName": { @@ -843,10 +886,10 @@ "id": 8, "name": "IVerifier", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1041, + "referencedDeclaration": 973, "src": "909:9:0", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -863,7 +906,7 @@ "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" }, "typeName": { @@ -871,10 +914,10 @@ "id": 10, "name": "IFeeManager", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1052, + "referencedDeclaration": 984, "src": "934:11:0", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -996,7 +1039,7 @@ "parameters": [], "src": "1146:0:0" }, - "scope": 281, + "scope": 287, "src": "892:279:0", "stateMutability": "nonpayable", "superFunction": null, @@ -1031,7 +1074,7 @@ "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1408, + "referencedDeclaration": 1365, "src": "1225:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_message", @@ -1112,10 +1155,10 @@ "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "src": "1217:7:0", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", @@ -1152,7 +1195,7 @@ "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1408, + "referencedDeclaration": 1365, "src": "1321:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_message", @@ -1182,10 +1225,10 @@ "name": "this", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1436, + "referencedDeclaration": 1393, "src": "1341:4:0", "typeDescriptions": { - "typeIdentifier": "t_contract$_ERC20Tornado_$281", + "typeIdentifier": "t_contract$_ERC20Tornado_$287", "typeString": "contract ERC20Tornado" } } @@ -1193,7 +1236,7 @@ "expression": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_ERC20Tornado_$281", + "typeIdentifier": "t_contract$_ERC20Tornado_$287", "typeString": "contract ERC20Tornado" } ], @@ -1230,7 +1273,7 @@ "name": "denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1058, + "referencedDeclaration": 990, "src": "1348:12:0", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -1257,7 +1300,7 @@ "name": "_safeErc20TransferFrom", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 225, + "referencedDeclaration": 231, "src": "1298:22:0", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_address_$_t_uint256_$returns$__$", @@ -1303,17 +1346,17 @@ "parameters": [], "src": "1211:0:0" }, - "scope": 281, + "scope": 287, "src": "1175:191:0", "stateMutability": "nonpayable", - "superFunction": 1183, + "superFunction": 1135, "visibility": "internal" }, { "body": { - "id": 166, + "id": 172, "nodeType": "Block", - "src": "1498:865:0", + "src": "1498:904:0", "statements": [ { "expression": { @@ -1338,7 +1381,7 @@ "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1408, + "referencedDeclaration": 1365, "src": "1512:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_message", @@ -1414,10 +1457,10 @@ "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "src": "1504:7:0", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", @@ -1452,7 +1495,7 @@ "id": 75, "name": "feeTo", "nodeType": "VariableDeclaration", - "scope": 166, + "scope": 172, "src": "1592:13:0", "stateVariable": false, "storageLocation": "default", @@ -1487,10 +1530,10 @@ "name": "feeManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1070, + "referencedDeclaration": 1002, "src": "1608:10:0", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -1501,7 +1544,7 @@ "lValueRequested": false, "memberName": "feeTo", "nodeType": "MemberAccess", - "referencedDeclaration": 1046, + "referencedDeclaration": 978, "src": "1608:16:0", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_address_$", @@ -1535,7 +1578,7 @@ "id": 81, "name": "protocolFeeDivisor", "nodeType": "VariableDeclaration", - "scope": 166, + "scope": 172, "src": "1632:26:0", "stateVariable": false, "storageLocation": "default", @@ -1569,10 +1612,10 @@ "name": "feeManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1070, + "referencedDeclaration": 1002, "src": "1661:10:0", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -1583,7 +1626,7 @@ "lValueRequested": false, "memberName": "protocolFeeDivisor", "nodeType": "MemberAccess", - "referencedDeclaration": 1051, + "referencedDeclaration": 983, "src": "1661:29:0", "typeDescriptions": { "typeIdentifier": "t_function_external_view$__$returns$_t_uint256_$", @@ -1617,7 +1660,7 @@ "id": 87, "name": "feeOn", "nodeType": "VariableDeclaration", - "scope": 166, + "scope": 172, "src": "1699:10:0", "stateVariable": false, "storageLocation": "default", @@ -1815,9 +1858,9 @@ } }, "falseBody": { - "id": 129, + "id": 135, "nodeType": "Block", - "src": "1991:74:0", + "src": "2017:87:0", "statements": [ { "expression": { @@ -1825,12 +1868,12 @@ "arguments": [ { "argumentTypes": null, - "id": 123, + "id": 127, "name": "_recipient", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 57, - "src": "2018:10:0", + "src": "2044:10:0", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -1838,44 +1881,81 @@ }, { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "arguments": [ + { + "argumentTypes": null, + "id": 130, + "name": "denomination", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 990, + "src": "2069:12:0", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + { + "argumentTypes": null, + "id": 131, + "name": "_relayer_fee", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 61, + "src": "2083:12:0", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "id": 128, + "name": "SafeMath", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 957, + "src": "2056:8:0", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_SafeMath_$957_$", + "typeString": "type(library SafeMath)" + } + }, + "id": 129, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 813, + "src": "2056:12:0", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } }, - "id": 126, + "id": 132, "isConstant": false, "isLValue": false, "isPure": false, + "kind": "functionCall", "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 124, - "name": "denomination", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1058, - "src": "2030:12:0", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "-", - "rightExpression": { - "argumentTypes": null, - "id": 125, - "name": "_relayer_fee", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 61, - "src": "2045:12:0", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "2030:27:0", + "names": [], + "nodeType": "FunctionCall", + "src": "2056:40:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1893,18 +1973,18 @@ "typeString": "uint256" } ], - "id": 122, + "id": 126, "name": "_safeErc20Transfer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 280, - "src": "1999:18:0", + "referencedDeclaration": 286, + "src": "2025:18:0", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 127, + "id": 133, "isConstant": false, "isLValue": false, "isPure": false, @@ -1912,25 +1992,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1999:59:0", + "src": "2025:72:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 128, + "id": 134, "nodeType": "ExpressionStatement", - "src": "1999:59:0" + "src": "2025:72:0" } ] }, - "id": 130, + "id": 136, "nodeType": "IfStatement", - "src": "1764:301:0", + "src": "1764:340:0", "trueBody": { - "id": 121, + "id": 125, "nodeType": "Block", - "src": "1775:210:0", + "src": "1775:236:0", "statements": [ { "assignments": [ @@ -1942,7 +2022,7 @@ "id": 100, "name": "protocolFee", "nodeType": "VariableDeclaration", - "scope": 121, + "scope": 125, "src": "1783:19:0", "stateVariable": false, "storageLocation": "default", @@ -1974,7 +2054,7 @@ "name": "denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1058, + "referencedDeclaration": 990, "src": "1818:12:0", "typeDescriptions": { "typeIdentifier": "t_uint256", @@ -2012,10 +2092,10 @@ "name": "SafeMath", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1025, + "referencedDeclaration": 957, "src": "1805:8:0", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_SafeMath_$1025_$", + "typeIdentifier": "t_type$_t_contract$_SafeMath_$957_$", "typeString": "type(library SafeMath)" } }, @@ -2026,7 +2106,7 @@ "lValueRequested": false, "memberName": "div", "nodeType": "MemberAccess", - "referencedDeclaration": 958, + "referencedDeclaration": 890, "src": "1805:12:0", "typeDescriptions": { "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", @@ -2069,76 +2149,150 @@ }, { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, - "id": 113, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "arguments": [ + { + "argumentTypes": null, + "id": 111, + "name": "denomination", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 990, + "src": "1903:12:0", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } }, - "id": 111, + { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 114, + "name": "_relayer_fee", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 61, + "src": "1930:12:0", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + { + "argumentTypes": null, + "id": 115, + "name": "protocolFee", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 100, + "src": "1944:11:0", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "id": 112, + "name": "SafeMath", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 957, + "src": "1917:8:0", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_SafeMath_$957_$", + "typeString": "type(library SafeMath)" + } + }, + "id": 113, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "add", + "nodeType": "MemberAccess", + "referencedDeclaration": 797, + "src": "1917:12:0", + "typeDescriptions": { + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" + } + }, + "id": 116, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1917:39:0", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "expression": { + "argumentTypes": null, + "id": 109, + "name": "SafeMath", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 957, + "src": "1890:8:0", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_contract$_SafeMath_$957_$", + "typeString": "type(library SafeMath)" + } + }, + "id": 110, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "leftExpression": { - "argumentTypes": null, - "id": 109, - "name": "denomination", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 1058, - "src": "1890:12:0", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "BinaryOperation", - "operator": "-", - "rightExpression": { - "argumentTypes": null, - "id": 110, - "name": "_relayer_fee", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 61, - "src": "1905:12:0", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "1890:27:0", + "memberName": "sub", + "nodeType": "MemberAccess", + "referencedDeclaration": 813, + "src": "1890:12:0", "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" + "typeIdentifier": "t_function_internal_pure$_t_uint256_$_t_uint256_$returns$_t_uint256_$", + "typeString": "function (uint256,uint256) pure returns (uint256)" } }, - "nodeType": "BinaryOperation", - "operator": "-", - "rightExpression": { - "argumentTypes": null, - "id": 112, - "name": "protocolFee", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 100, - "src": "1920:11:0", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "src": "1890:41:0", + "id": 117, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1890:67:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2160,14 +2314,14 @@ "name": "_safeErc20Transfer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 280, + "referencedDeclaration": 286, "src": "1859:18:0", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 114, + "id": 118, "isConstant": false, "isLValue": false, "isPure": false, @@ -2175,15 +2329,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1859:73:0", + "src": "1859:99:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 115, + "id": 119, "nodeType": "ExpressionStatement", - "src": "1859:73:0" + "src": "1859:99:0" }, { "expression": { @@ -2191,12 +2345,12 @@ "arguments": [ { "argumentTypes": null, - "id": 117, + "id": 121, "name": "feeTo", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 75, - "src": "1959:5:0", + "src": "1985:5:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2204,12 +2358,12 @@ }, { "argumentTypes": null, - "id": 118, + "id": 122, "name": "protocolFee", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 100, - "src": "1966:11:0", + "src": "1992:11:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2227,18 +2381,18 @@ "typeString": "uint256" } ], - "id": 116, + "id": 120, "name": "_safeErc20Transfer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 280, - "src": "1940:18:0", + "referencedDeclaration": 286, + "src": "1966:18:0", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 119, + "id": 123, "isConstant": false, "isLValue": false, "isPure": false, @@ -2246,15 +2400,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1940:38:0", + "src": "1966:38:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 120, + "id": 124, "nodeType": "ExpressionStatement", - "src": "1940:38:0" + "src": "1966:38:0" } ] } @@ -2266,19 +2420,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 133, + "id": 139, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 131, + "id": 137, "name": "_relayer_fee", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 61, - "src": "2075:12:0", + "src": "2114:12:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2289,14 +2443,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 132, + "id": 138, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2090:1:0", + "src": "2129:1:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -2304,20 +2458,20 @@ }, "value": "0" }, - "src": "2075:16:0", + "src": "2114:16:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 140, + "id": 146, "nodeType": "IfStatement", - "src": "2071:79:0", + "src": "2110:79:0", "trueBody": { - "id": 139, + "id": 145, "nodeType": "Block", - "src": "2093:57:0", + "src": "2132:57:0", "statements": [ { "expression": { @@ -2325,12 +2479,12 @@ "arguments": [ { "argumentTypes": null, - "id": 135, + "id": 141, "name": "_relayer", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 59, - "src": "2120:8:0", + "src": "2159:8:0", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2338,12 +2492,12 @@ }, { "argumentTypes": null, - "id": 136, + "id": 142, "name": "_relayer_fee", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 61, - "src": "2130:12:0", + "src": "2169:12:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2361,18 +2515,18 @@ "typeString": "uint256" } ], - "id": 134, + "id": 140, "name": "_safeErc20Transfer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 280, - "src": "2101:18:0", + "referencedDeclaration": 286, + "src": "2140:18:0", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,uint256)" } }, - "id": 137, + "id": 143, "isConstant": false, "isLValue": false, "isPure": false, @@ -2380,15 +2534,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2101:42:0", + "src": "2140:42:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 138, + "id": 144, "nodeType": "ExpressionStatement", - "src": "2101:42:0" + "src": "2140:42:0" } ] } @@ -2400,19 +2554,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 143, + "id": 149, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 141, + "id": 147, "name": "_refund", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "2160:7:0", + "src": "2199:7:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2423,14 +2577,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 142, + "id": 148, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2170:1:0", + "src": "2209:1:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -2438,34 +2592,34 @@ }, "value": "0" }, - "src": "2160:11:0", + "src": "2199:11:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 165, + "id": 171, "nodeType": "IfStatement", - "src": "2156:203:0", + "src": "2195:203:0", "trueBody": { - "id": 164, + "id": 170, "nodeType": "Block", - "src": "2173:186:0", + "src": "2212:186:0", "statements": [ { "assignments": [ - 145, + 151, null ], "declarations": [ { "constant": false, - "id": 145, + "id": 151, "name": "success", "nodeType": "VariableDeclaration", - "scope": 164, - "src": "2182:12:0", + "scope": 170, + "src": "2221:12:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2473,10 +2627,10 @@ "typeString": "bool" }, "typeName": { - "id": 144, + "id": 150, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "2182:4:0", + "src": "2221:4:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2487,21 +2641,21 @@ }, null ], - "id": 153, + "id": 159, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, "hexValue": "", - "id": 151, + "id": 157, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2231:2:0", + "src": "2270:2:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", @@ -2520,12 +2674,12 @@ "arguments": [ { "argumentTypes": null, - "id": 149, + "id": 155, "name": "_refund", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "2222:7:0", + "src": "2261:7:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2543,18 +2697,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 146, + "id": 152, "name": "_recipient", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 57, - "src": "2200:10:0", + "src": "2239:10:0", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "id": 147, + "id": 153, "isConstant": false, "isLValue": false, "isPure": false, @@ -2562,13 +2716,13 @@ "memberName": "call", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2200:15:0", + "src": "2239:15:0", "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": 148, + "id": 154, "isConstant": false, "isLValue": false, "isPure": false, @@ -2576,13 +2730,13 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2200:21:0", + "src": "2239:21:0", "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": 150, + "id": 156, "isConstant": false, "isLValue": false, "isPure": false, @@ -2590,13 +2744,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2200:30:0", + "src": "2239:30:0", "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": 152, + "id": 158, "isConstant": false, "isLValue": false, "isPure": false, @@ -2604,19 +2758,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2200:34:0", + "src": "2239:34:0", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$", "typeString": "tuple(bool,bytes memory)" } }, "nodeType": "VariableDeclarationStatement", - "src": "2181:53:0" + "src": "2220:53:0" }, { "condition": { "argumentTypes": null, - "id": 155, + "id": 161, "isConstant": false, "isLValue": false, "isPure": false, @@ -2624,15 +2778,15 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "2246:8:0", + "src": "2285:8:0", "subExpression": { "argumentTypes": null, - "id": 154, + "id": 160, "name": "success", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 145, - "src": "2247:7:0", + "referencedDeclaration": 151, + "src": "2286:7:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2644,13 +2798,13 @@ } }, "falseBody": null, - "id": 163, + "id": 169, "nodeType": "IfStatement", - "src": "2242:111:0", + "src": "2281:111:0", "trueBody": { - "id": 162, + "id": 168, "nodeType": "Block", - "src": "2256:97:0", + "src": "2295:97:0", "statements": [ { "expression": { @@ -2658,12 +2812,12 @@ "arguments": [ { "argumentTypes": null, - "id": 159, + "id": 165, "name": "_refund", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "2336:7:0", + "src": "2375:7:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2679,18 +2833,18 @@ ], "expression": { "argumentTypes": null, - "id": 156, + "id": 162, "name": "_relayer", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 59, - "src": "2318:8:0", + "src": "2357:8:0", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" } }, - "id": 158, + "id": 164, "isConstant": false, "isLValue": false, "isPure": false, @@ -2698,13 +2852,13 @@ "memberName": "transfer", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2318:17:0", + "src": "2357:17:0", "typeDescriptions": { "typeIdentifier": "t_function_transfer_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256)" } }, - "id": 160, + "id": 166, "isConstant": false, "isLValue": false, "isPure": false, @@ -2712,15 +2866,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2318:26:0", + "src": "2357:26:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 161, + "id": 167, "nodeType": "ExpressionStatement", - "src": "2318:26:0" + "src": "2357:26:0" } ] } @@ -2731,7 +2885,7 @@ ] }, "documentation": null, - "id": 167, + "id": 173, "implemented": true, "kind": "function", "modifiers": [], @@ -2746,7 +2900,7 @@ "id": 57, "name": "_recipient", "nodeType": "VariableDeclaration", - "scope": 167, + "scope": 173, "src": "1396:26:0", "stateVariable": false, "storageLocation": "default", @@ -2773,7 +2927,7 @@ "id": 59, "name": "_relayer", "nodeType": "VariableDeclaration", - "scope": 167, + "scope": 173, "src": "1424:24:0", "stateVariable": false, "storageLocation": "default", @@ -2800,7 +2954,7 @@ "id": 61, "name": "_relayer_fee", "nodeType": "VariableDeclaration", - "scope": 167, + "scope": 173, "src": "1450:20:0", "stateVariable": false, "storageLocation": "default", @@ -2826,7 +2980,7 @@ "id": 63, "name": "_refund", "nodeType": "VariableDeclaration", - "scope": 167, + "scope": 173, "src": "1472:15:0", "stateVariable": false, "storageLocation": "default", @@ -2856,31 +3010,31 @@ "parameters": [], "src": "1498:0:0" }, - "scope": 281, - "src": "1370:993:0", + "scope": 287, + "src": "1370:1032:0", "stateMutability": "nonpayable", - "superFunction": 1279, + "superFunction": 1231, "visibility": "internal" }, { "body": { - "id": 224, + "id": 230, "nodeType": "Block", - "src": "2453:504:0", + "src": "2492:504:0", "statements": [ { "assignments": [ - 177, - 179 + 183, + 185 ], "declarations": [ { "constant": false, - "id": 177, + "id": 183, "name": "success", "nodeType": "VariableDeclaration", - "scope": 224, - "src": "2460:12:0", + "scope": 230, + "src": "2499:12:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2888,10 +3042,10 @@ "typeString": "bool" }, "typeName": { - "id": 176, + "id": 182, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "2460:4:0", + "src": "2499:4:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2902,11 +3056,11 @@ }, { "constant": false, - "id": 179, + "id": 185, "name": "data", "nodeType": "VariableDeclaration", - "scope": 224, - "src": "2474:17:0", + "scope": 230, + "src": "2513:17:0", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -2914,10 +3068,10 @@ "typeString": "bytes" }, "typeName": { - "id": 178, + "id": 184, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "2474:5:0", + "src": "2513:5:0", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -2927,7 +3081,7 @@ "visibility": "internal" } ], - "id": 190, + "id": 196, "initialValue": { "argumentTypes": null, "arguments": [ @@ -2937,14 +3091,14 @@ { "argumentTypes": null, "hexValue": "30783233623837326464", - "id": 184, + "id": 190, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2529:10:0", + "src": "2568:10:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_599290589_by_1", @@ -2954,12 +3108,12 @@ }, { "argumentTypes": null, - "id": 185, + "id": 191, "name": "_from", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 169, - "src": "2560:5:0", + "referencedDeclaration": 175, + "src": "2599:5:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2967,12 +3121,12 @@ }, { "argumentTypes": null, - "id": 186, + "id": 192, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 171, - "src": "2567:3:0", + "referencedDeclaration": 177, + "src": "2606:3:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2980,12 +3134,12 @@ }, { "argumentTypes": null, - "id": 187, + "id": 193, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 173, - "src": "2572:7:0", + "referencedDeclaration": 179, + "src": "2611:7:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3013,18 +3167,18 @@ ], "expression": { "argumentTypes": null, - "id": 182, + "id": 188, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1395, - "src": "2506:3:0", + "referencedDeclaration": 1352, + "src": "2545:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 183, + "id": 189, "isConstant": false, "isLValue": false, "isPure": true, @@ -3032,13 +3186,13 @@ "memberName": "encodeWithSelector", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2506:22:0", + "src": "2545:22:0", "typeDescriptions": { "typeIdentifier": "t_function_abiencodewithselector_pure$_t_bytes4_$returns$_t_bytes_memory_ptr_$", "typeString": "function (bytes4) pure returns (bytes memory)" } }, - "id": 188, + "id": 194, "isConstant": false, "isLValue": false, "isPure": false, @@ -3046,7 +3200,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2506:74:0", + "src": "2545:74:0", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -3062,18 +3216,18 @@ ], "expression": { "argumentTypes": null, - "id": 180, + "id": 186, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 7, - "src": "2495:5:0", + "src": "2534:5:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 181, + "id": 187, "isConstant": false, "isLValue": false, "isPure": false, @@ -3081,13 +3235,13 @@ "memberName": "call", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2495:10:0", + "src": "2534:10:0", "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": 189, + "id": 195, "isConstant": false, "isLValue": false, "isPure": false, @@ -3095,14 +3249,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2495:86:0", + "src": "2534:86:0", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$", "typeString": "tuple(bool,bytes memory)" } }, "nodeType": "VariableDeclarationStatement", - "src": "2459:122:0" + "src": "2498:122:0" }, { "expression": { @@ -3110,12 +3264,12 @@ "arguments": [ { "argumentTypes": null, - "id": 192, + "id": 198, "name": "success", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 177, - "src": "2595:7:0", + "referencedDeclaration": 183, + "src": "2634:7:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3124,14 +3278,14 @@ { "argumentTypes": null, "hexValue": "6e6f7420656e6f75676820616c6c6f77656420746f6b656e73", - "id": 193, + "id": 199, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2604:27:0", + "src": "2643:27:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_b31c8a8545ea674c554dd2f6bad7d7bd1dfe923a25150b76350dc6970bf3ff5c", @@ -3151,21 +3305,21 @@ "typeString": "literal_string \"not enough allowed tokens\"" } ], - "id": 191, + "id": 197, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "2587:7:0", + "referencedDeclaration": 1369, + "src": "2626:7:0", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 194, + "id": 200, "isConstant": false, "isLValue": false, "isPure": false, @@ -3173,15 +3327,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2587:45:0", + "src": "2626:45:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 195, + "id": 201, "nodeType": "ExpressionStatement", - "src": "2587:45:0" + "src": "2626:45:0" }, { "condition": { @@ -3190,7 +3344,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 199, + "id": 205, "isConstant": false, "isLValue": false, "isPure": false, @@ -3199,18 +3353,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 196, + "id": 202, "name": "data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 179, - "src": "2732:4:0", + "referencedDeclaration": 185, + "src": "2771:4:0", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "id": 197, + "id": 203, "isConstant": false, "isLValue": false, "isPure": false, @@ -3218,7 +3372,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2732:11:0", + "src": "2771:11:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3229,14 +3383,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 198, + "id": 204, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2746:1:0", + "src": "2785:1:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -3244,20 +3398,20 @@ }, "value": "0" }, - "src": "2732:15:0", + "src": "2771:15:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 223, + "id": 229, "nodeType": "IfStatement", - "src": "2728:225:0", + "src": "2767:225:0", "trueBody": { - "id": 222, + "id": 228, "nodeType": "Block", - "src": "2749:204:0", + "src": "2788:204:0", "statements": [ { "expression": { @@ -3269,7 +3423,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 204, + "id": 210, "isConstant": false, "isLValue": false, "isPure": false, @@ -3278,18 +3432,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 201, + "id": 207, "name": "data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 179, - "src": "2765:4:0", + "referencedDeclaration": 185, + "src": "2804:4:0", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "id": 202, + "id": 208, "isConstant": false, "isLValue": false, "isPure": false, @@ -3297,7 +3451,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2765:11:0", + "src": "2804:11:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3308,14 +3462,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3332", - "id": 203, + "id": 209, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "2780:2:0", + "src": "2819:2:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_32_by_1", @@ -3323,7 +3477,7 @@ }, "value": "32" }, - "src": "2765:17:0", + "src": "2804:17:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3332,14 +3486,14 @@ { "argumentTypes": null, "hexValue": "64617461206c656e6774682073686f756c64206265206569746865722030206f72203332206279746573", - "id": 205, + "id": 211, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2784:44:0", + "src": "2823:44:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_22b4652a1c8fbdfc6305c7ee289e87caf6a45e5ae327ee8f67eb64ba36d62560", @@ -3359,21 +3513,21 @@ "typeString": "literal_string \"data length should be either 0 or 32 bytes\"" } ], - "id": 200, + "id": 206, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "2757:7:0", + "referencedDeclaration": 1369, + "src": "2796:7:0", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 206, + "id": 212, "isConstant": false, "isLValue": false, "isPure": false, @@ -3381,32 +3535,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2757:72:0", + "src": "2796:72:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 207, + "id": 213, "nodeType": "ExpressionStatement", - "src": "2757:72:0" + "src": "2796:72:0" }, { "expression": { "argumentTypes": null, - "id": 215, + "id": 221, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 208, + "id": 214, "name": "success", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 177, - "src": "2837:7:0", + "referencedDeclaration": 183, + "src": "2876:7:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3419,12 +3573,12 @@ "arguments": [ { "argumentTypes": null, - "id": 211, + "id": 217, "name": "data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 179, - "src": "2858:4:0", + "referencedDeclaration": 185, + "src": "2897:4:0", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -3435,13 +3589,13 @@ "components": [ { "argumentTypes": null, - "id": 212, + "id": 218, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "2865:4:0", + "src": "2904:4:0", "typeDescriptions": { "typeIdentifier": "t_type$_t_bool_$", "typeString": "type(bool)" @@ -3449,14 +3603,14 @@ "typeName": "bool" } ], - "id": 213, + "id": 219, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "2864:6:0", + "src": "2903:6:0", "typeDescriptions": { "typeIdentifier": "t_type$_t_bool_$", "typeString": "type(bool)" @@ -3476,18 +3630,18 @@ ], "expression": { "argumentTypes": null, - "id": 209, + "id": 215, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1395, - "src": "2847:3:0", + "referencedDeclaration": 1352, + "src": "2886:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 210, + "id": 216, "isConstant": false, "isLValue": false, "isPure": true, @@ -3495,13 +3649,13 @@ "memberName": "decode", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2847:10:0", + "src": "2886:10:0", "typeDescriptions": { "typeIdentifier": "t_function_abidecode_pure$__$returns$__$", "typeString": "function () pure" } }, - "id": 214, + "id": 220, "isConstant": false, "isLValue": false, "isPure": false, @@ -3509,21 +3663,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2847:24:0", + "src": "2886:24:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "2837:34:0", + "src": "2876:34:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 216, + "id": 222, "nodeType": "ExpressionStatement", - "src": "2837:34:0" + "src": "2876:34:0" }, { "expression": { @@ -3531,12 +3685,12 @@ "arguments": [ { "argumentTypes": null, - "id": 218, + "id": 224, "name": "success", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 177, - "src": "2887:7:0", + "referencedDeclaration": 183, + "src": "2926:7:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3545,14 +3699,14 @@ { "argumentTypes": null, "hexValue": "6e6f7420656e6f75676820616c6c6f77656420746f6b656e732e20546f6b656e2072657475726e732066616c73652e", - "id": 219, + "id": 225, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2896:49:0", + "src": "2935:49:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_6cfae212a217874b58247660ff4d75d72aa825e8f2120480a7da09cf7efa221d", @@ -3572,21 +3726,21 @@ "typeString": "literal_string \"not enough allowed tokens. Token returns false.\"" } ], - "id": 217, + "id": 223, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "2879:7:0", + "referencedDeclaration": 1369, + "src": "2918:7:0", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 220, + "id": 226, "isConstant": false, "isLValue": false, "isPure": false, @@ -3594,15 +3748,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2879:67:0", + "src": "2918:67:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 221, + "id": 227, "nodeType": "ExpressionStatement", - "src": "2879:67:0" + "src": "2918:67:0" } ] } @@ -3610,23 +3764,23 @@ ] }, "documentation": null, - "id": 225, + "id": 231, "implemented": true, "kind": "function", "modifiers": [], "name": "_safeErc20TransferFrom", "nodeType": "FunctionDefinition", "parameters": { - "id": 174, + "id": 180, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 169, + "id": 175, "name": "_from", "nodeType": "VariableDeclaration", - "scope": 225, - "src": "2399:13:0", + "scope": 231, + "src": "2438:13:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3634,10 +3788,10 @@ "typeString": "address" }, "typeName": { - "id": 168, + "id": 174, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2399:7:0", + "src": "2438:7:0", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3649,11 +3803,11 @@ }, { "constant": false, - "id": 171, + "id": 177, "name": "_to", "nodeType": "VariableDeclaration", - "scope": 225, - "src": "2414:11:0", + "scope": 231, + "src": "2453:11:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3661,10 +3815,10 @@ "typeString": "address" }, "typeName": { - "id": 170, + "id": 176, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2414:7:0", + "src": "2453:7:0", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -3676,11 +3830,11 @@ }, { "constant": false, - "id": 173, + "id": 179, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 225, - "src": "2427:15:0", + "scope": 231, + "src": "2466:15:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3688,10 +3842,10 @@ "typeString": "uint256" }, "typeName": { - "id": 172, + "id": 178, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "2427:7:0", + "src": "2466:7:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3701,39 +3855,39 @@ "visibility": "internal" } ], - "src": "2398:45:0" + "src": "2437:45:0" }, "returnParameters": { - "id": 175, + "id": 181, "nodeType": "ParameterList", "parameters": [], - "src": "2453:0:0" + "src": "2492:0:0" }, - "scope": 281, - "src": "2367:590:0", + "scope": 287, + "src": "2406:590:0", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 279, + "id": 285, "nodeType": "Block", - "src": "3028:477:0", + "src": "3067:477:0", "statements": [ { "assignments": [ - 233, - 235 + 239, + 241 ], "declarations": [ { "constant": false, - "id": 233, + "id": 239, "name": "success", "nodeType": "VariableDeclaration", - "scope": 279, - "src": "3035:12:0", + "scope": 285, + "src": "3074:12:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3741,10 +3895,10 @@ "typeString": "bool" }, "typeName": { - "id": 232, + "id": 238, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "3035:4:0", + "src": "3074:4:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3755,11 +3909,11 @@ }, { "constant": false, - "id": 235, + "id": 241, "name": "data", "nodeType": "VariableDeclaration", - "scope": 279, - "src": "3049:17:0", + "scope": 285, + "src": "3088:17:0", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -3767,10 +3921,10 @@ "typeString": "bytes" }, "typeName": { - "id": 234, + "id": 240, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "3049:5:0", + "src": "3088:5:0", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -3780,7 +3934,7 @@ "visibility": "internal" } ], - "id": 245, + "id": 251, "initialValue": { "argumentTypes": null, "arguments": [ @@ -3790,14 +3944,14 @@ { "argumentTypes": null, "hexValue": "30786139303539636262", - "id": 240, + "id": 246, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "3104:10:0", + "src": "3143:10:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_2835717307_by_1", @@ -3807,12 +3961,12 @@ }, { "argumentTypes": null, - "id": 241, + "id": 247, "name": "_to", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 227, - "src": "3131:3:0", + "referencedDeclaration": 233, + "src": "3170:3:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3820,12 +3974,12 @@ }, { "argumentTypes": null, - "id": 242, + "id": 248, "name": "_amount", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 229, - "src": "3136:7:0", + "referencedDeclaration": 235, + "src": "3175:7:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3849,18 +4003,18 @@ ], "expression": { "argumentTypes": null, - "id": 238, + "id": 244, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1395, - "src": "3081:3:0", + "referencedDeclaration": 1352, + "src": "3120:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 239, + "id": 245, "isConstant": false, "isLValue": false, "isPure": true, @@ -3868,13 +4022,13 @@ "memberName": "encodeWithSelector", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3081:22:0", + "src": "3120:22:0", "typeDescriptions": { "typeIdentifier": "t_function_abiencodewithselector_pure$_t_bytes4_$returns$_t_bytes_memory_ptr_$", "typeString": "function (bytes4) pure returns (bytes memory)" } }, - "id": 243, + "id": 249, "isConstant": false, "isLValue": false, "isPure": false, @@ -3882,7 +4036,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3081:63:0", + "src": "3120:63:0", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -3898,18 +4052,18 @@ ], "expression": { "argumentTypes": null, - "id": 236, + "id": 242, "name": "token", "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 7, - "src": "3070:5:0", + "src": "3109:5:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 237, + "id": 243, "isConstant": false, "isLValue": false, "isPure": false, @@ -3917,13 +4071,13 @@ "memberName": "call", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3070:10:0", + "src": "3109:10:0", "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": 244, + "id": 250, "isConstant": false, "isLValue": false, "isPure": false, @@ -3931,14 +4085,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3070:75:0", + "src": "3109:75:0", "typeDescriptions": { "typeIdentifier": "t_tuple$_t_bool_$_t_bytes_memory_ptr_$", "typeString": "tuple(bool,bytes memory)" } }, "nodeType": "VariableDeclarationStatement", - "src": "3034:111:0" + "src": "3073:111:0" }, { "expression": { @@ -3946,12 +4100,12 @@ "arguments": [ { "argumentTypes": null, - "id": 247, + "id": 253, "name": "success", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 233, - "src": "3159:7:0", + "referencedDeclaration": 239, + "src": "3198:7:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3960,14 +4114,14 @@ { "argumentTypes": null, "hexValue": "6e6f7420656e6f75676820746f6b656e73", - "id": 248, + "id": 254, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3168:19:0", + "src": "3207:19:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_73949bcdc07934e9395e82489bb22c4742e057960a2c090d38e53d68d3caf52a", @@ -3987,21 +4141,21 @@ "typeString": "literal_string \"not enough tokens\"" } ], - "id": 246, + "id": 252, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3151:7:0", + "referencedDeclaration": 1369, + "src": "3190:7:0", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 249, + "id": 255, "isConstant": false, "isLValue": false, "isPure": false, @@ -4009,15 +4163,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3151:37:0", + "src": "3190:37:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 250, + "id": 256, "nodeType": "ExpressionStatement", - "src": "3151:37:0" + "src": "3190:37:0" }, { "condition": { @@ -4026,7 +4180,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 254, + "id": 260, "isConstant": false, "isLValue": false, "isPure": false, @@ -4035,18 +4189,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 251, + "id": 257, "name": "data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 235, - "src": "3288:4:0", + "referencedDeclaration": 241, + "src": "3327:4:0", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "id": 252, + "id": 258, "isConstant": false, "isLValue": false, "isPure": false, @@ -4054,7 +4208,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3288:11:0", + "src": "3327:11:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4065,14 +4219,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 253, + "id": 259, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "3302:1:0", + "src": "3341:1:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -4080,20 +4234,20 @@ }, "value": "0" }, - "src": "3288:15:0", + "src": "3327:15:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 278, + "id": 284, "nodeType": "IfStatement", - "src": "3284:217:0", + "src": "3323:217:0", "trueBody": { - "id": 277, + "id": 283, "nodeType": "Block", - "src": "3305:196:0", + "src": "3344:196:0", "statements": [ { "expression": { @@ -4105,7 +4259,7 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 259, + "id": 265, "isConstant": false, "isLValue": false, "isPure": false, @@ -4114,18 +4268,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 256, + "id": 262, "name": "data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 235, - "src": "3321:4:0", + "referencedDeclaration": 241, + "src": "3360:4:0", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" } }, - "id": 257, + "id": 263, "isConstant": false, "isLValue": false, "isPure": false, @@ -4133,7 +4287,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3321:11:0", + "src": "3360:11:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4144,14 +4298,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "3332", - "id": 258, + "id": 264, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "3336:2:0", + "src": "3375:2:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_32_by_1", @@ -4159,7 +4313,7 @@ }, "value": "32" }, - "src": "3321:17:0", + "src": "3360:17:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4168,14 +4322,14 @@ { "argumentTypes": null, "hexValue": "64617461206c656e6774682073686f756c64206265206569746865722030206f72203332206279746573", - "id": 260, + "id": 266, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3340:44:0", + "src": "3379:44:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_22b4652a1c8fbdfc6305c7ee289e87caf6a45e5ae327ee8f67eb64ba36d62560", @@ -4195,21 +4349,21 @@ "typeString": "literal_string \"data length should be either 0 or 32 bytes\"" } ], - "id": 255, + "id": 261, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3313:7:0", + "referencedDeclaration": 1369, + "src": "3352:7:0", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 261, + "id": 267, "isConstant": false, "isLValue": false, "isPure": false, @@ -4217,32 +4371,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3313:72:0", + "src": "3352:72:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 262, + "id": 268, "nodeType": "ExpressionStatement", - "src": "3313:72:0" + "src": "3352:72:0" }, { "expression": { "argumentTypes": null, - "id": 270, + "id": 276, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 263, + "id": 269, "name": "success", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 233, - "src": "3393:7:0", + "referencedDeclaration": 239, + "src": "3432:7:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4255,12 +4409,12 @@ "arguments": [ { "argumentTypes": null, - "id": 266, + "id": 272, "name": "data", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 235, - "src": "3414:4:0", + "referencedDeclaration": 241, + "src": "3453:4:0", "typeDescriptions": { "typeIdentifier": "t_bytes_memory_ptr", "typeString": "bytes memory" @@ -4271,13 +4425,13 @@ "components": [ { "argumentTypes": null, - "id": 267, + "id": 273, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3421:4:0", + "src": "3460:4:0", "typeDescriptions": { "typeIdentifier": "t_type$_t_bool_$", "typeString": "type(bool)" @@ -4285,14 +4439,14 @@ "typeName": "bool" } ], - "id": 268, + "id": 274, "isConstant": false, "isInlineArray": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "3420:6:0", + "src": "3459:6:0", "typeDescriptions": { "typeIdentifier": "t_type$_t_bool_$", "typeString": "type(bool)" @@ -4312,18 +4466,18 @@ ], "expression": { "argumentTypes": null, - "id": 264, + "id": 270, "name": "abi", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1395, - "src": "3403:3:0", + "referencedDeclaration": 1352, + "src": "3442:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_abi", "typeString": "abi" } }, - "id": 265, + "id": 271, "isConstant": false, "isLValue": false, "isPure": true, @@ -4331,13 +4485,13 @@ "memberName": "decode", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "3403:10:0", + "src": "3442:10:0", "typeDescriptions": { "typeIdentifier": "t_function_abidecode_pure$__$returns$__$", "typeString": "function () pure" } }, - "id": 269, + "id": 275, "isConstant": false, "isLValue": false, "isPure": false, @@ -4345,21 +4499,21 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3403:24:0", + "src": "3442:24:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "src": "3393:34:0", + "src": "3432:34:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 271, + "id": 277, "nodeType": "ExpressionStatement", - "src": "3393:34:0" + "src": "3432:34:0" }, { "expression": { @@ -4367,12 +4521,12 @@ "arguments": [ { "argumentTypes": null, - "id": 273, + "id": 279, "name": "success", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 233, - "src": "3443:7:0", + "referencedDeclaration": 239, + "src": "3482:7:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4381,14 +4535,14 @@ { "argumentTypes": null, "hexValue": "6e6f7420656e6f75676820746f6b656e732e20546f6b656e2072657475726e732066616c73652e", - "id": 274, + "id": 280, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3452:41:0", + "src": "3491:41:0", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_38fa5aabf87e9f42de902eb4d9022484dde7943d80702b79ba468e9fc08f5e5e", @@ -4408,21 +4562,21 @@ "typeString": "literal_string \"not enough tokens. Token returns false.\"" } ], - "id": 272, + "id": 278, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3435:7:0", + "referencedDeclaration": 1369, + "src": "3474:7:0", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 275, + "id": 281, "isConstant": false, "isLValue": false, "isPure": false, @@ -4430,15 +4584,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3435:59:0", + "src": "3474:59:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 276, + "id": 282, "nodeType": "ExpressionStatement", - "src": "3435:59:0" + "src": "3474:59:0" } ] } @@ -4446,23 +4600,23 @@ ] }, "documentation": null, - "id": 280, + "id": 286, "implemented": true, "kind": "function", "modifiers": [], "name": "_safeErc20Transfer", "nodeType": "FunctionDefinition", "parameters": { - "id": 230, + "id": 236, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 227, + "id": 233, "name": "_to", "nodeType": "VariableDeclaration", - "scope": 280, - "src": "2989:11:0", + "scope": 286, + "src": "3028:11:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4470,10 +4624,10 @@ "typeString": "address" }, "typeName": { - "id": 226, + "id": 232, "name": "address", "nodeType": "ElementaryTypeName", - "src": "2989:7:0", + "src": "3028:7:0", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4485,11 +4639,11 @@ }, { "constant": false, - "id": 229, + "id": 235, "name": "_amount", "nodeType": "VariableDeclaration", - "scope": 280, - "src": "3002:15:0", + "scope": 286, + "src": "3041:15:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4497,10 +4651,10 @@ "typeString": "uint256" }, "typeName": { - "id": 228, + "id": 234, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3002:7:0", + "src": "3041:7:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4510,33 +4664,33 @@ "visibility": "internal" } ], - "src": "2988:30:0" + "src": "3027:30:0" }, "returnParameters": { - "id": 231, + "id": 237, "nodeType": "ParameterList", "parameters": [], - "src": "3028:0:0" + "src": "3067:0:0" }, - "scope": 281, - "src": "2961:544:0", + "scope": 287, + "src": "3000:544:0", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" } ], - "scope": 282, - "src": "830:2677:0" + "scope": 288, + "src": "830:2716:0" } ], - "src": "755:2753:0" + "src": "755:2792:0" }, "legacyAST": { "attributes": { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/ERC20Tornado.sol", "exportedSymbols": { "ERC20Tornado": [ - 281 + 287 ] } }, @@ -4555,10 +4709,10 @@ }, { "attributes": { - "SourceUnit": 1364, + "SourceUnit": 1321, "absolutePath": "/home/home/dotfiles/tornado-core/contracts/Tornado.sol", "file": "./Tornado.sol", - "scope": 282, + "scope": 288, "symbolAliases": [ null ], @@ -4570,10 +4724,10 @@ }, { "attributes": { - "SourceUnit": 1026, + "SourceUnit": 958, "absolutePath": "/home/home/dotfiles/tornado-core/contracts/SafeMath.sol", "file": "./SafeMath.sol", - "scope": 282, + "scope": 288, "symbolAliases": [ null ], @@ -4586,21 +4740,21 @@ { "attributes": { "contractDependencies": [ - 838, - 1363, - 1393 + 770, + 1320, + 1350 ], "contractKind": "contract", "documentation": null, "fullyImplemented": true, "linearizedBaseContracts": [ - 281, - 1363, - 1393, - 838 + 287, + 1320, + 1350, + 770 ], "name": "ERC20Tornado", - "scope": 282 + "scope": 288 }, "children": [ { @@ -4612,7 +4766,7 @@ "attributes": { "contractScope": null, "name": "Tornado", - "referencedDeclaration": 1363, + "referencedDeclaration": 1320, "type": "contract Tornado" }, "id": 4, @@ -4628,7 +4782,7 @@ "attributes": { "constant": false, "name": "token", - "scope": 281, + "scope": 287, "stateVariable": true, "storageLocation": "default", "type": "address", @@ -4658,7 +4812,7 @@ "isConstructor": true, "kind": "constructor", "name": "", - "scope": 281, + "scope": 287, "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -4682,7 +4836,7 @@ "attributes": { "contractScope": null, "name": "IVerifier", - "referencedDeclaration": 1041, + "referencedDeclaration": 973, "type": "contract IVerifier" }, "id": 8, @@ -4710,7 +4864,7 @@ "attributes": { "contractScope": null, "name": "IFeeManager", - "referencedDeclaration": 1052, + "referencedDeclaration": 984, "type": "contract IFeeManager" }, "id": 10, @@ -4852,7 +5006,7 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1363, + "referencedDeclaration": 1320, "type": "type(contract Tornado)", "value": "Tornado" }, @@ -5008,9 +5162,9 @@ null ], "name": "_processDeposit", - "scope": 281, + "scope": 287, "stateMutability": "nonpayable", - "superFunction": 1183, + "superFunction": 1135, "visibility": "internal" }, "children": [ @@ -5068,10 +5222,10 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, @@ -5112,7 +5266,7 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1408, + "referencedDeclaration": 1365, "type": "msg", "value": "msg" }, @@ -5210,7 +5364,7 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 225, + "referencedDeclaration": 231, "type": "function (address,address,uint256)", "value": "_safeErc20TransferFrom" }, @@ -5236,7 +5390,7 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1408, + "referencedDeclaration": 1365, "type": "msg", "value": "msg" }, @@ -5268,7 +5422,7 @@ "attributes": { "argumentTypes": [ { - "typeIdentifier": "t_contract$_ERC20Tornado_$281", + "typeIdentifier": "t_contract$_ERC20Tornado_$287", "typeString": "contract ERC20Tornado" } ], @@ -5289,7 +5443,7 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1436, + "referencedDeclaration": 1393, "type": "contract ERC20Tornado", "value": "this" }, @@ -5308,7 +5462,7 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1058, + "referencedDeclaration": 990, "type": "uint256", "value": "denomination" }, @@ -5346,9 +5500,9 @@ null ], "name": "_processWithdraw", - "scope": 281, + "scope": 287, "stateMutability": "nonpayable", - "superFunction": 1279, + "superFunction": 1231, "visibility": "internal" }, "children": [ @@ -5358,7 +5512,7 @@ "attributes": { "constant": false, "name": "_recipient", - "scope": 167, + "scope": 173, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -5385,7 +5539,7 @@ "attributes": { "constant": false, "name": "_relayer", - "scope": 167, + "scope": 173, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -5412,7 +5566,7 @@ "attributes": { "constant": false, "name": "_relayer_fee", - "scope": 167, + "scope": 173, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -5438,7 +5592,7 @@ "attributes": { "constant": false, "name": "_refund", - "scope": 167, + "scope": 173, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -5508,10 +5662,10 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, @@ -5552,7 +5706,7 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1408, + "referencedDeclaration": 1365, "type": "msg", "value": "msg" }, @@ -5622,7 +5776,7 @@ "attributes": { "constant": false, "name": "feeTo", - "scope": 166, + "scope": 172, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -5673,7 +5827,7 @@ "isPure": false, "lValueRequested": false, "member_name": "feeTo", - "referencedDeclaration": 1046, + "referencedDeclaration": 978, "type": "function () view external returns (address)" }, "children": [ @@ -5683,7 +5837,7 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1070, + "referencedDeclaration": 1002, "type": "contract IFeeManager", "value": "feeManager" }, @@ -5717,7 +5871,7 @@ "attributes": { "constant": false, "name": "protocolFeeDivisor", - "scope": 166, + "scope": 172, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -5767,7 +5921,7 @@ "isPure": false, "lValueRequested": false, "member_name": "protocolFeeDivisor", - "referencedDeclaration": 1051, + "referencedDeclaration": 983, "type": "function () view external returns (uint256)" }, "children": [ @@ -5777,7 +5931,7 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1070, + "referencedDeclaration": 1002, "type": "contract IFeeManager", "value": "feeManager" }, @@ -5811,7 +5965,7 @@ "attributes": { "constant": false, "name": "feeOn", - "scope": 166, + "scope": 172, "stateVariable": false, "storageLocation": "default", "type": "bool", @@ -6028,7 +6182,7 @@ "attributes": { "constant": false, "name": "protocolFee", - "scope": 121, + "scope": 125, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -6082,7 +6236,7 @@ "isPure": false, "lValueRequested": false, "member_name": "div", - "referencedDeclaration": 958, + "referencedDeclaration": 890, "type": "function (uint256,uint256) pure returns (uint256)" }, "children": [ @@ -6092,7 +6246,7 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1025, + "referencedDeclaration": 957, "type": "type(library SafeMath)", "value": "SafeMath" }, @@ -6111,7 +6265,7 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1058, + "referencedDeclaration": 990, "type": "uint256", "value": "denomination" }, @@ -6175,7 +6329,7 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 280, + "referencedDeclaration": 286, "type": "function (address,uint256)", "value": "_safeErc20Transfer" }, @@ -6200,31 +6354,37 @@ { "attributes": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, "isConstant": false, "isLValue": false, "isPure": false, + "isStructConstructorCall": false, "lValueRequested": false, - "operator": "-", - "type": "uint256" + "names": [ + null + ], + "type": "uint256", + "type_conversion": false }, "children": [ { "attributes": { - "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, - "operator": "-", - "type": "uint256" + "member_name": "sub", + "referencedDeclaration": 813, + "type": "function (uint256,uint256) pure returns (uint256)" }, "children": [ { @@ -6233,13 +6393,87 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1058, - "type": "uint256", - "value": "denomination" + "referencedDeclaration": 957, + "type": "type(library SafeMath)", + "value": "SafeMath" }, "id": 109, "name": "Identifier", - "src": "1890:12:0" + "src": "1890:8:0" + } + ], + "id": 110, + "name": "MemberAccess", + "src": "1890:12:0" + }, + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 990, + "type": "uint256", + "value": "denomination" + }, + "id": 111, + "name": "Identifier", + "src": "1903:12:0" + }, + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "isStructConstructorCall": false, + "lValueRequested": false, + "names": [ + null + ], + "type": "uint256", + "type_conversion": false + }, + "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "member_name": "add", + "referencedDeclaration": 797, + "type": "function (uint256,uint256) pure returns (uint256)" + }, + "children": [ + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 957, + "type": "type(library SafeMath)", + "value": "SafeMath" + }, + "id": 112, + "name": "Identifier", + "src": "1917:8:0" + } + ], + "id": 113, + "name": "MemberAccess", + "src": "1917:12:0" }, { "attributes": { @@ -6251,43 +6485,43 @@ "type": "uint256", "value": "_relayer_fee" }, - "id": 110, + "id": 114, "name": "Identifier", - "src": "1905:12:0" + "src": "1930:12:0" + }, + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 100, + "type": "uint256", + "value": "protocolFee" + }, + "id": 115, + "name": "Identifier", + "src": "1944:11:0" } ], - "id": 111, - "name": "BinaryOperation", - "src": "1890:27:0" - }, - { - "attributes": { - "argumentTypes": null, - "overloadedDeclarations": [ - null - ], - "referencedDeclaration": 100, - "type": "uint256", - "value": "protocolFee" - }, - "id": 112, - "name": "Identifier", - "src": "1920:11:0" + "id": 116, + "name": "FunctionCall", + "src": "1917:39:0" } ], - "id": 113, - "name": "BinaryOperation", - "src": "1890:41:0" + "id": 117, + "name": "FunctionCall", + "src": "1890:67:0" } ], - "id": 114, + "id": 118, "name": "FunctionCall", - "src": "1859:73:0" + "src": "1859:99:0" } ], - "id": 115, + "id": 119, "name": "ExpressionStatement", - "src": "1859:73:0" + "src": "1859:99:0" }, { "children": [ @@ -6321,13 +6555,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 280, + "referencedDeclaration": 286, "type": "function (address,uint256)", "value": "_safeErc20Transfer" }, - "id": 116, + "id": 120, "name": "Identifier", - "src": "1940:18:0" + "src": "1966:18:0" }, { "attributes": { @@ -6339,9 +6573,9 @@ "type": "address", "value": "feeTo" }, - "id": 117, + "id": 121, "name": "Identifier", - "src": "1959:5:0" + "src": "1985:5:0" }, { "attributes": { @@ -6353,24 +6587,24 @@ "type": "uint256", "value": "protocolFee" }, - "id": 118, + "id": 122, "name": "Identifier", - "src": "1966:11:0" + "src": "1992:11:0" } ], - "id": 119, + "id": 123, "name": "FunctionCall", - "src": "1940:38:0" + "src": "1966:38:0" } ], - "id": 120, + "id": 124, "name": "ExpressionStatement", - "src": "1940:38:0" + "src": "1966:38:0" } ], - "id": 121, + "id": 125, "name": "Block", - "src": "1775:210:0" + "src": "1775:236:0" }, { "children": [ @@ -6406,13 +6640,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 280, + "referencedDeclaration": 286, "type": "function (address,uint256)", "value": "_safeErc20Transfer" }, - "id": 122, + "id": 126, "name": "Identifier", - "src": "1999:18:0" + "src": "2025:18:0" }, { "attributes": { @@ -6424,38 +6658,78 @@ "type": "address payable", "value": "_recipient" }, - "id": 123, + "id": 127, "name": "Identifier", - "src": "2018:10:0" + "src": "2044:10:0" }, { "attributes": { "argumentTypes": null, - "commonType": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - }, "isConstant": false, "isLValue": false, "isPure": false, + "isStructConstructorCall": false, "lValueRequested": false, - "operator": "-", - "type": "uint256" + "names": [ + null + ], + "type": "uint256", + "type_conversion": false }, "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + }, + { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + ], + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "member_name": "sub", + "referencedDeclaration": 813, + "type": "function (uint256,uint256) pure returns (uint256)" + }, + "children": [ + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 957, + "type": "type(library SafeMath)", + "value": "SafeMath" + }, + "id": 128, + "name": "Identifier", + "src": "2056:8:0" + } + ], + "id": 129, + "name": "MemberAccess", + "src": "2056:12:0" + }, { "attributes": { "argumentTypes": null, "overloadedDeclarations": [ null ], - "referencedDeclaration": 1058, + "referencedDeclaration": 990, "type": "uint256", "value": "denomination" }, - "id": 124, + "id": 130, "name": "Identifier", - "src": "2030:12:0" + "src": "2069:12:0" }, { "attributes": { @@ -6467,34 +6741,34 @@ "type": "uint256", "value": "_relayer_fee" }, - "id": 125, + "id": 131, "name": "Identifier", - "src": "2045:12:0" + "src": "2083:12:0" } ], - "id": 126, - "name": "BinaryOperation", - "src": "2030:27:0" + "id": 132, + "name": "FunctionCall", + "src": "2056:40:0" } ], - "id": 127, + "id": 133, "name": "FunctionCall", - "src": "1999:59:0" + "src": "2025:72:0" } ], - "id": 128, + "id": 134, "name": "ExpressionStatement", - "src": "1999:59:0" + "src": "2025:72:0" } ], - "id": 129, + "id": 135, "name": "Block", - "src": "1991:74:0" + "src": "2017:87:0" } ], - "id": 130, + "id": 136, "name": "IfStatement", - "src": "1764:301:0" + "src": "1764:340:0" }, { "attributes": { @@ -6526,9 +6800,9 @@ "type": "uint256", "value": "_relayer_fee" }, - "id": 131, + "id": 137, "name": "Identifier", - "src": "2075:12:0" + "src": "2114:12:0" }, { "attributes": { @@ -6543,14 +6817,14 @@ "type": "int_const 0", "value": "0" }, - "id": 132, + "id": 138, "name": "Literal", - "src": "2090:1:0" + "src": "2129:1:0" } ], - "id": 133, + "id": 139, "name": "BinaryOperation", - "src": "2075:16:0" + "src": "2114:16:0" }, { "children": [ @@ -6586,13 +6860,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 280, + "referencedDeclaration": 286, "type": "function (address,uint256)", "value": "_safeErc20Transfer" }, - "id": 134, + "id": 140, "name": "Identifier", - "src": "2101:18:0" + "src": "2140:18:0" }, { "attributes": { @@ -6604,9 +6878,9 @@ "type": "address payable", "value": "_relayer" }, - "id": 135, + "id": 141, "name": "Identifier", - "src": "2120:8:0" + "src": "2159:8:0" }, { "attributes": { @@ -6618,29 +6892,29 @@ "type": "uint256", "value": "_relayer_fee" }, - "id": 136, + "id": 142, "name": "Identifier", - "src": "2130:12:0" + "src": "2169:12:0" } ], - "id": 137, + "id": 143, "name": "FunctionCall", - "src": "2101:42:0" + "src": "2140:42:0" } ], - "id": 138, + "id": 144, "name": "ExpressionStatement", - "src": "2101:42:0" + "src": "2140:42:0" } ], - "id": 139, + "id": 145, "name": "Block", - "src": "2093:57:0" + "src": "2132:57:0" } ], - "id": 140, + "id": 146, "name": "IfStatement", - "src": "2071:79:0" + "src": "2110:79:0" }, { "attributes": { @@ -6672,9 +6946,9 @@ "type": "uint256", "value": "_refund" }, - "id": 141, + "id": 147, "name": "Identifier", - "src": "2160:7:0" + "src": "2199:7:0" }, { "attributes": { @@ -6689,21 +6963,21 @@ "type": "int_const 0", "value": "0" }, - "id": 142, + "id": 148, "name": "Literal", - "src": "2170:1:0" + "src": "2209:1:0" } ], - "id": 143, + "id": 149, "name": "BinaryOperation", - "src": "2160:11:0" + "src": "2199:11:0" }, { "children": [ { "attributes": { "assignments": [ - 145, + 151, null ] }, @@ -6712,7 +6986,7 @@ "attributes": { "constant": false, "name": "success", - "scope": 164, + "scope": 170, "stateVariable": false, "storageLocation": "default", "type": "bool", @@ -6725,14 +6999,14 @@ "name": "bool", "type": "bool" }, - "id": 144, + "id": 150, "name": "ElementaryTypeName", - "src": "2182:4:0" + "src": "2221:4:0" } ], - "id": 145, + "id": 151, "name": "VariableDeclaration", - "src": "2182:12:0" + "src": "2221:12:0" }, { "attributes": { @@ -6808,19 +7082,19 @@ "type": "address payable", "value": "_recipient" }, - "id": 146, + "id": 152, "name": "Identifier", - "src": "2200:10:0" + "src": "2239:10:0" } ], - "id": 147, + "id": 153, "name": "MemberAccess", - "src": "2200:15:0" + "src": "2239:15:0" } ], - "id": 148, + "id": 154, "name": "MemberAccess", - "src": "2200:21:0" + "src": "2239:21:0" }, { "attributes": { @@ -6832,14 +7106,14 @@ "type": "uint256", "value": "_refund" }, - "id": 149, + "id": 155, "name": "Identifier", - "src": "2222:7:0" + "src": "2261:7:0" } ], - "id": 150, + "id": 156, "name": "FunctionCall", - "src": "2200:30:0" + "src": "2239:30:0" }, { "attributes": { @@ -6854,19 +7128,19 @@ "type": "literal_string \"\"", "value": "" }, - "id": 151, + "id": 157, "name": "Literal", - "src": "2231:2:0" + "src": "2270:2:0" } ], - "id": 152, + "id": 158, "name": "FunctionCall", - "src": "2200:34:0" + "src": "2239:34:0" } ], - "id": 153, + "id": 159, "name": "VariableDeclarationStatement", - "src": "2181:53:0" + "src": "2220:53:0" }, { "attributes": { @@ -6891,18 +7165,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 145, + "referencedDeclaration": 151, "type": "bool", "value": "success" }, - "id": 154, + "id": 160, "name": "Identifier", - "src": "2247:7:0" + "src": "2286:7:0" } ], - "id": 155, + "id": 161, "name": "UnaryOperation", - "src": "2246:8:0" + "src": "2285:8:0" }, { "children": [ @@ -6950,14 +7224,14 @@ "type": "address payable", "value": "_relayer" }, - "id": 156, + "id": 162, "name": "Identifier", - "src": "2318:8:0" + "src": "2357:8:0" } ], - "id": 158, + "id": 164, "name": "MemberAccess", - "src": "2318:17:0" + "src": "2357:17:0" }, { "attributes": { @@ -6969,49 +7243,49 @@ "type": "uint256", "value": "_refund" }, - "id": 159, + "id": 165, "name": "Identifier", - "src": "2336:7:0" + "src": "2375:7:0" } ], - "id": 160, + "id": 166, "name": "FunctionCall", - "src": "2318:26:0" + "src": "2357:26:0" } ], - "id": 161, + "id": 167, "name": "ExpressionStatement", - "src": "2318:26:0" + "src": "2357:26:0" } ], - "id": 162, + "id": 168, "name": "Block", - "src": "2256:97:0" + "src": "2295:97:0" } ], - "id": 163, + "id": 169, "name": "IfStatement", - "src": "2242:111:0" + "src": "2281:111:0" } ], - "id": 164, + "id": 170, "name": "Block", - "src": "2173:186:0" + "src": "2212:186:0" } ], - "id": 165, + "id": 171, "name": "IfStatement", - "src": "2156:203:0" + "src": "2195:203:0" } ], - "id": 166, + "id": 172, "name": "Block", - "src": "1498:865:0" + "src": "1498:904:0" } ], - "id": 167, + "id": 173, "name": "FunctionDefinition", - "src": "1370:993:0" + "src": "1370:1032:0" }, { "attributes": { @@ -7023,7 +7297,7 @@ null ], "name": "_safeErc20TransferFrom", - "scope": 281, + "scope": 287, "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" @@ -7035,7 +7309,7 @@ "attributes": { "constant": false, "name": "_from", - "scope": 225, + "scope": 231, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -7049,20 +7323,20 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 168, + "id": 174, "name": "ElementaryTypeName", - "src": "2399:7:0" + "src": "2438:7:0" } ], - "id": 169, + "id": 175, "name": "VariableDeclaration", - "src": "2399:13:0" + "src": "2438:13:0" }, { "attributes": { "constant": false, "name": "_to", - "scope": 225, + "scope": 231, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -7076,20 +7350,20 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 170, + "id": 176, "name": "ElementaryTypeName", - "src": "2414:7:0" + "src": "2453:7:0" } ], - "id": 171, + "id": 177, "name": "VariableDeclaration", - "src": "2414:11:0" + "src": "2453:11:0" }, { "attributes": { "constant": false, "name": "_amount", - "scope": 225, + "scope": 231, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -7102,19 +7376,19 @@ "name": "uint256", "type": "uint256" }, - "id": 172, + "id": 178, "name": "ElementaryTypeName", - "src": "2427:7:0" + "src": "2466:7:0" } ], - "id": 173, + "id": 179, "name": "VariableDeclaration", - "src": "2427:15:0" + "src": "2466:15:0" } ], - "id": 174, + "id": 180, "name": "ParameterList", - "src": "2398:45:0" + "src": "2437:45:0" }, { "attributes": { @@ -7123,17 +7397,17 @@ ] }, "children": [], - "id": 175, + "id": 181, "name": "ParameterList", - "src": "2453:0:0" + "src": "2492:0:0" }, { "children": [ { "attributes": { "assignments": [ - 177, - 179 + 183, + 185 ] }, "children": [ @@ -7141,7 +7415,7 @@ "attributes": { "constant": false, "name": "success", - "scope": 224, + "scope": 230, "stateVariable": false, "storageLocation": "default", "type": "bool", @@ -7154,20 +7428,20 @@ "name": "bool", "type": "bool" }, - "id": 176, + "id": 182, "name": "ElementaryTypeName", - "src": "2460:4:0" + "src": "2499:4:0" } ], - "id": 177, + "id": 183, "name": "VariableDeclaration", - "src": "2460:12:0" + "src": "2499:12:0" }, { "attributes": { "constant": false, "name": "data", - "scope": 224, + "scope": 230, "stateVariable": false, "storageLocation": "memory", "type": "bytes", @@ -7180,14 +7454,14 @@ "name": "bytes", "type": "bytes" }, - "id": 178, + "id": 184, "name": "ElementaryTypeName", - "src": "2474:5:0" + "src": "2513:5:0" } ], - "id": 179, + "id": 185, "name": "VariableDeclaration", - "src": "2474:17:0" + "src": "2513:17:0" }, { "attributes": { @@ -7231,14 +7505,14 @@ "type": "address", "value": "token" }, - "id": 180, + "id": 186, "name": "Identifier", - "src": "2495:5:0" + "src": "2534:5:0" } ], - "id": 181, + "id": 187, "name": "MemberAccess", - "src": "2495:10:0" + "src": "2534:10:0" }, { "attributes": { @@ -7290,18 +7564,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1395, + "referencedDeclaration": 1352, "type": "abi", "value": "abi" }, - "id": 182, + "id": 188, "name": "Identifier", - "src": "2506:3:0" + "src": "2545:3:0" } ], - "id": 183, + "id": 189, "name": "MemberAccess", - "src": "2506:22:0" + "src": "2545:22:0" }, { "attributes": { @@ -7316,9 +7590,9 @@ "type": "int_const 599290589", "value": "0x23b872dd" }, - "id": 184, + "id": 190, "name": "Literal", - "src": "2529:10:0" + "src": "2568:10:0" }, { "attributes": { @@ -7326,13 +7600,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 169, + "referencedDeclaration": 175, "type": "address", "value": "_from" }, - "id": 185, + "id": 191, "name": "Identifier", - "src": "2560:5:0" + "src": "2599:5:0" }, { "attributes": { @@ -7340,13 +7614,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 171, + "referencedDeclaration": 177, "type": "address", "value": "_to" }, - "id": 186, + "id": 192, "name": "Identifier", - "src": "2567:3:0" + "src": "2606:3:0" }, { "attributes": { @@ -7354,28 +7628,28 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 173, + "referencedDeclaration": 179, "type": "uint256", "value": "_amount" }, - "id": 187, + "id": 193, "name": "Identifier", - "src": "2572:7:0" + "src": "2611:7:0" } ], - "id": 188, + "id": 194, "name": "FunctionCall", - "src": "2506:74:0" + "src": "2545:74:0" } ], - "id": 189, + "id": 195, "name": "FunctionCall", - "src": "2495:86:0" + "src": "2534:86:0" } ], - "id": 190, + "id": 196, "name": "VariableDeclarationStatement", - "src": "2459:122:0" + "src": "2498:122:0" }, { "children": [ @@ -7407,16 +7681,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 191, + "id": 197, "name": "Identifier", - "src": "2587:7:0" + "src": "2626:7:0" }, { "attributes": { @@ -7424,13 +7698,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 177, + "referencedDeclaration": 183, "type": "bool", "value": "success" }, - "id": 192, + "id": 198, "name": "Identifier", - "src": "2595:7:0" + "src": "2634:7:0" }, { "attributes": { @@ -7445,19 +7719,19 @@ "type": "literal_string \"not enough allowed tokens\"", "value": "not enough allowed tokens" }, - "id": 193, + "id": 199, "name": "Literal", - "src": "2604:27:0" + "src": "2643:27:0" } ], - "id": 194, + "id": 200, "name": "FunctionCall", - "src": "2587:45:0" + "src": "2626:45:0" } ], - "id": 195, + "id": 201, "name": "ExpressionStatement", - "src": "2587:45:0" + "src": "2626:45:0" }, { "attributes": { @@ -7497,18 +7771,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 179, + "referencedDeclaration": 185, "type": "bytes memory", "value": "data" }, - "id": 196, + "id": 202, "name": "Identifier", - "src": "2732:4:0" + "src": "2771:4:0" } ], - "id": 197, + "id": 203, "name": "MemberAccess", - "src": "2732:11:0" + "src": "2771:11:0" }, { "attributes": { @@ -7523,14 +7797,14 @@ "type": "int_const 0", "value": "0" }, - "id": 198, + "id": 204, "name": "Literal", - "src": "2746:1:0" + "src": "2785:1:0" } ], - "id": 199, + "id": 205, "name": "BinaryOperation", - "src": "2732:15:0" + "src": "2771:15:0" }, { "children": [ @@ -7564,16 +7838,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 200, + "id": 206, "name": "Identifier", - "src": "2757:7:0" + "src": "2796:7:0" }, { "attributes": { @@ -7608,18 +7882,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 179, + "referencedDeclaration": 185, "type": "bytes memory", "value": "data" }, - "id": 201, + "id": 207, "name": "Identifier", - "src": "2765:4:0" + "src": "2804:4:0" } ], - "id": 202, + "id": 208, "name": "MemberAccess", - "src": "2765:11:0" + "src": "2804:11:0" }, { "attributes": { @@ -7634,14 +7908,14 @@ "type": "int_const 32", "value": "32" }, - "id": 203, + "id": 209, "name": "Literal", - "src": "2780:2:0" + "src": "2819:2:0" } ], - "id": 204, + "id": 210, "name": "BinaryOperation", - "src": "2765:17:0" + "src": "2804:17:0" }, { "attributes": { @@ -7656,19 +7930,19 @@ "type": "literal_string \"data length should be either 0 or 32 bytes\"", "value": "data length should be either 0 or 32 bytes" }, - "id": 205, + "id": 211, "name": "Literal", - "src": "2784:44:0" + "src": "2823:44:0" } ], - "id": 206, + "id": 212, "name": "FunctionCall", - "src": "2757:72:0" + "src": "2796:72:0" } ], - "id": 207, + "id": 213, "name": "ExpressionStatement", - "src": "2757:72:0" + "src": "2796:72:0" }, { "children": [ @@ -7689,13 +7963,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 177, + "referencedDeclaration": 183, "type": "bool", "value": "success" }, - "id": 208, + "id": 214, "name": "Identifier", - "src": "2837:7:0" + "src": "2876:7:0" }, { "attributes": { @@ -7739,18 +8013,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1395, + "referencedDeclaration": 1352, "type": "abi", "value": "abi" }, - "id": 209, + "id": 215, "name": "Identifier", - "src": "2847:3:0" + "src": "2886:3:0" } ], - "id": 210, + "id": 216, "name": "MemberAccess", - "src": "2847:10:0" + "src": "2886:10:0" }, { "attributes": { @@ -7758,13 +8032,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 179, + "referencedDeclaration": 185, "type": "bytes memory", "value": "data" }, - "id": 211, + "id": 217, "name": "Identifier", - "src": "2858:4:0" + "src": "2897:4:0" }, { "attributes": { @@ -7787,29 +8061,29 @@ "type": "type(bool)", "value": "bool" }, - "id": 212, + "id": 218, "name": "ElementaryTypeNameExpression", - "src": "2865:4:0" + "src": "2904:4:0" } ], - "id": 213, + "id": 219, "name": "TupleExpression", - "src": "2864:6:0" + "src": "2903:6:0" } ], - "id": 214, + "id": 220, "name": "FunctionCall", - "src": "2847:24:0" + "src": "2886:24:0" } ], - "id": 215, + "id": 221, "name": "Assignment", - "src": "2837:34:0" + "src": "2876:34:0" } ], - "id": 216, + "id": 222, "name": "ExpressionStatement", - "src": "2837:34:0" + "src": "2876:34:0" }, { "children": [ @@ -7841,16 +8115,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 217, + "id": 223, "name": "Identifier", - "src": "2879:7:0" + "src": "2918:7:0" }, { "attributes": { @@ -7858,13 +8132,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 177, + "referencedDeclaration": 183, "type": "bool", "value": "success" }, - "id": 218, + "id": 224, "name": "Identifier", - "src": "2887:7:0" + "src": "2926:7:0" }, { "attributes": { @@ -7879,39 +8153,39 @@ "type": "literal_string \"not enough allowed tokens. Token returns false.\"", "value": "not enough allowed tokens. Token returns false." }, - "id": 219, + "id": 225, "name": "Literal", - "src": "2896:49:0" + "src": "2935:49:0" } ], - "id": 220, + "id": 226, "name": "FunctionCall", - "src": "2879:67:0" + "src": "2918:67:0" } ], - "id": 221, + "id": 227, "name": "ExpressionStatement", - "src": "2879:67:0" + "src": "2918:67:0" } ], - "id": 222, + "id": 228, "name": "Block", - "src": "2749:204:0" + "src": "2788:204:0" } ], - "id": 223, + "id": 229, "name": "IfStatement", - "src": "2728:225:0" + "src": "2767:225:0" } ], - "id": 224, + "id": 230, "name": "Block", - "src": "2453:504:0" + "src": "2492:504:0" } ], - "id": 225, + "id": 231, "name": "FunctionDefinition", - "src": "2367:590:0" + "src": "2406:590:0" }, { "attributes": { @@ -7923,7 +8197,7 @@ null ], "name": "_safeErc20Transfer", - "scope": 281, + "scope": 287, "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" @@ -7935,7 +8209,7 @@ "attributes": { "constant": false, "name": "_to", - "scope": 280, + "scope": 286, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -7949,20 +8223,20 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 226, + "id": 232, "name": "ElementaryTypeName", - "src": "2989:7:0" + "src": "3028:7:0" } ], - "id": 227, + "id": 233, "name": "VariableDeclaration", - "src": "2989:11:0" + "src": "3028:11:0" }, { "attributes": { "constant": false, "name": "_amount", - "scope": 280, + "scope": 286, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -7975,19 +8249,19 @@ "name": "uint256", "type": "uint256" }, - "id": 228, + "id": 234, "name": "ElementaryTypeName", - "src": "3002:7:0" + "src": "3041:7:0" } ], - "id": 229, + "id": 235, "name": "VariableDeclaration", - "src": "3002:15:0" + "src": "3041:15:0" } ], - "id": 230, + "id": 236, "name": "ParameterList", - "src": "2988:30:0" + "src": "3027:30:0" }, { "attributes": { @@ -7996,17 +8270,17 @@ ] }, "children": [], - "id": 231, + "id": 237, "name": "ParameterList", - "src": "3028:0:0" + "src": "3067:0:0" }, { "children": [ { "attributes": { "assignments": [ - 233, - 235 + 239, + 241 ] }, "children": [ @@ -8014,7 +8288,7 @@ "attributes": { "constant": false, "name": "success", - "scope": 279, + "scope": 285, "stateVariable": false, "storageLocation": "default", "type": "bool", @@ -8027,20 +8301,20 @@ "name": "bool", "type": "bool" }, - "id": 232, + "id": 238, "name": "ElementaryTypeName", - "src": "3035:4:0" + "src": "3074:4:0" } ], - "id": 233, + "id": 239, "name": "VariableDeclaration", - "src": "3035:12:0" + "src": "3074:12:0" }, { "attributes": { "constant": false, "name": "data", - "scope": 279, + "scope": 285, "stateVariable": false, "storageLocation": "memory", "type": "bytes", @@ -8053,14 +8327,14 @@ "name": "bytes", "type": "bytes" }, - "id": 234, + "id": 240, "name": "ElementaryTypeName", - "src": "3049:5:0" + "src": "3088:5:0" } ], - "id": 235, + "id": 241, "name": "VariableDeclaration", - "src": "3049:17:0" + "src": "3088:17:0" }, { "attributes": { @@ -8104,14 +8378,14 @@ "type": "address", "value": "token" }, - "id": 236, + "id": 242, "name": "Identifier", - "src": "3070:5:0" + "src": "3109:5:0" } ], - "id": 237, + "id": 243, "name": "MemberAccess", - "src": "3070:10:0" + "src": "3109:10:0" }, { "attributes": { @@ -8159,18 +8433,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1395, + "referencedDeclaration": 1352, "type": "abi", "value": "abi" }, - "id": 238, + "id": 244, "name": "Identifier", - "src": "3081:3:0" + "src": "3120:3:0" } ], - "id": 239, + "id": 245, "name": "MemberAccess", - "src": "3081:22:0" + "src": "3120:22:0" }, { "attributes": { @@ -8185,9 +8459,9 @@ "type": "int_const 2835717307", "value": "0xa9059cbb" }, - "id": 240, + "id": 246, "name": "Literal", - "src": "3104:10:0" + "src": "3143:10:0" }, { "attributes": { @@ -8195,13 +8469,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 227, + "referencedDeclaration": 233, "type": "address", "value": "_to" }, - "id": 241, + "id": 247, "name": "Identifier", - "src": "3131:3:0" + "src": "3170:3:0" }, { "attributes": { @@ -8209,28 +8483,28 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 229, + "referencedDeclaration": 235, "type": "uint256", "value": "_amount" }, - "id": 242, + "id": 248, "name": "Identifier", - "src": "3136:7:0" + "src": "3175:7:0" } ], - "id": 243, + "id": 249, "name": "FunctionCall", - "src": "3081:63:0" + "src": "3120:63:0" } ], - "id": 244, + "id": 250, "name": "FunctionCall", - "src": "3070:75:0" + "src": "3109:75:0" } ], - "id": 245, + "id": 251, "name": "VariableDeclarationStatement", - "src": "3034:111:0" + "src": "3073:111:0" }, { "children": [ @@ -8262,16 +8536,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 246, + "id": 252, "name": "Identifier", - "src": "3151:7:0" + "src": "3190:7:0" }, { "attributes": { @@ -8279,13 +8553,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 233, + "referencedDeclaration": 239, "type": "bool", "value": "success" }, - "id": 247, + "id": 253, "name": "Identifier", - "src": "3159:7:0" + "src": "3198:7:0" }, { "attributes": { @@ -8300,19 +8574,19 @@ "type": "literal_string \"not enough tokens\"", "value": "not enough tokens" }, - "id": 248, + "id": 254, "name": "Literal", - "src": "3168:19:0" + "src": "3207:19:0" } ], - "id": 249, + "id": 255, "name": "FunctionCall", - "src": "3151:37:0" + "src": "3190:37:0" } ], - "id": 250, + "id": 256, "name": "ExpressionStatement", - "src": "3151:37:0" + "src": "3190:37:0" }, { "attributes": { @@ -8352,18 +8626,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 235, + "referencedDeclaration": 241, "type": "bytes memory", "value": "data" }, - "id": 251, + "id": 257, "name": "Identifier", - "src": "3288:4:0" + "src": "3327:4:0" } ], - "id": 252, + "id": 258, "name": "MemberAccess", - "src": "3288:11:0" + "src": "3327:11:0" }, { "attributes": { @@ -8378,14 +8652,14 @@ "type": "int_const 0", "value": "0" }, - "id": 253, + "id": 259, "name": "Literal", - "src": "3302:1:0" + "src": "3341:1:0" } ], - "id": 254, + "id": 260, "name": "BinaryOperation", - "src": "3288:15:0" + "src": "3327:15:0" }, { "children": [ @@ -8419,16 +8693,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 255, + "id": 261, "name": "Identifier", - "src": "3313:7:0" + "src": "3352:7:0" }, { "attributes": { @@ -8463,18 +8737,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 235, + "referencedDeclaration": 241, "type": "bytes memory", "value": "data" }, - "id": 256, + "id": 262, "name": "Identifier", - "src": "3321:4:0" + "src": "3360:4:0" } ], - "id": 257, + "id": 263, "name": "MemberAccess", - "src": "3321:11:0" + "src": "3360:11:0" }, { "attributes": { @@ -8489,14 +8763,14 @@ "type": "int_const 32", "value": "32" }, - "id": 258, + "id": 264, "name": "Literal", - "src": "3336:2:0" + "src": "3375:2:0" } ], - "id": 259, + "id": 265, "name": "BinaryOperation", - "src": "3321:17:0" + "src": "3360:17:0" }, { "attributes": { @@ -8511,19 +8785,19 @@ "type": "literal_string \"data length should be either 0 or 32 bytes\"", "value": "data length should be either 0 or 32 bytes" }, - "id": 260, + "id": 266, "name": "Literal", - "src": "3340:44:0" + "src": "3379:44:0" } ], - "id": 261, + "id": 267, "name": "FunctionCall", - "src": "3313:72:0" + "src": "3352:72:0" } ], - "id": 262, + "id": 268, "name": "ExpressionStatement", - "src": "3313:72:0" + "src": "3352:72:0" }, { "children": [ @@ -8544,13 +8818,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 233, + "referencedDeclaration": 239, "type": "bool", "value": "success" }, - "id": 263, + "id": 269, "name": "Identifier", - "src": "3393:7:0" + "src": "3432:7:0" }, { "attributes": { @@ -8594,18 +8868,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1395, + "referencedDeclaration": 1352, "type": "abi", "value": "abi" }, - "id": 264, + "id": 270, "name": "Identifier", - "src": "3403:3:0" + "src": "3442:3:0" } ], - "id": 265, + "id": 271, "name": "MemberAccess", - "src": "3403:10:0" + "src": "3442:10:0" }, { "attributes": { @@ -8613,13 +8887,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 235, + "referencedDeclaration": 241, "type": "bytes memory", "value": "data" }, - "id": 266, + "id": 272, "name": "Identifier", - "src": "3414:4:0" + "src": "3453:4:0" }, { "attributes": { @@ -8642,29 +8916,29 @@ "type": "type(bool)", "value": "bool" }, - "id": 267, + "id": 273, "name": "ElementaryTypeNameExpression", - "src": "3421:4:0" + "src": "3460:4:0" } ], - "id": 268, + "id": 274, "name": "TupleExpression", - "src": "3420:6:0" + "src": "3459:6:0" } ], - "id": 269, + "id": 275, "name": "FunctionCall", - "src": "3403:24:0" + "src": "3442:24:0" } ], - "id": 270, + "id": 276, "name": "Assignment", - "src": "3393:34:0" + "src": "3432:34:0" } ], - "id": 271, + "id": 277, "name": "ExpressionStatement", - "src": "3393:34:0" + "src": "3432:34:0" }, { "children": [ @@ -8696,16 +8970,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 272, + "id": 278, "name": "Identifier", - "src": "3435:7:0" + "src": "3474:7:0" }, { "attributes": { @@ -8713,13 +8987,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 233, + "referencedDeclaration": 239, "type": "bool", "value": "success" }, - "id": 273, + "id": 279, "name": "Identifier", - "src": "3443:7:0" + "src": "3482:7:0" }, { "attributes": { @@ -8734,49 +9008,49 @@ "type": "literal_string \"not enough tokens. Token returns false.\"", "value": "not enough tokens. Token returns false." }, - "id": 274, + "id": 280, "name": "Literal", - "src": "3452:41:0" + "src": "3491:41:0" } ], - "id": 275, + "id": 281, "name": "FunctionCall", - "src": "3435:59:0" + "src": "3474:59:0" } ], - "id": 276, + "id": 282, "name": "ExpressionStatement", - "src": "3435:59:0" + "src": "3474:59:0" } ], - "id": 277, + "id": 283, "name": "Block", - "src": "3305:196:0" + "src": "3344:196:0" } ], - "id": 278, + "id": 284, "name": "IfStatement", - "src": "3284:217:0" + "src": "3323:217:0" } ], - "id": 279, + "id": 285, "name": "Block", - "src": "3028:477:0" + "src": "3067:477:0" } ], - "id": 280, + "id": 286, "name": "FunctionDefinition", - "src": "2961:544:0" + "src": "3000:544:0" } ], - "id": 281, + "id": 287, "name": "ContractDefinition", - "src": "830:2677:0" + "src": "830:2716:0" } ], - "id": 282, + "id": 288, "name": "SourceUnit", - "src": "755:2753:0" + "src": "755:2792:0" }, "compiler": { "name": "solc", @@ -8801,13 +9075,13 @@ } }, "schemaVersion": "3.3.4", - "updatedAt": "2021-04-12T00:15:10.039Z", + "updatedAt": "2021-04-18T15:21:30.792Z", "devdoc": { "methods": { "changeOperator(address)": { "details": "operator can change his address " }, - "deposit(bytes32)": { + "deposit(bytes32,bytes)": { "details": "Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.", "params": { "_commitment": "the note commitment, which is PedersenHash(nullifier + secret)" diff --git a/client/contracts/FeeManager.json b/client/contracts/FeeManager.json index c5293de..d383279 100644 --- a/client/contracts/FeeManager.json +++ b/client/contracts/FeeManager.json @@ -117,34 +117,43 @@ "payable": false, "stateMutability": "nonpayable", "type": "function" + }, + { + "constant": false, + "inputs": [], + "name": "clearFee", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" } ], - "metadata": "{\"compiler\":{\"version\":\"0.5.17+commit.d19bba13\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_feeToSetter\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"constant\":true,\"inputs\":[],\"name\":\"MIN_PROTOCOL_FEE_DIVISOR\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"feeTo\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"feeToSetter\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"protocolFeeDivisor\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"_feeTo\",\"type\":\"address\"}],\"name\":\"setFeeTo\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"_feeToSetter\",\"type\":\"address\"}],\"name\":\"setFeeToSetter\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_protocolFeeDivisor\",\"type\":\"uint256\"}],\"name\":\"setProtocolFeeDivisor\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/home/dotfiles/tornado-core/contracts/FeeManager.sol\":\"FeeManager\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/home/dotfiles/tornado-core/contracts/FeeManager.sol\":{\"keccak256\":\"0x8e8e5c1f677a907492945e9fb2417518c26f65d0adee9a752cbed7d114494e85\",\"urls\":[\"bzz-raw://54d89eac6b895cf779adb46160cfd1eb921911544d82eec6d4ac7fb0bdf6cd91\",\"dweb:/ipfs/QmTw8beeSWhYCAWohhQgHSwyg4AFoJmVhmmCn2h6S3NFD7\"]}},\"version\":1}", - "bytecode": "0x608060405260c860005534801561001557600080fd5b5060405161039c38038061039c8339818101604052602081101561003857600080fd5b5051600280546001600160a01b039092166001600160a01b0319909216919091179055600060035561032d8061006f6000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c806370971aa71161005b57806370971aa7146100c8578063a2e74af6146100e7578063b72cd5121461010d578063f46901ed146101155761007d565b8063017e7e5814610082578063094b7415146100a65780633b46a6e7146100ae575b600080fd5b61008a61013b565b604080516001600160a01b039092168252519081900360200190f35b61008a61014a565b6100b6610159565b60408051918252519081900360200190f35b6100e5600480360360208110156100de57600080fd5b503561015f565b005b6100e5600480360360208110156100fd57600080fd5b50356001600160a01b031661020c565b6100b661027f565b6100e56004803603602081101561012b57600080fd5b50356001600160a01b0316610285565b6001546001600160a01b031681565b6002546001600160a01b031681565b60035481565b6002546001600160a01b031633146101b0576040805162461bcd60e51b815260206004820152600f60248201526e2837b7b31d102327a92124a22222a760891b604482015290519081900360640190fd5b600054811015610207576040805162461bcd60e51b815260206004820152601b60248201527f506f6f663a2050726f746f636f6c2066656520746f6f20686967680000000000604482015290519081900360640190fd5b600355565b6002546001600160a01b0316331461025d576040805162461bcd60e51b815260206004820152600f60248201526e2837b7b31d102327a92124a22222a760891b604482015290519081900360640190fd5b600280546001600160a01b0319166001600160a01b0392909216919091179055565b60005481565b6002546001600160a01b031633146102d6576040805162461bcd60e51b815260206004820152600f60248201526e2837b7b31d102327a92124a22222a760891b604482015290519081900360640190fd5b600180546001600160a01b0319166001600160a01b039290921691909117905556fea265627a7a72315820f540febae0ffa222749dcd2eb69b67411ddb6f3c1a3d8c13e0701743d180c3b064736f6c63430005110032", - "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c806370971aa71161005b57806370971aa7146100c8578063a2e74af6146100e7578063b72cd5121461010d578063f46901ed146101155761007d565b8063017e7e5814610082578063094b7415146100a65780633b46a6e7146100ae575b600080fd5b61008a61013b565b604080516001600160a01b039092168252519081900360200190f35b61008a61014a565b6100b6610159565b60408051918252519081900360200190f35b6100e5600480360360208110156100de57600080fd5b503561015f565b005b6100e5600480360360208110156100fd57600080fd5b50356001600160a01b031661020c565b6100b661027f565b6100e56004803603602081101561012b57600080fd5b50356001600160a01b0316610285565b6001546001600160a01b031681565b6002546001600160a01b031681565b60035481565b6002546001600160a01b031633146101b0576040805162461bcd60e51b815260206004820152600f60248201526e2837b7b31d102327a92124a22222a760891b604482015290519081900360640190fd5b600054811015610207576040805162461bcd60e51b815260206004820152601b60248201527f506f6f663a2050726f746f636f6c2066656520746f6f20686967680000000000604482015290519081900360640190fd5b600355565b6002546001600160a01b0316331461025d576040805162461bcd60e51b815260206004820152600f60248201526e2837b7b31d102327a92124a22222a760891b604482015290519081900360640190fd5b600280546001600160a01b0319166001600160a01b0392909216919091179055565b60005481565b6002546001600160a01b031633146102d6576040805162461bcd60e51b815260206004820152600f60248201526e2837b7b31d102327a92124a22222a760891b604482015290519081900360640190fd5b600180546001600160a01b0319166001600160a01b039290921691909117905556fea265627a7a72315820f540febae0ffa222749dcd2eb69b67411ddb6f3c1a3d8c13e0701743d180c3b064736f6c63430005110032", - "sourceMap": "25:875:2:-;;;116:3;74:45;;216:106;8:9:-1;5:2;;;30:1;27;20:12;5:2;216:106:2;;;;;;;;;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;216:106:2;263:11;:26;;-1:-1:-1;;;;;263:26:2;;;-1:-1:-1;;;;;;263:26:2;;;;;;;;;:11;295:18;:22;25:875;;;;;;", - "deployedSourceMap": "25:875:2:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;25:875:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;124:20;;;:::i;:::-;;;;-1:-1:-1;;;;;124:20:2;;;;;;;;;;;;;;148:26;;;:::i;178:33::-;;;:::i;:::-;;;;;;;;;;;;;;;;620:278;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;620:278:2;;:::i;:::-;;461:155;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;461:155:2;-1:-1:-1;;;;;461:155:2;;:::i;74:45::-;;;:::i;326:131::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;326:131:2;-1:-1:-1;;;;;326:131:2;;:::i;124:20::-;;;-1:-1:-1;;;;;124:20:2;;:::o;148:26::-;;;-1:-1:-1;;;;;148:26:2;;:::o;178:33::-;;;;:::o;620:278::-;719:11;;-1:-1:-1;;;;;719:11:2;705:10;:25;697:53;;;;;-1:-1:-1;;;697:53:2;;;;;;;;;;;;-1:-1:-1;;;697:53:2;;;;;;;;;;;;;;;789:24;;766:19;:47;;758:87;;;;;-1:-1:-1;;;758:87:2;;;;;;;;;;;;;;;;;;;;;;;;;;;;853:18;:40;620:278::o;461:155::-;546:11;;-1:-1:-1;;;;;546:11:2;532:10;:25;524:53;;;;;-1:-1:-1;;;524:53:2;;;;;;;;;;;;-1:-1:-1;;;524:53:2;;;;;;;;;;;;;;;585:11;:26;;-1:-1:-1;;;;;;585:26:2;-1:-1:-1;;;;;585:26:2;;;;;;;;;;461:155::o;74:45::-;;;;:::o;326:131::-;399:11;;-1:-1:-1;;;;;399:11:2;385:10;:25;377:53;;;;;-1:-1:-1;;;377:53:2;;;;;;;;;;;;-1:-1:-1;;;377:53:2;;;;;;;;;;;;;;;438:5;:14;;-1:-1:-1;;;;;;438:14:2;-1:-1:-1;;;;;438:14:2;;;;;;;;;;326:131::o", - "source": "pragma solidity 0.5.17;\n\ncontract FeeManager {\n // Maximum fee of 0.5%\n uint256 public MIN_PROTOCOL_FEE_DIVISOR = 200;\n\n address public feeTo;\n address public feeToSetter;\n uint256 public protocolFeeDivisor;\n\n constructor(address _feeToSetter) public {\n feeToSetter = _feeToSetter;\n protocolFeeDivisor = 0;\n }\n\n function setFeeTo(address _feeTo) external {\n require(msg.sender == feeToSetter, 'Poof: FORBIDDEN');\n feeTo = _feeTo;\n }\n\n function setFeeToSetter(address _feeToSetter) external {\n require(msg.sender == feeToSetter, 'Poof: FORBIDDEN');\n feeToSetter = _feeToSetter;\n }\n\n function setProtocolFeeDivisor(uint256 _protocolFeeDivisor) external {\n require(msg.sender == feeToSetter, 'Poof: FORBIDDEN');\n require(_protocolFeeDivisor >= MIN_PROTOCOL_FEE_DIVISOR, 'Poof: Protocol fee too high');\n protocolFeeDivisor = _protocolFeeDivisor;\n }\n}\n", + "metadata": "{\"compiler\":{\"version\":\"0.5.17+commit.d19bba13\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_feeToSetter\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"constant\":true,\"inputs\":[],\"name\":\"MIN_PROTOCOL_FEE_DIVISOR\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[],\"name\":\"clearFee\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"feeTo\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"feeToSetter\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"protocolFeeDivisor\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"_feeTo\",\"type\":\"address\"}],\"name\":\"setFeeTo\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"_feeToSetter\",\"type\":\"address\"}],\"name\":\"setFeeToSetter\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_protocolFeeDivisor\",\"type\":\"uint256\"}],\"name\":\"setProtocolFeeDivisor\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/home/dotfiles/tornado-core/contracts/FeeManager.sol\":\"FeeManager\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/home/dotfiles/tornado-core/contracts/FeeManager.sol\":{\"keccak256\":\"0x837e5749745df63a6d0b2fbc0e929afc3705c994915d5a13d20c22faf8f34946\",\"urls\":[\"bzz-raw://ea8fa48f85367b29f8637e324b62d5c0648f21ebba5f31b227185869a874c2b4\",\"dweb:/ipfs/QmZbpFjbafQKv9BjVEhe1vguyvpfK2p6qvbFvW2eTqNkkX\"]}},\"version\":1}", + "bytecode": "0x608060405234801561001057600080fd5b506040516104fe3803806104fe8339818101604052602081101561003357600080fd5b5051600180546001600160a01b0319166001600160a01b0390921691909117905561049b806100636000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c806370971aa71161005b57806370971aa7146100dd578063a2e74af6146100fa578063b72cd51214610120578063f46901ed1461012857610088565b8063017e7e581461008d578063094b7415146100b1578063315c2121146100b95780633b46a6e7146100c3575b600080fd5b61009561014e565b604080516001600160a01b039092168252519081900360200190f35b61009561015d565b6100c161016c565b005b6100cb6101ca565b60408051918252519081900360200190f35b6100c1600480360360208110156100f357600080fd5b50356101d0565b6100c16004803603602081101561011057600080fd5b50356001600160a01b031661026c565b6100cb61032a565b6100c16004803603602081101561013e57600080fd5b50356001600160a01b031661032f565b6000546001600160a01b031681565b6001546001600160a01b031681565b6001546001600160a01b031633146101c3576040805162461bcd60e51b81526020600482015260156024820152742332b2a6b0b730b3b2b91d102327a92124a22222a760591b604482015290519081900360640190fd5b6000600255565b60025481565b6001546001600160a01b03163314610227576040805162461bcd60e51b81526020600482015260156024820152742332b2a6b0b730b3b2b91d102327a92124a22222a760591b604482015290519081900360640190fd5b60c88110156102675760405162461bcd60e51b81526004018080602001828103825260218152602001806103ee6021913960400191505060405180910390fd5b600255565b6001546001600160a01b031633146102c3576040805162461bcd60e51b81526020600482015260156024820152742332b2a6b0b730b3b2b91d102327a92124a22222a760591b604482015290519081900360640190fd5b6001600160a01b0381166103085760405162461bcd60e51b815260040180806020018281038252602f815260200180610438602f913960400191505060405180910390fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b60c881565b6001546001600160a01b03163314610386576040805162461bcd60e51b81526020600482015260156024820152742332b2a6b0b730b3b2b91d102327a92124a22222a760591b604482015290519081900360640190fd5b6001600160a01b0381166103cb5760405162461bcd60e51b815260040180806020018281038252602981526020018061040f6029913960400191505060405180910390fd5b600080546001600160a01b0319166001600160a01b039290921691909117905556fe4665654d616e616765723a2050726f746f636f6c2066656520746f6f20686967684665654d616e616765723a206e657720666565546f20697320746865207a65726f20616464726573734665654d616e616765723a206e657720666565546f53657474657220697320746865207a65726f2061646472657373a265627a7a723158202eb474ee297abfc7861180a50b9f73ee0c9ce9a535a3ce1e7ab145f0bf0a0b2164736f6c63430005110032", + "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c806370971aa71161005b57806370971aa7146100dd578063a2e74af6146100fa578063b72cd51214610120578063f46901ed1461012857610088565b8063017e7e581461008d578063094b7415146100b1578063315c2121146100b95780633b46a6e7146100c3575b600080fd5b61009561014e565b604080516001600160a01b039092168252519081900360200190f35b61009561015d565b6100c161016c565b005b6100cb6101ca565b60408051918252519081900360200190f35b6100c1600480360360208110156100f357600080fd5b50356101d0565b6100c16004803603602081101561011057600080fd5b50356001600160a01b031661026c565b6100cb61032a565b6100c16004803603602081101561013e57600080fd5b50356001600160a01b031661032f565b6000546001600160a01b031681565b6001546001600160a01b031681565b6001546001600160a01b031633146101c3576040805162461bcd60e51b81526020600482015260156024820152742332b2a6b0b730b3b2b91d102327a92124a22222a760591b604482015290519081900360640190fd5b6000600255565b60025481565b6001546001600160a01b03163314610227576040805162461bcd60e51b81526020600482015260156024820152742332b2a6b0b730b3b2b91d102327a92124a22222a760591b604482015290519081900360640190fd5b60c88110156102675760405162461bcd60e51b81526004018080602001828103825260218152602001806103ee6021913960400191505060405180910390fd5b600255565b6001546001600160a01b031633146102c3576040805162461bcd60e51b81526020600482015260156024820152742332b2a6b0b730b3b2b91d102327a92124a22222a760591b604482015290519081900360640190fd5b6001600160a01b0381166103085760405162461bcd60e51b815260040180806020018281038252602f815260200180610438602f913960400191505060405180910390fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b60c881565b6001546001600160a01b03163314610386576040805162461bcd60e51b81526020600482015260156024820152742332b2a6b0b730b3b2b91d102327a92124a22222a760591b604482015290519081900360640190fd5b6001600160a01b0381166103cb5760405162461bcd60e51b815260040180806020018281038252602981526020018061040f6029913960400191505060405180910390fd5b600080546001600160a01b0319166001600160a01b039290921691909117905556fe4665654d616e616765723a2050726f746f636f6c2066656520746f6f20686967684665654d616e616765723a206e657720666565546f20697320746865207a65726f20616464726573734665654d616e616765723a206e657720666565546f53657474657220697320746865207a65726f2061646472657373a265627a7a723158202eb474ee297abfc7861180a50b9f73ee0c9ce9a535a3ce1e7ab145f0bf0a0b2164736f6c63430005110032", + "sourceMap": "25:1191:1:-;;;225:78;8:9:-1;5:2;;;30:1;27;20:12;5:2;225:78:1;;;;;;;;;;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;225:78:1;272:11;:26;;-1:-1:-1;;;;;;272:26:1;-1:-1:-1;;;;;272:26:1;;;;;;;;;25:1191;;;-1:-1:-1;25:1191:1;;", + "deployedSourceMap": "25:1191:1:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;25:1191:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;133:20;;;:::i;:::-;;;;-1:-1:-1;;;;;133:20:1;;;;;;;;;;;;;;157:26;;;:::i;1083:131::-;;;:::i;:::-;;187:33;;;:::i;:::-;;;;;;;;;;;;;;;;789:290;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;789:290:1;;:::i;530:255::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;530:255:1;-1:-1:-1;;;;;530:255:1;;:::i;74:54::-;;;:::i;307:219::-;;;;;;13:2:-1;8:3;5:11;2:2;;;29:1;26;19:12;2:2;-1:-1;307:219:1;-1:-1:-1;;;;;307:219:1;;:::i;133:20::-;;;-1:-1:-1;;;;;133:20:1;;:::o;157:26::-;;;-1:-1:-1;;;;;157:26:1;;:::o;1083:131::-;1142:11;;-1:-1:-1;;;;;1142:11:1;1128:10;:25;1120:59;;;;;-1:-1:-1;;;1120:59:1;;;;;;;;;;;;-1:-1:-1;;;1120:59:1;;;;;;;;;;;;;;;1208:1;1187:18;:22;1083:131::o;187:33::-;;;;:::o;789:290::-;888:11;;-1:-1:-1;;;;;888:11:1;874:10;:25;866:59;;;;;-1:-1:-1;;;866:59:1;;;;;;;;;;;;-1:-1:-1;;;866:59:1;;;;;;;;;;;;;;;125:3;941:19;:47;;933:93;;;;-1:-1:-1;;;933:93:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1034:18;:40;789:290::o;530:255::-;615:11;;-1:-1:-1;;;;;615:11:1;601:10;:25;593:59;;;;;-1:-1:-1;;;593:59:1;;;;;;;;;;;;-1:-1:-1;;;593:59:1;;;;;;;;;;;;;;;-1:-1:-1;;;;;668:26:1;;660:86;;;;-1:-1:-1;;;660:86:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;754:11;:26;;-1:-1:-1;;;;;;754:26:1;-1:-1:-1;;;;;754:26:1;;;;;;;;;;530:255::o;74:54::-;125:3;74:54;:::o;307:219::-;380:11;;-1:-1:-1;;;;;380:11:1;366:10;:25;358:59;;;;;-1:-1:-1;;;358:59:1;;;;;;;;;;;;-1:-1:-1;;;358:59:1;;;;;;;;;;;;;;;-1:-1:-1;;;;;433:20:1;;425:74;;;;-1:-1:-1;;;425:74:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;507:5;:14;;-1:-1:-1;;;;;;507:14:1;-1:-1:-1;;;;;507:14:1;;;;;;;;;;307:219::o", + "source": "pragma solidity 0.5.17;\n\ncontract FeeManager {\n // Maximum fee of 0.5%\n uint256 constant public MIN_PROTOCOL_FEE_DIVISOR = 200;\n\n address public feeTo;\n address public feeToSetter;\n uint256 public protocolFeeDivisor;\n\n constructor(address _feeToSetter) public {\n feeToSetter = _feeToSetter;\n }\n\n function setFeeTo(address _feeTo) external {\n require(msg.sender == feeToSetter, 'FeeManager: FORBIDDEN');\n require(_feeTo != address(0), 'FeeManager: new feeTo is the zero address');\n feeTo = _feeTo;\n }\n\n function setFeeToSetter(address _feeToSetter) external {\n require(msg.sender == feeToSetter, 'FeeManager: FORBIDDEN');\n require(_feeToSetter != address(0), 'FeeManager: new feeToSetter is the zero address');\n feeToSetter = _feeToSetter;\n }\n\n function setProtocolFeeDivisor(uint256 _protocolFeeDivisor) external {\n require(msg.sender == feeToSetter, 'FeeManager: FORBIDDEN');\n require(_protocolFeeDivisor >= MIN_PROTOCOL_FEE_DIVISOR, 'FeeManager: Protocol fee too high');\n protocolFeeDivisor = _protocolFeeDivisor;\n }\n\n function clearFee() external {\n require(msg.sender == feeToSetter, 'FeeManager: FORBIDDEN');\n protocolFeeDivisor = 0;\n }\n}\n", "sourcePath": "/home/home/dotfiles/tornado-core/contracts/FeeManager.sol", "ast": { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/FeeManager.sol", "exportedSymbols": { "FeeManager": [ - 472 + 404 ] }, - "id": 473, + "id": 405, "nodeType": "SourceUnit", "nodes": [ { - "id": 387, + "id": 289, "literals": [ "solidity", "0.5", ".17" ], "nodeType": "PragmaDirective", - "src": "0:23:2" + "src": "0:23:1" }, { "baseContracts": [], @@ -152,20 +161,20 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": true, - "id": 472, + "id": 404, "linearizedBaseContracts": [ - 472 + 404 ], "name": "FeeManager", "nodeType": "ContractDefinition", "nodes": [ { - "constant": false, - "id": 390, + "constant": true, + "id": 292, "name": "MIN_PROTOCOL_FEE_DIVISOR", "nodeType": "VariableDeclaration", - "scope": 472, - "src": "74:45:2", + "scope": 404, + "src": "74:54:1", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -173,10 +182,10 @@ "typeString": "uint256" }, "typeName": { - "id": 388, + "id": 290, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "74:7:2", + "src": "74:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -185,14 +194,14 @@ "value": { "argumentTypes": null, "hexValue": "323030", - "id": 389, + "id": 291, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "116:3:2", + "src": "125:3:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_200_by_1", @@ -204,11 +213,11 @@ }, { "constant": false, - "id": 392, + "id": 294, "name": "feeTo", "nodeType": "VariableDeclaration", - "scope": 472, - "src": "124:20:2", + "scope": 404, + "src": "133:20:1", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -216,10 +225,10 @@ "typeString": "address" }, "typeName": { - "id": 391, + "id": 293, "name": "address", "nodeType": "ElementaryTypeName", - "src": "124:7:2", + "src": "133:7:1", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -231,11 +240,11 @@ }, { "constant": false, - "id": 394, + "id": 296, "name": "feeToSetter", "nodeType": "VariableDeclaration", - "scope": 472, - "src": "148:26:2", + "scope": 404, + "src": "157:26:1", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -243,10 +252,10 @@ "typeString": "address" }, "typeName": { - "id": 393, + "id": 295, "name": "address", "nodeType": "ElementaryTypeName", - "src": "148:7:2", + "src": "157:7:1", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -258,11 +267,11 @@ }, { "constant": false, - "id": 396, + "id": 298, "name": "protocolFeeDivisor", "nodeType": "VariableDeclaration", - "scope": 472, - "src": "178:33:2", + "scope": 404, + "src": "187:33:1", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -270,10 +279,10 @@ "typeString": "uint256" }, "typeName": { - "id": 395, + "id": 297, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "178:7:2", + "src": "187:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -284,26 +293,26 @@ }, { "body": { - "id": 409, + "id": 307, "nodeType": "Block", - "src": "257:65:2", + "src": "266:37:1", "statements": [ { "expression": { "argumentTypes": null, - "id": 403, + "id": 305, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 401, + "id": 303, "name": "feeToSetter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "263:11:2", + "referencedDeclaration": 296, + "src": "272:11:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -313,98 +322,47 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 402, + "id": 304, "name": "_feeToSetter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 398, - "src": "277:12:2", + "referencedDeclaration": 300, + "src": "286:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "263:26:2", + "src": "272:26:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 404, + "id": 306, "nodeType": "ExpressionStatement", - "src": "263:26:2" - }, - { - "expression": { - "argumentTypes": null, - "id": 407, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "leftHandSide": { - "argumentTypes": null, - "id": 405, - "name": "protocolFeeDivisor", - "nodeType": "Identifier", - "overloadedDeclarations": [], - "referencedDeclaration": 396, - "src": "295:18:2", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "nodeType": "Assignment", - "operator": "=", - "rightHandSide": { - "argumentTypes": null, - "hexValue": "30", - "id": 406, - "isConstant": false, - "isLValue": false, - "isPure": true, - "kind": "number", - "lValueRequested": false, - "nodeType": "Literal", - "src": "316:1:2", - "subdenomination": null, - "typeDescriptions": { - "typeIdentifier": "t_rational_0_by_1", - "typeString": "int_const 0" - }, - "value": "0" - }, - "src": "295:22:2", - "typeDescriptions": { - "typeIdentifier": "t_uint256", - "typeString": "uint256" - } - }, - "id": 408, - "nodeType": "ExpressionStatement", - "src": "295:22:2" + "src": "272:26:1" } ] }, "documentation": null, - "id": 410, + "id": 308, "implemented": true, "kind": "constructor", "modifiers": [], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 399, + "id": 301, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 398, + "id": 300, "name": "_feeToSetter", "nodeType": "VariableDeclaration", - "scope": 410, - "src": "228:20:2", + "scope": 308, + "src": "237:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -412,10 +370,10 @@ "typeString": "address" }, "typeName": { - "id": 397, + "id": 299, "name": "address", "nodeType": "ElementaryTypeName", - "src": "228:7:2", + "src": "237:7:1", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -426,25 +384,25 @@ "visibility": "internal" } ], - "src": "227:22:2" + "src": "236:22:1" }, "returnParameters": { - "id": 400, + "id": 302, "nodeType": "ParameterList", "parameters": [], - "src": "257:0:2" + "src": "266:0:1" }, - "scope": 472, - "src": "216:106:2", + "scope": 404, + "src": "225:78:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 427, + "id": 334, "nodeType": "Block", - "src": "369:88:2", + "src": "350:176:1", "statements": [ { "expression": { @@ -456,7 +414,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 419, + "id": 317, "isConstant": false, "isLValue": false, "isPure": false, @@ -465,18 +423,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 416, + "id": 314, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1408, - "src": "385:3:2", + "referencedDeclaration": 1365, + "src": "366:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 417, + "id": 315, "isConstant": false, "isLValue": false, "isPure": false, @@ -484,7 +442,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "385:10:2", + "src": "366:10:1", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -494,18 +452,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 418, + "id": 316, "name": "feeToSetter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "399:11:2", + "referencedDeclaration": 296, + "src": "380:11:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "385:25:2", + "src": "366:25:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -513,21 +471,21 @@ }, { "argumentTypes": null, - "hexValue": "506f6f663a20464f5242494444454e", - "id": 420, + "hexValue": "4665654d616e616765723a20464f5242494444454e", + "id": 318, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "412:17:2", + "src": "393:23:1", "subdenomination": null, "typeDescriptions": { - "typeIdentifier": "t_stringliteral_b0ea5653e0e519b050ef336c67727a3a431509a369a785f89e8479e85ce40165", - "typeString": "literal_string \"Poof: FORBIDDEN\"" + "typeIdentifier": "t_stringliteral_cfc6973bacdb6f988aa3a36d929474df982e4a2d4592d76afeb6358c3f21f87c", + "typeString": "literal_string \"FeeManager: FORBIDDEN\"" }, - "value": "Poof: FORBIDDEN" + "value": "FeeManager: FORBIDDEN" } ], "expression": { @@ -537,25 +495,25 @@ "typeString": "bool" }, { - "typeIdentifier": "t_stringliteral_b0ea5653e0e519b050ef336c67727a3a431509a369a785f89e8479e85ce40165", - "typeString": "literal_string \"Poof: FORBIDDEN\"" + "typeIdentifier": "t_stringliteral_cfc6973bacdb6f988aa3a36d929474df982e4a2d4592d76afeb6358c3f21f87c", + "typeString": "literal_string \"FeeManager: FORBIDDEN\"" } ], - "id": 415, + "id": 313, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "377:7:2", + "referencedDeclaration": 1369, + "src": "358:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 421, + "id": 319, "isConstant": false, "isLValue": false, "isPure": false, @@ -563,32 +521,186 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "377:53:2", + "src": "358:59:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 422, + "id": 320, "nodeType": "ExpressionStatement", - "src": "377:53:2" + "src": "358:59:1" }, { "expression": { "argumentTypes": null, - "id": 425, + "arguments": [ + { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "id": 326, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "id": 322, + "name": "_feeTo", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 310, + "src": "433:6:1", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "BinaryOperation", + "operator": "!=", + "rightExpression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "30", + "id": 324, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "451:1:1", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_0_by_1", + "typeString": "int_const 0" + }, + "value": "0" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_0_by_1", + "typeString": "int_const 0" + } + ], + "id": 323, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "443:7:1", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_address_$", + "typeString": "type(address)" + }, + "typeName": "address" + }, + "id": 325, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "443:10:1", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + }, + "src": "433:20:1", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + { + "argumentTypes": null, + "hexValue": "4665654d616e616765723a206e657720666565546f20697320746865207a65726f2061646472657373", + "id": 327, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "455:43:1", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_a17d66d0a9db281acbd7402baedfb4175fd0fe4006cf96ad25cac6ecddfed05d", + "typeString": "literal_string \"FeeManager: new feeTo is the zero address\"" + }, + "value": "FeeManager: new feeTo is the zero address" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_a17d66d0a9db281acbd7402baedfb4175fd0fe4006cf96ad25cac6ecddfed05d", + "typeString": "literal_string \"FeeManager: new feeTo is the zero address\"" + } + ], + "id": 321, + "name": "require", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 1368, + 1369 + ], + "referencedDeclaration": 1369, + "src": "425:7:1", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 328, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "425:74:1", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 329, + "nodeType": "ExpressionStatement", + "src": "425:74:1" + }, + { + "expression": { + "argumentTypes": null, + "id": 332, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 423, + "id": 330, "name": "feeTo", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 392, - "src": "438:5:2", + "referencedDeclaration": 294, + "src": "507:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -598,47 +710,47 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 424, + "id": 331, "name": "_feeTo", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 412, - "src": "446:6:2", + "referencedDeclaration": 310, + "src": "515:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "438:14:2", + "src": "507:14:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 426, + "id": 333, "nodeType": "ExpressionStatement", - "src": "438:14:2" + "src": "507:14:1" } ] }, "documentation": null, - "id": 428, + "id": 335, "implemented": true, "kind": "function", "modifiers": [], "name": "setFeeTo", "nodeType": "FunctionDefinition", "parameters": { - "id": 413, + "id": 311, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 412, + "id": 310, "name": "_feeTo", "nodeType": "VariableDeclaration", - "scope": 428, - "src": "344:14:2", + "scope": 335, + "src": "325:14:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -646,10 +758,10 @@ "typeString": "address" }, "typeName": { - "id": 411, + "id": 309, "name": "address", "nodeType": "ElementaryTypeName", - "src": "344:7:2", + "src": "325:7:1", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -660,25 +772,25 @@ "visibility": "internal" } ], - "src": "343:16:2" + "src": "324:16:1" }, "returnParameters": { - "id": 414, + "id": 312, "nodeType": "ParameterList", "parameters": [], - "src": "369:0:2" + "src": "350:0:1" }, - "scope": 472, - "src": "326:131:2", + "scope": 404, + "src": "307:219:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 445, + "id": 361, "nodeType": "Block", - "src": "516:100:2", + "src": "585:200:1", "statements": [ { "expression": { @@ -690,7 +802,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 437, + "id": 344, "isConstant": false, "isLValue": false, "isPure": false, @@ -699,18 +811,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 434, + "id": 341, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1408, - "src": "532:3:2", + "referencedDeclaration": 1365, + "src": "601:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 435, + "id": 342, "isConstant": false, "isLValue": false, "isPure": false, @@ -718,7 +830,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "532:10:2", + "src": "601:10:1", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -728,18 +840,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 436, + "id": 343, "name": "feeToSetter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "546:11:2", + "referencedDeclaration": 296, + "src": "615:11:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "532:25:2", + "src": "601:25:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -747,21 +859,21 @@ }, { "argumentTypes": null, - "hexValue": "506f6f663a20464f5242494444454e", - "id": 438, + "hexValue": "4665654d616e616765723a20464f5242494444454e", + "id": 345, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "559:17:2", + "src": "628:23:1", "subdenomination": null, "typeDescriptions": { - "typeIdentifier": "t_stringliteral_b0ea5653e0e519b050ef336c67727a3a431509a369a785f89e8479e85ce40165", - "typeString": "literal_string \"Poof: FORBIDDEN\"" + "typeIdentifier": "t_stringliteral_cfc6973bacdb6f988aa3a36d929474df982e4a2d4592d76afeb6358c3f21f87c", + "typeString": "literal_string \"FeeManager: FORBIDDEN\"" }, - "value": "Poof: FORBIDDEN" + "value": "FeeManager: FORBIDDEN" } ], "expression": { @@ -771,25 +883,25 @@ "typeString": "bool" }, { - "typeIdentifier": "t_stringliteral_b0ea5653e0e519b050ef336c67727a3a431509a369a785f89e8479e85ce40165", - "typeString": "literal_string \"Poof: FORBIDDEN\"" + "typeIdentifier": "t_stringliteral_cfc6973bacdb6f988aa3a36d929474df982e4a2d4592d76afeb6358c3f21f87c", + "typeString": "literal_string \"FeeManager: FORBIDDEN\"" } ], - "id": 433, + "id": 340, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "524:7:2", + "referencedDeclaration": 1369, + "src": "593:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 439, + "id": 346, "isConstant": false, "isLValue": false, "isPure": false, @@ -797,32 +909,186 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "524:53:2", + "src": "593:59:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 440, + "id": 347, "nodeType": "ExpressionStatement", - "src": "524:53:2" + "src": "593:59:1" }, { "expression": { "argumentTypes": null, - "id": 443, + "arguments": [ + { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "id": 353, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "id": 349, + "name": "_feeToSetter", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 337, + "src": "668:12:1", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "nodeType": "BinaryOperation", + "operator": "!=", + "rightExpression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "hexValue": "30", + "id": 351, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "692:1:1", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_0_by_1", + "typeString": "int_const 0" + }, + "value": "0" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_0_by_1", + "typeString": "int_const 0" + } + ], + "id": 350, + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "nodeType": "ElementaryTypeNameExpression", + "src": "684:7:1", + "typeDescriptions": { + "typeIdentifier": "t_type$_t_address_$", + "typeString": "type(address)" + }, + "typeName": "address" + }, + "id": 352, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "typeConversion", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "684:10:1", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + }, + "src": "668:26:1", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + { + "argumentTypes": null, + "hexValue": "4665654d616e616765723a206e657720666565546f53657474657220697320746865207a65726f2061646472657373", + "id": 354, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "696:49:1", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_c2945b58c8dd4cfa36c02a297723f3a11c415c25f27fbfb9a5c6fa5f04ebea59", + "typeString": "literal_string \"FeeManager: new feeToSetter is the zero address\"" + }, + "value": "FeeManager: new feeToSetter is the zero address" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_c2945b58c8dd4cfa36c02a297723f3a11c415c25f27fbfb9a5c6fa5f04ebea59", + "typeString": "literal_string \"FeeManager: new feeToSetter is the zero address\"" + } + ], + "id": 348, + "name": "require", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 1368, + 1369 + ], + "referencedDeclaration": 1369, + "src": "660:7:1", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 355, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "660:86:1", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 356, + "nodeType": "ExpressionStatement", + "src": "660:86:1" + }, + { + "expression": { + "argumentTypes": null, + "id": 359, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 441, + "id": 357, "name": "feeToSetter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "585:11:2", + "referencedDeclaration": 296, + "src": "754:11:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -832,47 +1098,47 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 442, + "id": 358, "name": "_feeToSetter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 430, - "src": "599:12:2", + "referencedDeclaration": 337, + "src": "768:12:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "585:26:2", + "src": "754:26:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 444, + "id": 360, "nodeType": "ExpressionStatement", - "src": "585:26:2" + "src": "754:26:1" } ] }, "documentation": null, - "id": 446, + "id": 362, "implemented": true, "kind": "function", "modifiers": [], "name": "setFeeToSetter", "nodeType": "FunctionDefinition", "parameters": { - "id": 431, + "id": 338, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 430, + "id": 337, "name": "_feeToSetter", "nodeType": "VariableDeclaration", - "scope": 446, - "src": "485:20:2", + "scope": 362, + "src": "554:20:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -880,10 +1146,10 @@ "typeString": "address" }, "typeName": { - "id": 429, + "id": 336, "name": "address", "nodeType": "ElementaryTypeName", - "src": "485:7:2", + "src": "554:7:1", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -894,25 +1160,25 @@ "visibility": "internal" } ], - "src": "484:22:2" + "src": "553:22:1" }, "returnParameters": { - "id": 432, + "id": 339, "nodeType": "ParameterList", "parameters": [], - "src": "516:0:2" + "src": "585:0:1" }, - "scope": 472, - "src": "461:155:2", + "scope": 404, + "src": "530:255:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 470, + "id": 386, "nodeType": "Block", - "src": "689:209:2", + "src": "858:221:1", "statements": [ { "expression": { @@ -924,7 +1190,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 455, + "id": 371, "isConstant": false, "isLValue": false, "isPure": false, @@ -933,18 +1199,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 452, + "id": 368, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1408, - "src": "705:3:2", + "referencedDeclaration": 1365, + "src": "874:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 453, + "id": 369, "isConstant": false, "isLValue": false, "isPure": false, @@ -952,7 +1218,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "705:10:2", + "src": "874:10:1", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -962,18 +1228,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 454, + "id": 370, "name": "feeToSetter", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 394, - "src": "719:11:2", + "referencedDeclaration": 296, + "src": "888:11:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "705:25:2", + "src": "874:25:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -981,21 +1247,21 @@ }, { "argumentTypes": null, - "hexValue": "506f6f663a20464f5242494444454e", - "id": 456, + "hexValue": "4665654d616e616765723a20464f5242494444454e", + "id": 372, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "732:17:2", + "src": "901:23:1", "subdenomination": null, "typeDescriptions": { - "typeIdentifier": "t_stringliteral_b0ea5653e0e519b050ef336c67727a3a431509a369a785f89e8479e85ce40165", - "typeString": "literal_string \"Poof: FORBIDDEN\"" + "typeIdentifier": "t_stringliteral_cfc6973bacdb6f988aa3a36d929474df982e4a2d4592d76afeb6358c3f21f87c", + "typeString": "literal_string \"FeeManager: FORBIDDEN\"" }, - "value": "Poof: FORBIDDEN" + "value": "FeeManager: FORBIDDEN" } ], "expression": { @@ -1005,25 +1271,25 @@ "typeString": "bool" }, { - "typeIdentifier": "t_stringliteral_b0ea5653e0e519b050ef336c67727a3a431509a369a785f89e8479e85ce40165", - "typeString": "literal_string \"Poof: FORBIDDEN\"" + "typeIdentifier": "t_stringliteral_cfc6973bacdb6f988aa3a36d929474df982e4a2d4592d76afeb6358c3f21f87c", + "typeString": "literal_string \"FeeManager: FORBIDDEN\"" } ], - "id": 451, + "id": 367, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "697:7:2", + "referencedDeclaration": 1369, + "src": "866:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 457, + "id": 373, "isConstant": false, "isLValue": false, "isPure": false, @@ -1031,15 +1297,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "697:53:2", + "src": "866:59:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 458, + "id": 374, "nodeType": "ExpressionStatement", - "src": "697:53:2" + "src": "866:59:1" }, { "expression": { @@ -1051,19 +1317,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 462, + "id": 378, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 460, + "id": 376, "name": "_protocolFeeDivisor", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 448, - "src": "766:19:2", + "referencedDeclaration": 364, + "src": "941:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1073,18 +1339,18 @@ "operator": ">=", "rightExpression": { "argumentTypes": null, - "id": 461, + "id": 377, "name": "MIN_PROTOCOL_FEE_DIVISOR", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 390, - "src": "789:24:2", + "referencedDeclaration": 292, + "src": "964:24:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "766:47:2", + "src": "941:47:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1092,21 +1358,21 @@ }, { "argumentTypes": null, - "hexValue": "506f6f663a2050726f746f636f6c2066656520746f6f2068696768", - "id": 463, + "hexValue": "4665654d616e616765723a2050726f746f636f6c2066656520746f6f2068696768", + "id": 379, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "815:29:2", + "src": "990:35:1", "subdenomination": null, "typeDescriptions": { - "typeIdentifier": "t_stringliteral_5c096880b05c9468650c913ec6feafc9810ea461905d92390e74b130ffc27862", - "typeString": "literal_string \"Poof: Protocol fee too high\"" + "typeIdentifier": "t_stringliteral_68e7dacba247d13ad02c13ad936c3dbda8b08af42f3b9464358e33d2d81058ce", + "typeString": "literal_string \"FeeManager: Protocol fee too high\"" }, - "value": "Poof: Protocol fee too high" + "value": "FeeManager: Protocol fee too high" } ], "expression": { @@ -1116,25 +1382,25 @@ "typeString": "bool" }, { - "typeIdentifier": "t_stringliteral_5c096880b05c9468650c913ec6feafc9810ea461905d92390e74b130ffc27862", - "typeString": "literal_string \"Poof: Protocol fee too high\"" + "typeIdentifier": "t_stringliteral_68e7dacba247d13ad02c13ad936c3dbda8b08af42f3b9464358e33d2d81058ce", + "typeString": "literal_string \"FeeManager: Protocol fee too high\"" } ], - "id": 459, + "id": 375, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "758:7:2", + "referencedDeclaration": 1369, + "src": "933:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 464, + "id": 380, "isConstant": false, "isLValue": false, "isPure": false, @@ -1142,32 +1408,32 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "758:87:2", + "src": "933:93:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 465, + "id": 381, "nodeType": "ExpressionStatement", - "src": "758:87:2" + "src": "933:93:1" }, { "expression": { "argumentTypes": null, - "id": 468, + "id": 384, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 466, + "id": 382, "name": "protocolFeeDivisor", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 396, - "src": "853:18:2", + "referencedDeclaration": 298, + "src": "1034:18:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1177,47 +1443,47 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 467, + "id": 383, "name": "_protocolFeeDivisor", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 448, - "src": "874:19:2", + "referencedDeclaration": 364, + "src": "1055:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "853:40:2", + "src": "1034:40:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 469, + "id": 385, "nodeType": "ExpressionStatement", - "src": "853:40:2" + "src": "1034:40:1" } ] }, "documentation": null, - "id": 471, + "id": 387, "implemented": true, "kind": "function", "modifiers": [], "name": "setProtocolFeeDivisor", "nodeType": "FunctionDefinition", "parameters": { - "id": 449, + "id": 365, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 448, + "id": 364, "name": "_protocolFeeDivisor", "nodeType": "VariableDeclaration", - "scope": 471, - "src": "651:27:2", + "scope": 387, + "src": "820:27:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1225,10 +1491,10 @@ "typeString": "uint256" }, "typeName": { - "id": 447, + "id": 363, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "651:7:2", + "src": "820:7:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1238,33 +1504,244 @@ "visibility": "internal" } ], - "src": "650:29:2" + "src": "819:29:1" }, "returnParameters": { - "id": 450, + "id": 366, "nodeType": "ParameterList", "parameters": [], - "src": "689:0:2" + "src": "858:0:1" }, - "scope": 472, - "src": "620:278:2", + "scope": 404, + "src": "789:290:1", + "stateMutability": "nonpayable", + "superFunction": null, + "visibility": "external" + }, + { + "body": { + "id": 402, + "nodeType": "Block", + "src": "1112:102:1", + "statements": [ + { + "expression": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "id": 394, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftExpression": { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 391, + "name": "msg", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1365, + "src": "1128:3:1", + "typeDescriptions": { + "typeIdentifier": "t_magic_message", + "typeString": "msg" + } + }, + "id": 392, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sender", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "1128:10:1", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + }, + "nodeType": "BinaryOperation", + "operator": "==", + "rightExpression": { + "argumentTypes": null, + "id": 393, + "name": "feeToSetter", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 296, + "src": "1142:11:1", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "src": "1128:25:1", + "typeDescriptions": { + "typeIdentifier": "t_bool", + "typeString": "bool" + } + }, + { + "argumentTypes": null, + "hexValue": "4665654d616e616765723a20464f5242494444454e", + "id": 395, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "string", + "lValueRequested": false, + "nodeType": "Literal", + "src": "1155:23:1", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_stringliteral_cfc6973bacdb6f988aa3a36d929474df982e4a2d4592d76afeb6358c3f21f87c", + "typeString": "literal_string \"FeeManager: FORBIDDEN\"" + }, + "value": "FeeManager: FORBIDDEN" + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_cfc6973bacdb6f988aa3a36d929474df982e4a2d4592d76afeb6358c3f21f87c", + "typeString": "literal_string \"FeeManager: FORBIDDEN\"" + } + ], + "id": 390, + "name": "require", + "nodeType": "Identifier", + "overloadedDeclarations": [ + 1368, + 1369 + ], + "referencedDeclaration": 1369, + "src": "1120:7:1", + "typeDescriptions": { + "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", + "typeString": "function (bool,string memory) pure" + } + }, + "id": 396, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "1120:59:1", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 397, + "nodeType": "ExpressionStatement", + "src": "1120:59:1" + }, + { + "expression": { + "argumentTypes": null, + "id": 400, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "leftHandSide": { + "argumentTypes": null, + "id": 398, + "name": "protocolFeeDivisor", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 298, + "src": "1187:18:1", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "nodeType": "Assignment", + "operator": "=", + "rightHandSide": { + "argumentTypes": null, + "hexValue": "30", + "id": 399, + "isConstant": false, + "isLValue": false, + "isPure": true, + "kind": "number", + "lValueRequested": false, + "nodeType": "Literal", + "src": "1208:1:1", + "subdenomination": null, + "typeDescriptions": { + "typeIdentifier": "t_rational_0_by_1", + "typeString": "int_const 0" + }, + "value": "0" + }, + "src": "1187:22:1", + "typeDescriptions": { + "typeIdentifier": "t_uint256", + "typeString": "uint256" + } + }, + "id": 401, + "nodeType": "ExpressionStatement", + "src": "1187:22:1" + } + ] + }, + "documentation": null, + "id": 403, + "implemented": true, + "kind": "function", + "modifiers": [], + "name": "clearFee", + "nodeType": "FunctionDefinition", + "parameters": { + "id": 388, + "nodeType": "ParameterList", + "parameters": [], + "src": "1100:2:1" + }, + "returnParameters": { + "id": 389, + "nodeType": "ParameterList", + "parameters": [], + "src": "1112:0:1" + }, + "scope": 404, + "src": "1083:131:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 473, - "src": "25:875:2" + "scope": 405, + "src": "25:1191:1" } ], - "src": "0:901:2" + "src": "0:1217:1" }, "legacyAST": { "attributes": { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/FeeManager.sol", "exportedSymbols": { "FeeManager": [ - 472 + 404 ] } }, @@ -1277,9 +1754,9 @@ ".17" ] }, - "id": 387, + "id": 289, "name": "PragmaDirective", - "src": "0:23:2" + "src": "0:23:1" }, { "attributes": { @@ -1293,17 +1770,17 @@ "documentation": null, "fullyImplemented": true, "linearizedBaseContracts": [ - 472 + 404 ], "name": "FeeManager", - "scope": 473 + "scope": 405 }, "children": [ { "attributes": { - "constant": false, + "constant": true, "name": "MIN_PROTOCOL_FEE_DIVISOR", - "scope": 472, + "scope": 404, "stateVariable": true, "storageLocation": "default", "type": "uint256", @@ -1315,9 +1792,9 @@ "name": "uint256", "type": "uint256" }, - "id": 388, + "id": 290, "name": "ElementaryTypeName", - "src": "74:7:2" + "src": "74:7:1" }, { "attributes": { @@ -1332,20 +1809,20 @@ "type": "int_const 200", "value": "200" }, - "id": 389, + "id": 291, "name": "Literal", - "src": "116:3:2" + "src": "125:3:1" } ], - "id": 390, + "id": 292, "name": "VariableDeclaration", - "src": "74:45:2" + "src": "74:54:1" }, { "attributes": { "constant": false, "name": "feeTo", - "scope": 472, + "scope": 404, "stateVariable": true, "storageLocation": "default", "type": "address", @@ -1359,20 +1836,20 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 391, + "id": 293, "name": "ElementaryTypeName", - "src": "124:7:2" + "src": "133:7:1" } ], - "id": 392, + "id": 294, "name": "VariableDeclaration", - "src": "124:20:2" + "src": "133:20:1" }, { "attributes": { "constant": false, "name": "feeToSetter", - "scope": 472, + "scope": 404, "stateVariable": true, "storageLocation": "default", "type": "address", @@ -1386,20 +1863,20 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 393, + "id": 295, "name": "ElementaryTypeName", - "src": "148:7:2" + "src": "157:7:1" } ], - "id": 394, + "id": 296, "name": "VariableDeclaration", - "src": "148:26:2" + "src": "157:26:1" }, { "attributes": { "constant": false, "name": "protocolFeeDivisor", - "scope": 472, + "scope": 404, "stateVariable": true, "storageLocation": "default", "type": "uint256", @@ -1412,14 +1889,14 @@ "name": "uint256", "type": "uint256" }, - "id": 395, + "id": 297, "name": "ElementaryTypeName", - "src": "178:7:2" + "src": "187:7:1" } ], - "id": 396, + "id": 298, "name": "VariableDeclaration", - "src": "178:33:2" + "src": "187:33:1" }, { "attributes": { @@ -1431,7 +1908,7 @@ null ], "name": "", - "scope": 472, + "scope": 404, "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -1443,7 +1920,7 @@ "attributes": { "constant": false, "name": "_feeToSetter", - "scope": 410, + "scope": 308, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -1457,19 +1934,19 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 397, + "id": 299, "name": "ElementaryTypeName", - "src": "228:7:2" + "src": "237:7:1" } ], - "id": 398, + "id": 300, "name": "VariableDeclaration", - "src": "228:20:2" + "src": "237:20:1" } ], - "id": 399, + "id": 301, "name": "ParameterList", - "src": "227:22:2" + "src": "236:22:1" }, { "attributes": { @@ -1478,9 +1955,9 @@ ] }, "children": [], - "id": 400, + "id": 302, "name": "ParameterList", - "src": "257:0:2" + "src": "266:0:1" }, { "children": [ @@ -1503,13 +1980,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 394, + "referencedDeclaration": 296, "type": "address", "value": "feeToSetter" }, - "id": 401, + "id": 303, "name": "Identifier", - "src": "263:11:2" + "src": "272:11:1" }, { "attributes": { @@ -1517,87 +1994,33 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 398, + "referencedDeclaration": 300, "type": "address", "value": "_feeToSetter" }, - "id": 402, + "id": 304, "name": "Identifier", - "src": "277:12:2" + "src": "286:12:1" } ], - "id": 403, + "id": 305, "name": "Assignment", - "src": "263:26:2" + "src": "272:26:1" } ], - "id": 404, + "id": 306, "name": "ExpressionStatement", - "src": "263:26:2" - }, - { - "children": [ - { - "attributes": { - "argumentTypes": null, - "isConstant": false, - "isLValue": false, - "isPure": false, - "lValueRequested": false, - "operator": "=", - "type": "uint256" - }, - "children": [ - { - "attributes": { - "argumentTypes": null, - "overloadedDeclarations": [ - null - ], - "referencedDeclaration": 396, - "type": "uint256", - "value": "protocolFeeDivisor" - }, - "id": 405, - "name": "Identifier", - "src": "295:18:2" - }, - { - "attributes": { - "argumentTypes": null, - "hexvalue": "30", - "isConstant": false, - "isLValue": false, - "isPure": true, - "lValueRequested": false, - "subdenomination": null, - "token": "number", - "type": "int_const 0", - "value": "0" - }, - "id": 406, - "name": "Literal", - "src": "316:1:2" - } - ], - "id": 407, - "name": "Assignment", - "src": "295:22:2" - } - ], - "id": 408, - "name": "ExpressionStatement", - "src": "295:22:2" + "src": "272:26:1" } ], - "id": 409, + "id": 307, "name": "Block", - "src": "257:65:2" + "src": "266:37:1" } ], - "id": 410, + "id": 308, "name": "FunctionDefinition", - "src": "216:106:2" + "src": "225:78:1" }, { "attributes": { @@ -1609,7 +2032,7 @@ null ], "name": "setFeeTo", - "scope": 472, + "scope": 404, "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -1621,7 +2044,7 @@ "attributes": { "constant": false, "name": "_feeTo", - "scope": 428, + "scope": 335, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -1635,19 +2058,19 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 411, + "id": 309, "name": "ElementaryTypeName", - "src": "344:7:2" + "src": "325:7:1" } ], - "id": 412, + "id": 310, "name": "VariableDeclaration", - "src": "344:14:2" + "src": "325:14:1" } ], - "id": 413, + "id": 311, "name": "ParameterList", - "src": "343:16:2" + "src": "324:16:1" }, { "attributes": { @@ -1656,9 +2079,9 @@ ] }, "children": [], - "id": 414, + "id": 312, "name": "ParameterList", - "src": "369:0:2" + "src": "350:0:1" }, { "children": [ @@ -1687,21 +2110,21 @@ "typeString": "bool" }, { - "typeIdentifier": "t_stringliteral_b0ea5653e0e519b050ef336c67727a3a431509a369a785f89e8479e85ce40165", - "typeString": "literal_string \"Poof: FORBIDDEN\"" + "typeIdentifier": "t_stringliteral_cfc6973bacdb6f988aa3a36d929474df982e4a2d4592d76afeb6358c3f21f87c", + "typeString": "literal_string \"FeeManager: FORBIDDEN\"" } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 415, + "id": 313, "name": "Identifier", - "src": "377:7:2" + "src": "358:7:1" }, { "attributes": { @@ -1736,18 +2159,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1408, + "referencedDeclaration": 1365, "type": "msg", "value": "msg" }, - "id": 416, + "id": 314, "name": "Identifier", - "src": "385:3:2" + "src": "366:3:1" } ], - "id": 417, + "id": 315, "name": "MemberAccess", - "src": "385:10:2" + "src": "366:10:1" }, { "attributes": { @@ -1755,45 +2178,203 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 394, + "referencedDeclaration": 296, "type": "address", "value": "feeToSetter" }, - "id": 418, + "id": 316, "name": "Identifier", - "src": "399:11:2" + "src": "380:11:1" } ], - "id": 419, + "id": 317, "name": "BinaryOperation", - "src": "385:25:2" + "src": "366:25:1" }, { "attributes": { "argumentTypes": null, - "hexvalue": "506f6f663a20464f5242494444454e", + "hexvalue": "4665654d616e616765723a20464f5242494444454e", "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "subdenomination": null, "token": "string", - "type": "literal_string \"Poof: FORBIDDEN\"", - "value": "Poof: FORBIDDEN" + "type": "literal_string \"FeeManager: FORBIDDEN\"", + "value": "FeeManager: FORBIDDEN" }, - "id": 420, + "id": 318, "name": "Literal", - "src": "412:17:2" + "src": "393:23:1" } ], - "id": 421, + "id": 319, "name": "FunctionCall", - "src": "377:53:2" + "src": "358:59:1" } ], - "id": 422, + "id": 320, "name": "ExpressionStatement", - "src": "377:53:2" + "src": "358:59:1" + }, + { + "children": [ + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "isStructConstructorCall": false, + "lValueRequested": false, + "names": [ + null + ], + "type": "tuple()", + "type_conversion": false + }, + "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_a17d66d0a9db281acbd7402baedfb4175fd0fe4006cf96ad25cac6ecddfed05d", + "typeString": "literal_string \"FeeManager: new feeTo is the zero address\"" + } + ], + "overloadedDeclarations": [ + 1368, + 1369 + ], + "referencedDeclaration": 1369, + "type": "function (bool,string memory) pure", + "value": "require" + }, + "id": 321, + "name": "Identifier", + "src": "425:7:1" + }, + { + "attributes": { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "operator": "!=", + "type": "bool" + }, + "children": [ + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 310, + "type": "address", + "value": "_feeTo" + }, + "id": 322, + "name": "Identifier", + "src": "433:6:1" + }, + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": true, + "isStructConstructorCall": false, + "lValueRequested": false, + "names": [ + null + ], + "type": "address payable", + "type_conversion": true + }, + "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_0_by_1", + "typeString": "int_const 0" + } + ], + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "type": "type(address)", + "value": "address" + }, + "id": 323, + "name": "ElementaryTypeNameExpression", + "src": "443:7:1" + }, + { + "attributes": { + "argumentTypes": null, + "hexvalue": "30", + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "subdenomination": null, + "token": "number", + "type": "int_const 0", + "value": "0" + }, + "id": 324, + "name": "Literal", + "src": "451:1:1" + } + ], + "id": 325, + "name": "FunctionCall", + "src": "443:10:1" + } + ], + "id": 326, + "name": "BinaryOperation", + "src": "433:20:1" + }, + { + "attributes": { + "argumentTypes": null, + "hexvalue": "4665654d616e616765723a206e657720666565546f20697320746865207a65726f2061646472657373", + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "subdenomination": null, + "token": "string", + "type": "literal_string \"FeeManager: new feeTo is the zero address\"", + "value": "FeeManager: new feeTo is the zero address" + }, + "id": 327, + "name": "Literal", + "src": "455:43:1" + } + ], + "id": 328, + "name": "FunctionCall", + "src": "425:74:1" + } + ], + "id": 329, + "name": "ExpressionStatement", + "src": "425:74:1" }, { "children": [ @@ -1814,13 +2395,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 392, + "referencedDeclaration": 294, "type": "address", "value": "feeTo" }, - "id": 423, + "id": 330, "name": "Identifier", - "src": "438:5:2" + "src": "507:5:1" }, { "attributes": { @@ -1828,33 +2409,33 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 412, + "referencedDeclaration": 310, "type": "address", "value": "_feeTo" }, - "id": 424, + "id": 331, "name": "Identifier", - "src": "446:6:2" + "src": "515:6:1" } ], - "id": 425, + "id": 332, "name": "Assignment", - "src": "438:14:2" + "src": "507:14:1" } ], - "id": 426, + "id": 333, "name": "ExpressionStatement", - "src": "438:14:2" + "src": "507:14:1" } ], - "id": 427, + "id": 334, "name": "Block", - "src": "369:88:2" + "src": "350:176:1" } ], - "id": 428, + "id": 335, "name": "FunctionDefinition", - "src": "326:131:2" + "src": "307:219:1" }, { "attributes": { @@ -1866,7 +2447,7 @@ null ], "name": "setFeeToSetter", - "scope": 472, + "scope": 404, "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -1878,7 +2459,7 @@ "attributes": { "constant": false, "name": "_feeToSetter", - "scope": 446, + "scope": 362, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -1892,19 +2473,19 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 429, + "id": 336, "name": "ElementaryTypeName", - "src": "485:7:2" + "src": "554:7:1" } ], - "id": 430, + "id": 337, "name": "VariableDeclaration", - "src": "485:20:2" + "src": "554:20:1" } ], - "id": 431, + "id": 338, "name": "ParameterList", - "src": "484:22:2" + "src": "553:22:1" }, { "attributes": { @@ -1913,9 +2494,9 @@ ] }, "children": [], - "id": 432, + "id": 339, "name": "ParameterList", - "src": "516:0:2" + "src": "585:0:1" }, { "children": [ @@ -1944,21 +2525,21 @@ "typeString": "bool" }, { - "typeIdentifier": "t_stringliteral_b0ea5653e0e519b050ef336c67727a3a431509a369a785f89e8479e85ce40165", - "typeString": "literal_string \"Poof: FORBIDDEN\"" + "typeIdentifier": "t_stringliteral_cfc6973bacdb6f988aa3a36d929474df982e4a2d4592d76afeb6358c3f21f87c", + "typeString": "literal_string \"FeeManager: FORBIDDEN\"" } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 433, + "id": 340, "name": "Identifier", - "src": "524:7:2" + "src": "593:7:1" }, { "attributes": { @@ -1993,18 +2574,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1408, + "referencedDeclaration": 1365, "type": "msg", "value": "msg" }, - "id": 434, + "id": 341, "name": "Identifier", - "src": "532:3:2" + "src": "601:3:1" } ], - "id": 435, + "id": 342, "name": "MemberAccess", - "src": "532:10:2" + "src": "601:10:1" }, { "attributes": { @@ -2012,45 +2593,203 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 394, + "referencedDeclaration": 296, "type": "address", "value": "feeToSetter" }, - "id": 436, + "id": 343, "name": "Identifier", - "src": "546:11:2" + "src": "615:11:1" } ], - "id": 437, + "id": 344, "name": "BinaryOperation", - "src": "532:25:2" + "src": "601:25:1" }, { "attributes": { "argumentTypes": null, - "hexvalue": "506f6f663a20464f5242494444454e", + "hexvalue": "4665654d616e616765723a20464f5242494444454e", "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "subdenomination": null, "token": "string", - "type": "literal_string \"Poof: FORBIDDEN\"", - "value": "Poof: FORBIDDEN" + "type": "literal_string \"FeeManager: FORBIDDEN\"", + "value": "FeeManager: FORBIDDEN" }, - "id": 438, + "id": 345, "name": "Literal", - "src": "559:17:2" + "src": "628:23:1" } ], - "id": 439, + "id": 346, "name": "FunctionCall", - "src": "524:53:2" + "src": "593:59:1" } ], - "id": 440, + "id": 347, "name": "ExpressionStatement", - "src": "524:53:2" + "src": "593:59:1" + }, + { + "children": [ + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "isStructConstructorCall": false, + "lValueRequested": false, + "names": [ + null + ], + "type": "tuple()", + "type_conversion": false + }, + "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_c2945b58c8dd4cfa36c02a297723f3a11c415c25f27fbfb9a5c6fa5f04ebea59", + "typeString": "literal_string \"FeeManager: new feeToSetter is the zero address\"" + } + ], + "overloadedDeclarations": [ + 1368, + 1369 + ], + "referencedDeclaration": 1369, + "type": "function (bool,string memory) pure", + "value": "require" + }, + "id": 348, + "name": "Identifier", + "src": "660:7:1" + }, + { + "attributes": { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "operator": "!=", + "type": "bool" + }, + "children": [ + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 337, + "type": "address", + "value": "_feeToSetter" + }, + "id": 349, + "name": "Identifier", + "src": "668:12:1" + }, + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": true, + "isStructConstructorCall": false, + "lValueRequested": false, + "names": [ + null + ], + "type": "address payable", + "type_conversion": true + }, + "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_rational_0_by_1", + "typeString": "int_const 0" + } + ], + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "type": "type(address)", + "value": "address" + }, + "id": 350, + "name": "ElementaryTypeNameExpression", + "src": "684:7:1" + }, + { + "attributes": { + "argumentTypes": null, + "hexvalue": "30", + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "subdenomination": null, + "token": "number", + "type": "int_const 0", + "value": "0" + }, + "id": 351, + "name": "Literal", + "src": "692:1:1" + } + ], + "id": 352, + "name": "FunctionCall", + "src": "684:10:1" + } + ], + "id": 353, + "name": "BinaryOperation", + "src": "668:26:1" + }, + { + "attributes": { + "argumentTypes": null, + "hexvalue": "4665654d616e616765723a206e657720666565546f53657474657220697320746865207a65726f2061646472657373", + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "subdenomination": null, + "token": "string", + "type": "literal_string \"FeeManager: new feeToSetter is the zero address\"", + "value": "FeeManager: new feeToSetter is the zero address" + }, + "id": 354, + "name": "Literal", + "src": "696:49:1" + } + ], + "id": 355, + "name": "FunctionCall", + "src": "660:86:1" + } + ], + "id": 356, + "name": "ExpressionStatement", + "src": "660:86:1" }, { "children": [ @@ -2071,13 +2810,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 394, + "referencedDeclaration": 296, "type": "address", "value": "feeToSetter" }, - "id": 441, + "id": 357, "name": "Identifier", - "src": "585:11:2" + "src": "754:11:1" }, { "attributes": { @@ -2085,33 +2824,33 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 430, + "referencedDeclaration": 337, "type": "address", "value": "_feeToSetter" }, - "id": 442, + "id": 358, "name": "Identifier", - "src": "599:12:2" + "src": "768:12:1" } ], - "id": 443, + "id": 359, "name": "Assignment", - "src": "585:26:2" + "src": "754:26:1" } ], - "id": 444, + "id": 360, "name": "ExpressionStatement", - "src": "585:26:2" + "src": "754:26:1" } ], - "id": 445, + "id": 361, "name": "Block", - "src": "516:100:2" + "src": "585:200:1" } ], - "id": 446, + "id": 362, "name": "FunctionDefinition", - "src": "461:155:2" + "src": "530:255:1" }, { "attributes": { @@ -2123,7 +2862,7 @@ null ], "name": "setProtocolFeeDivisor", - "scope": 472, + "scope": 404, "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -2135,7 +2874,7 @@ "attributes": { "constant": false, "name": "_protocolFeeDivisor", - "scope": 471, + "scope": 387, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -2148,19 +2887,19 @@ "name": "uint256", "type": "uint256" }, - "id": 447, + "id": 363, "name": "ElementaryTypeName", - "src": "651:7:2" + "src": "820:7:1" } ], - "id": 448, + "id": 364, "name": "VariableDeclaration", - "src": "651:27:2" + "src": "820:27:1" } ], - "id": 449, + "id": 365, "name": "ParameterList", - "src": "650:29:2" + "src": "819:29:1" }, { "attributes": { @@ -2169,9 +2908,9 @@ ] }, "children": [], - "id": 450, + "id": 366, "name": "ParameterList", - "src": "689:0:2" + "src": "858:0:1" }, { "children": [ @@ -2200,21 +2939,21 @@ "typeString": "bool" }, { - "typeIdentifier": "t_stringliteral_b0ea5653e0e519b050ef336c67727a3a431509a369a785f89e8479e85ce40165", - "typeString": "literal_string \"Poof: FORBIDDEN\"" + "typeIdentifier": "t_stringliteral_cfc6973bacdb6f988aa3a36d929474df982e4a2d4592d76afeb6358c3f21f87c", + "typeString": "literal_string \"FeeManager: FORBIDDEN\"" } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 451, + "id": 367, "name": "Identifier", - "src": "697:7:2" + "src": "866:7:1" }, { "attributes": { @@ -2249,18 +2988,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1408, + "referencedDeclaration": 1365, "type": "msg", "value": "msg" }, - "id": 452, + "id": 368, "name": "Identifier", - "src": "705:3:2" + "src": "874:3:1" } ], - "id": 453, + "id": 369, "name": "MemberAccess", - "src": "705:10:2" + "src": "874:10:1" }, { "attributes": { @@ -2268,45 +3007,45 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 394, + "referencedDeclaration": 296, "type": "address", "value": "feeToSetter" }, - "id": 454, + "id": 370, "name": "Identifier", - "src": "719:11:2" + "src": "888:11:1" } ], - "id": 455, + "id": 371, "name": "BinaryOperation", - "src": "705:25:2" + "src": "874:25:1" }, { "attributes": { "argumentTypes": null, - "hexvalue": "506f6f663a20464f5242494444454e", + "hexvalue": "4665654d616e616765723a20464f5242494444454e", "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "subdenomination": null, "token": "string", - "type": "literal_string \"Poof: FORBIDDEN\"", - "value": "Poof: FORBIDDEN" + "type": "literal_string \"FeeManager: FORBIDDEN\"", + "value": "FeeManager: FORBIDDEN" }, - "id": 456, + "id": 372, "name": "Literal", - "src": "732:17:2" + "src": "901:23:1" } ], - "id": 457, + "id": 373, "name": "FunctionCall", - "src": "697:53:2" + "src": "866:59:1" } ], - "id": 458, + "id": 374, "name": "ExpressionStatement", - "src": "697:53:2" + "src": "866:59:1" }, { "children": [ @@ -2333,21 +3072,21 @@ "typeString": "bool" }, { - "typeIdentifier": "t_stringliteral_5c096880b05c9468650c913ec6feafc9810ea461905d92390e74b130ffc27862", - "typeString": "literal_string \"Poof: Protocol fee too high\"" + "typeIdentifier": "t_stringliteral_68e7dacba247d13ad02c13ad936c3dbda8b08af42f3b9464358e33d2d81058ce", + "typeString": "literal_string \"FeeManager: Protocol fee too high\"" } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 459, + "id": 375, "name": "Identifier", - "src": "758:7:2" + "src": "933:7:1" }, { "attributes": { @@ -2370,13 +3109,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 448, + "referencedDeclaration": 364, "type": "uint256", "value": "_protocolFeeDivisor" }, - "id": 460, + "id": 376, "name": "Identifier", - "src": "766:19:2" + "src": "941:19:1" }, { "attributes": { @@ -2384,45 +3123,45 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 390, + "referencedDeclaration": 292, "type": "uint256", "value": "MIN_PROTOCOL_FEE_DIVISOR" }, - "id": 461, + "id": 377, "name": "Identifier", - "src": "789:24:2" + "src": "964:24:1" } ], - "id": 462, + "id": 378, "name": "BinaryOperation", - "src": "766:47:2" + "src": "941:47:1" }, { "attributes": { "argumentTypes": null, - "hexvalue": "506f6f663a2050726f746f636f6c2066656520746f6f2068696768", + "hexvalue": "4665654d616e616765723a2050726f746f636f6c2066656520746f6f2068696768", "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "subdenomination": null, "token": "string", - "type": "literal_string \"Poof: Protocol fee too high\"", - "value": "Poof: Protocol fee too high" + "type": "literal_string \"FeeManager: Protocol fee too high\"", + "value": "FeeManager: Protocol fee too high" }, - "id": 463, + "id": 379, "name": "Literal", - "src": "815:29:2" + "src": "990:35:1" } ], - "id": 464, + "id": 380, "name": "FunctionCall", - "src": "758:87:2" + "src": "933:93:1" } ], - "id": 465, + "id": 381, "name": "ExpressionStatement", - "src": "758:87:2" + "src": "933:93:1" }, { "children": [ @@ -2443,13 +3182,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 396, + "referencedDeclaration": 298, "type": "uint256", "value": "protocolFeeDivisor" }, - "id": 466, + "id": 382, "name": "Identifier", - "src": "853:18:2" + "src": "1034:18:1" }, { "attributes": { @@ -2457,43 +3196,280 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 448, + "referencedDeclaration": 364, "type": "uint256", "value": "_protocolFeeDivisor" }, - "id": 467, + "id": 383, "name": "Identifier", - "src": "874:19:2" + "src": "1055:19:1" } ], - "id": 468, + "id": 384, "name": "Assignment", - "src": "853:40:2" + "src": "1034:40:1" } ], - "id": 469, + "id": 385, "name": "ExpressionStatement", - "src": "853:40:2" + "src": "1034:40:1" } ], - "id": 470, + "id": 386, "name": "Block", - "src": "689:209:2" + "src": "858:221:1" } ], - "id": 471, + "id": 387, "name": "FunctionDefinition", - "src": "620:278:2" + "src": "789:290:1" + }, + { + "attributes": { + "documentation": null, + "implemented": true, + "isConstructor": false, + "kind": "function", + "modifiers": [ + null + ], + "name": "clearFee", + "scope": 404, + "stateMutability": "nonpayable", + "superFunction": null, + "visibility": "external" + }, + "children": [ + { + "attributes": { + "parameters": [ + null + ] + }, + "children": [], + "id": 388, + "name": "ParameterList", + "src": "1100:2:1" + }, + { + "attributes": { + "parameters": [ + null + ] + }, + "children": [], + "id": 389, + "name": "ParameterList", + "src": "1112:0:1" + }, + { + "children": [ + { + "children": [ + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "isStructConstructorCall": false, + "lValueRequested": false, + "names": [ + null + ], + "type": "tuple()", + "type_conversion": false + }, + "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_bool", + "typeString": "bool" + }, + { + "typeIdentifier": "t_stringliteral_cfc6973bacdb6f988aa3a36d929474df982e4a2d4592d76afeb6358c3f21f87c", + "typeString": "literal_string \"FeeManager: FORBIDDEN\"" + } + ], + "overloadedDeclarations": [ + 1368, + 1369 + ], + "referencedDeclaration": 1369, + "type": "function (bool,string memory) pure", + "value": "require" + }, + "id": 390, + "name": "Identifier", + "src": "1120:7:1" + }, + { + "attributes": { + "argumentTypes": null, + "commonType": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "operator": "==", + "type": "bool" + }, + "children": [ + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "member_name": "sender", + "referencedDeclaration": null, + "type": "address payable" + }, + "children": [ + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1365, + "type": "msg", + "value": "msg" + }, + "id": 391, + "name": "Identifier", + "src": "1128:3:1" + } + ], + "id": 392, + "name": "MemberAccess", + "src": "1128:10:1" + }, + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 296, + "type": "address", + "value": "feeToSetter" + }, + "id": 393, + "name": "Identifier", + "src": "1142:11:1" + } + ], + "id": 394, + "name": "BinaryOperation", + "src": "1128:25:1" + }, + { + "attributes": { + "argumentTypes": null, + "hexvalue": "4665654d616e616765723a20464f5242494444454e", + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "subdenomination": null, + "token": "string", + "type": "literal_string \"FeeManager: FORBIDDEN\"", + "value": "FeeManager: FORBIDDEN" + }, + "id": 395, + "name": "Literal", + "src": "1155:23:1" + } + ], + "id": 396, + "name": "FunctionCall", + "src": "1120:59:1" + } + ], + "id": 397, + "name": "ExpressionStatement", + "src": "1120:59:1" + }, + { + "children": [ + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "operator": "=", + "type": "uint256" + }, + "children": [ + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 298, + "type": "uint256", + "value": "protocolFeeDivisor" + }, + "id": 398, + "name": "Identifier", + "src": "1187:18:1" + }, + { + "attributes": { + "argumentTypes": null, + "hexvalue": "30", + "isConstant": false, + "isLValue": false, + "isPure": true, + "lValueRequested": false, + "subdenomination": null, + "token": "number", + "type": "int_const 0", + "value": "0" + }, + "id": 399, + "name": "Literal", + "src": "1208:1:1" + } + ], + "id": 400, + "name": "Assignment", + "src": "1187:22:1" + } + ], + "id": 401, + "name": "ExpressionStatement", + "src": "1187:22:1" + } + ], + "id": 402, + "name": "Block", + "src": "1112:102:1" + } + ], + "id": 403, + "name": "FunctionDefinition", + "src": "1083:131:1" } ], - "id": 472, + "id": 404, "name": "ContractDefinition", - "src": "25:875:2" + "src": "25:1191:1" } ], - "id": 473, + "id": 405, "name": "SourceUnit", - "src": "0:901:2" + "src": "0:1217:1" }, "compiler": { "name": "solc", @@ -2514,7 +3490,7 @@ } }, "schemaVersion": "3.3.4", - "updatedAt": "2021-04-12T00:15:10.054Z", + "updatedAt": "2021-04-18T15:21:30.804Z", "devdoc": { "methods": {} }, diff --git a/client/contracts/Hasher.json b/client/contracts/Hasher.json index 8d87570..c5f9d88 100644 --- a/client/contracts/Hasher.json +++ b/client/contracts/Hasher.json @@ -51,5 +51,5 @@ } }, "schemaVersion": "3.3.4", - "updatedAt": "2021-04-12T00:15:10.073Z" + "updatedAt": "2021-04-18T15:21:30.822Z" } \ No newline at end of file diff --git a/client/contracts/IFeeManager.json b/client/contracts/IFeeManager.json index 7457098..d0aa9b3 100644 --- a/client/contracts/IFeeManager.json +++ b/client/contracts/IFeeManager.json @@ -32,58 +32,58 @@ "type": "function" } ], - "metadata": "{\"compiler\":{\"version\":\"0.5.17+commit.d19bba13\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":true,\"inputs\":[],\"name\":\"feeTo\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"protocolFeeDivisor\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":\"IFeeManager\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol\":{\"keccak256\":\"0x671cc9268dd70c47d18795f7e37fc4df11763fcbcca026edcf163f4239036254\",\"urls\":[\"bzz-raw://9c36a207ed164b60a514eae89bfb15e5b4de4b346c4a89a7a1cb50a940bc699d\",\"dweb:/ipfs/QmbPEqFJAGMpYduLEFsbPazyBsYWcjRtpth8X26wCHALwk\"]},\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":{\"keccak256\":\"0x7269c9361452a555e6f29e924e70d4478a8a5bd86c7b33ea3731470a52c235b5\",\"urls\":[\"bzz-raw://eddd542888565cb84d4dac710511b0f02afbed2e0e1a7d25e0425e6d69b7712f\",\"dweb:/ipfs/Qma1KWoX8nZYK1d1PAfRiZH4prYqM347dMkWM6DjJzTqYY\"]},\"@openzeppelin/contracts/utils/ReentrancyGuard.sol\":{\"keccak256\":\"0xb63221b23818d622bfd83d18e0968307e4fcb7a35536bdceded76e1cf8349acd\",\"urls\":[\"bzz-raw://44e1e8c22362c4708a8c3362735f1465f5b05e2f7315e16c7010d694ce019d73\",\"dweb:/ipfs/QmWj9g8X1hxkXRre2kwkEjLBetjuzmSbWHD81bsSojnBkS\"]}},\"version\":1}", + "metadata": "{\"compiler\":{\"version\":\"0.5.17+commit.d19bba13\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":true,\"inputs\":[],\"name\":\"feeTo\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"protocolFeeDivisor\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":\"IFeeManager\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol\":{\"keccak256\":\"0x671cc9268dd70c47d18795f7e37fc4df11763fcbcca026edcf163f4239036254\",\"urls\":[\"bzz-raw://9c36a207ed164b60a514eae89bfb15e5b4de4b346c4a89a7a1cb50a940bc699d\",\"dweb:/ipfs/QmbPEqFJAGMpYduLEFsbPazyBsYWcjRtpth8X26wCHALwk\"]},\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":{\"keccak256\":\"0xf81220c0ba8ed77606f414c085676c1a46d09bc286ddf6aeffa22d4e1504fc0c\",\"urls\":[\"bzz-raw://962b946c3ed0b58fa24c9b6668443a58c49527b8d01593734fece90669e07955\",\"dweb:/ipfs/QmfFRroF2gQGXHPJ9t4HJz2SMkSzLcrKugmXiJ1H6V45iP\"]},\"@openzeppelin/contracts/utils/ReentrancyGuard.sol\":{\"keccak256\":\"0xb63221b23818d622bfd83d18e0968307e4fcb7a35536bdceded76e1cf8349acd\",\"urls\":[\"bzz-raw://44e1e8c22362c4708a8c3362735f1465f5b05e2f7315e16c7010d694ce019d73\",\"dweb:/ipfs/QmWj9g8X1hxkXRre2kwkEjLBetjuzmSbWHD81bsSojnBkS\"]}},\"version\":1}", "bytecode": "0x", "deployedBytecode": "0x", "sourceMap": "", "deployedSourceMap": "", - "source": "pragma solidity 0.5.17;\n\nimport \"./MerkleTreeWithHistory.sol\";\nimport \"@openzeppelin/contracts/utils/ReentrancyGuard.sol\";\n\ncontract IVerifier {\n function verifyProof(bytes memory _proof, uint256[6] memory _input) public returns(bool);\n}\n\ncontract IFeeManager {\n function feeTo() external view returns (address);\n function protocolFeeDivisor() external view returns (uint256);\n}\n\ncontract Tornado is MerkleTreeWithHistory, ReentrancyGuard {\n uint256 public denomination;\n mapping(bytes32 => bool) public nullifierHashes;\n // we store all commitments just to prevent accidental deposits with the same commitment\n mapping(bytes32 => bool) public commitments;\n IVerifier public verifier;\n IFeeManager public feeManager;\n\n // operator can update snark verification key\n // after the final trusted setup ceremony operator rights are supposed to be transferred to zero address\n address public operator;\n modifier onlyOperator {\n require(msg.sender == operator, \"Only operator can call this function.\");\n _;\n }\n\n event Deposit(bytes32 indexed commitment, uint32 leafIndex, uint256 timestamp);\n event Withdrawal(address to, bytes32 nullifierHash, address indexed relayer, uint256 fee);\n\n /**\n @dev The constructor\n @param _verifier the address of SNARK verifier for this contract\n @param _denomination transfer amount for each deposit\n @param _merkleTreeHeight the height of deposits' Merkle Tree\n @param _operator operator address (see operator comment above)\n */\n constructor(\n IVerifier _verifier,\n IFeeManager _feeManager,\n uint256 _denomination,\n uint32 _merkleTreeHeight,\n address _operator\n ) MerkleTreeWithHistory(_merkleTreeHeight) public {\n require(_denomination > 0, \"denomination should be greater than 0\");\n verifier = _verifier;\n feeManager = _feeManager;\n operator = _operator;\n denomination = _denomination;\n }\n\n /**\n @dev Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\n @param _commitment the note commitment, which is PedersenHash(nullifier + secret)\n */\n function deposit(bytes32 _commitment) external payable nonReentrant {\n require(!commitments[_commitment], \"The commitment has been submitted\");\n\n uint32 insertedIndex = _insert(_commitment);\n commitments[_commitment] = true;\n _processDeposit();\n\n emit Deposit(_commitment, insertedIndex, block.timestamp);\n }\n\n /** @dev this function is defined in a child contract */\n function _processDeposit() internal;\n\n /**\n @dev Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs\n `input` array consists of:\n - merkle root of all deposits in the contract\n - hash of unique deposit nullifier to prevent double spends\n - the recipient of funds\n - optional fee that goes to the transaction sender (usually a relay)\n */\n function withdraw(bytes calldata _proof, bytes32 _root, bytes32 _nullifierHash, address payable _recipient, address payable _relayer, uint256 _fee, uint256 _refund) external payable nonReentrant {\n require(_fee <= denomination, \"Fee exceeds transfer value\");\n require(!nullifierHashes[_nullifierHash], \"The note has been already spent\");\n require(isKnownRoot(_root), \"Cannot find your merkle root\"); // Make sure to use a recent one\n require(verifier.verifyProof(_proof, [uint256(_root), uint256(_nullifierHash), uint256(_recipient), uint256(_relayer), _fee, _refund]), \"Invalid withdraw proof\");\n\n nullifierHashes[_nullifierHash] = true;\n _processWithdraw(_recipient, _relayer, _fee, _refund);\n emit Withdrawal(_recipient, _nullifierHash, _relayer, _fee);\n }\n\n /** @dev this function is defined in a child contract */\n function _processWithdraw(address payable _recipient, address payable _relayer, uint256 _relayer_fee, uint256 _refund) internal;\n\n /** @dev whether a note is already spent */\n function isSpent(bytes32 _nullifierHash) public view returns(bool) {\n return nullifierHashes[_nullifierHash];\n }\n\n /** @dev whether an array of notes is already spent */\n function isSpentArray(bytes32[] calldata _nullifierHashes) external view returns(bool[] memory spent) {\n spent = new bool[](_nullifierHashes.length);\n for(uint i = 0; i < _nullifierHashes.length; i++) {\n if (isSpent(_nullifierHashes[i])) {\n spent[i] = true;\n }\n }\n }\n\n /**\n @dev allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held.\n After that operator rights are supposed to be transferred to zero address\n */\n function updateVerifier(address _newVerifier) external onlyOperator {\n verifier = IVerifier(_newVerifier);\n }\n\n /** @dev operator can change his address */\n function changeOperator(address _newOperator) external onlyOperator {\n operator = _newOperator;\n }\n}\n", + "source": "pragma solidity 0.5.17;\n\nimport \"./MerkleTreeWithHistory.sol\";\nimport \"@openzeppelin/contracts/utils/ReentrancyGuard.sol\";\n\ncontract IVerifier {\n function verifyProof(bytes memory _proof, uint256[6] memory _input) public returns(bool);\n}\n\ncontract IFeeManager {\n function feeTo() external view returns (address);\n function protocolFeeDivisor() external view returns (uint256);\n}\n\ncontract Tornado is MerkleTreeWithHistory, ReentrancyGuard {\n uint256 public denomination;\n mapping(bytes32 => bool) public nullifierHashes;\n // we store all commitments just to prevent accidental deposits with the same commitment\n mapping(bytes32 => bool) public commitments;\n IVerifier public verifier;\n IFeeManager public feeManager;\n\n // operator can update snark verification key\n // after the final trusted setup ceremony operator rights are supposed to be transferred to zero address\n address public operator;\n modifier onlyOperator {\n require(msg.sender == operator, \"Only operator can call this function.\");\n _;\n }\n\n event Deposit(bytes32 indexed commitment, uint32 leafIndex, uint256 timestamp);\n event Withdrawal(address to, bytes32 nullifierHash, address indexed relayer, uint256 fee);\n event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);\n event EncryptedNote(address indexed sender, bytes encryptedNote);\n\n /**\n @dev The constructor\n @param _verifier the address of SNARK verifier for this contract\n @param _denomination transfer amount for each deposit\n @param _merkleTreeHeight the height of deposits' Merkle Tree\n @param _operator operator address (see operator comment above)\n */\n constructor(\n IVerifier _verifier,\n IFeeManager _feeManager,\n uint256 _denomination,\n uint32 _merkleTreeHeight,\n address _operator\n ) MerkleTreeWithHistory(_merkleTreeHeight) public {\n require(_denomination > 0, \"denomination should be greater than 0\");\n verifier = _verifier;\n feeManager = _feeManager;\n operator = _operator;\n denomination = _denomination;\n }\n\n /**\n @dev Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\n @param _commitment the note commitment, which is PedersenHash(nullifier + secret)\n */\n function deposit(bytes32 _commitment, bytes calldata _encryptedNote) external payable nonReentrant {\n require(!commitments[_commitment], \"The commitment has been submitted\");\n\n uint32 insertedIndex = _insert(_commitment);\n commitments[_commitment] = true;\n _processDeposit();\n\n emit Deposit(_commitment, insertedIndex, block.timestamp);\n emit EncryptedNote(msg.sender, _encryptedNote);\n }\n\n /** @dev this function is defined in a child contract */\n function _processDeposit() internal;\n\n /**\n @dev Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs\n `input` array consists of:\n - merkle root of all deposits in the contract\n - hash of unique deposit nullifier to prevent double spends\n - the recipient of funds\n - optional fee that goes to the transaction sender (usually a relay)\n */\n function withdraw(bytes calldata _proof, bytes32 _root, bytes32 _nullifierHash, address payable _recipient, address payable _relayer, uint256 _fee, uint256 _refund) external payable nonReentrant {\n require(_fee <= denomination, \"Fee exceeds transfer value\");\n require(!nullifierHashes[_nullifierHash], \"The note has been already spent\");\n require(isKnownRoot(_root), \"Cannot find your merkle root\"); // Make sure to use a recent one\n require(verifier.verifyProof(_proof, [uint256(_root), uint256(_nullifierHash), uint256(_recipient), uint256(_relayer), _fee, _refund]), \"Invalid withdraw proof\");\n\n nullifierHashes[_nullifierHash] = true;\n _processWithdraw(_recipient, _relayer, _fee, _refund);\n emit Withdrawal(_recipient, _nullifierHash, _relayer, _fee);\n }\n\n /** @dev this function is defined in a child contract */\n function _processWithdraw(address payable _recipient, address payable _relayer, uint256 _relayer_fee, uint256 _refund) internal;\n\n /** @dev whether a note is already spent */\n function isSpent(bytes32 _nullifierHash) public view returns(bool) {\n return nullifierHashes[_nullifierHash];\n }\n\n /** @dev whether an array of notes is already spent */\n function isSpentArray(bytes32[] calldata _nullifierHashes) external view returns(bool[] memory spent) {\n spent = new bool[](_nullifierHashes.length);\n for(uint i = 0; i < _nullifierHashes.length; i++) {\n if (isSpent(_nullifierHashes[i])) {\n spent[i] = true;\n }\n }\n }\n\n /**\n @dev allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held.\n After that operator rights are supposed to be transferred to zero address\n */\n function updateVerifier(address _newVerifier) external onlyOperator {\n verifier = IVerifier(_newVerifier);\n }\n\n /** @dev operator can change his address */\n function changeOperator(address _newOperator) external onlyOperator {\n emit OwnershipTransferred(operator, _newOperator);\n operator = _newOperator;\n }\n}\n", "sourcePath": "/home/home/dotfiles/tornado-core/contracts/Tornado.sol", "ast": { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/Tornado.sol", "exportedSymbols": { "IFeeManager": [ - 1052 + 984 ], "IVerifier": [ - 1041 + 973 ], "Tornado": [ - 1363 + 1320 ] }, - "id": 1364, + "id": 1321, "nodeType": "SourceUnit", "nodes": [ { - "id": 1027, + "id": 959, "literals": [ "solidity", "0.5", ".17" ], "nodeType": "PragmaDirective", - "src": "0:23:5" + "src": "0:23:4" }, { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol", "file": "./MerkleTreeWithHistory.sol", - "id": 1028, + "id": 960, "nodeType": "ImportDirective", - "scope": 1364, - "sourceUnit": 839, - "src": "25:37:5", + "scope": 1321, + "sourceUnit": 771, + "src": "25:37:4", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", "file": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", - "id": 1029, + "id": 961, "nodeType": "ImportDirective", - "scope": 1364, - "sourceUnit": 1394, - "src": "63:59:5", + "scope": 1321, + "sourceUnit": 1351, + "src": "63:59:4", "symbolAliases": [], "unitAlias": "" }, @@ -93,9 +93,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1041, + "id": 973, "linearizedBaseContracts": [ - 1041 + 973 ], "name": "IVerifier", "nodeType": "ContractDefinition", @@ -103,23 +103,23 @@ { "body": null, "documentation": null, - "id": 1040, + "id": 972, "implemented": false, "kind": "function", "modifiers": [], "name": "verifyProof", "nodeType": "FunctionDefinition", "parameters": { - "id": 1036, + "id": 968, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1031, + "id": 963, "name": "_proof", "nodeType": "VariableDeclaration", - "scope": 1040, - "src": "168:19:5", + "scope": 972, + "src": "168:19:4", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -127,10 +127,10 @@ "typeString": "bytes" }, "typeName": { - "id": 1030, + "id": 962, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "168:5:5", + "src": "168:5:4", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -141,11 +141,11 @@ }, { "constant": false, - "id": 1035, + "id": 967, "name": "_input", "nodeType": "VariableDeclaration", - "scope": 1040, - "src": "189:24:5", + "scope": 972, + "src": "189:24:4", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -154,27 +154,27 @@ }, "typeName": { "baseType": { - "id": 1032, + "id": 964, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "189:7:5", + "src": "189:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1034, + "id": 966, "length": { "argumentTypes": null, "hexValue": "36", - "id": 1033, + "id": 965, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "197:1:5", + "src": "197:1:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_6_by_1", @@ -183,7 +183,7 @@ "value": "6" }, "nodeType": "ArrayTypeName", - "src": "189:10:5", + "src": "189:10:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$6_storage_ptr", "typeString": "uint256[6]" @@ -193,19 +193,19 @@ "visibility": "internal" } ], - "src": "167:47:5" + "src": "167:47:4" }, "returnParameters": { - "id": 1039, + "id": 971, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1038, + "id": 970, "name": "", "nodeType": "VariableDeclaration", - "scope": 1040, - "src": "230:4:5", + "scope": 972, + "src": "230:4:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -213,10 +213,10 @@ "typeString": "bool" }, "typeName": { - "id": 1037, + "id": 969, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "230:4:5", + "src": "230:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -226,17 +226,17 @@ "visibility": "internal" } ], - "src": "229:6:5" + "src": "229:6:4" }, - "scope": 1041, - "src": "147:89:5", + "scope": 973, + "src": "147:89:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 1364, - "src": "124:114:5" + "scope": 1321, + "src": "124:114:4" }, { "baseContracts": [], @@ -244,9 +244,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1052, + "id": 984, "linearizedBaseContracts": [ - 1052 + 984 ], "name": "IFeeManager", "nodeType": "ContractDefinition", @@ -254,29 +254,29 @@ { "body": null, "documentation": null, - "id": 1046, + "id": 978, "implemented": false, "kind": "function", "modifiers": [], "name": "feeTo", "nodeType": "FunctionDefinition", "parameters": { - "id": 1042, + "id": 974, "nodeType": "ParameterList", "parameters": [], - "src": "279:2:5" + "src": "279:2:4" }, "returnParameters": { - "id": 1045, + "id": 977, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1044, + "id": 976, "name": "", "nodeType": "VariableDeclaration", - "scope": 1046, - "src": "305:7:5", + "scope": 978, + "src": "305:7:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -284,10 +284,10 @@ "typeString": "address" }, "typeName": { - "id": 1043, + "id": 975, "name": "address", "nodeType": "ElementaryTypeName", - "src": "305:7:5", + "src": "305:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -298,10 +298,10 @@ "visibility": "internal" } ], - "src": "304:9:5" + "src": "304:9:4" }, - "scope": 1052, - "src": "265:49:5", + "scope": 984, + "src": "265:49:4", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -309,29 +309,29 @@ { "body": null, "documentation": null, - "id": 1051, + "id": 983, "implemented": false, "kind": "function", "modifiers": [], "name": "protocolFeeDivisor", "nodeType": "FunctionDefinition", "parameters": { - "id": 1047, + "id": 979, "nodeType": "ParameterList", "parameters": [], - "src": "344:2:5" + "src": "344:2:4" }, "returnParameters": { - "id": 1050, + "id": 982, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1049, + "id": 981, "name": "", "nodeType": "VariableDeclaration", - "scope": 1051, - "src": "370:7:5", + "scope": 983, + "src": "370:7:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -339,10 +339,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1048, + "id": 980, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "370:7:5", + "src": "370:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -352,17 +352,17 @@ "visibility": "internal" } ], - "src": "369:9:5" + "src": "369:9:4" }, - "scope": 1052, - "src": "317:62:5", + "scope": 984, + "src": "317:62:4", "stateMutability": "view", "superFunction": null, "visibility": "external" } ], - "scope": 1364, - "src": "240:141:5" + "scope": 1321, + "src": "240:141:4" }, { "baseContracts": [ @@ -370,62 +370,62 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 1053, + "id": 985, "name": "MerkleTreeWithHistory", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 838, - "src": "403:21:5", + "referencedDeclaration": 770, + "src": "403:21:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_MerkleTreeWithHistory_$838", + "typeIdentifier": "t_contract$_MerkleTreeWithHistory_$770", "typeString": "contract MerkleTreeWithHistory" } }, - "id": 1054, + "id": 986, "nodeType": "InheritanceSpecifier", - "src": "403:21:5" + "src": "403:21:4" }, { "arguments": null, "baseName": { "contractScope": null, - "id": 1055, + "id": 987, "name": "ReentrancyGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1393, - "src": "426:15:5", + "referencedDeclaration": 1350, + "src": "426:15:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_ReentrancyGuard_$1393", + "typeIdentifier": "t_contract$_ReentrancyGuard_$1350", "typeString": "contract ReentrancyGuard" } }, - "id": 1056, + "id": 988, "nodeType": "InheritanceSpecifier", - "src": "426:15:5" + "src": "426:15:4" } ], "contractDependencies": [ - 838, - 1393 + 770, + 1350 ], "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1363, + "id": 1320, "linearizedBaseContracts": [ - 1363, - 1393, - 838 + 1320, + 1350, + 770 ], "name": "Tornado", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 1058, + "id": 990, "name": "denomination", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "446:27:5", + "scope": 1320, + "src": "446:27:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -433,10 +433,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1057, + "id": 989, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "446:7:5", + "src": "446:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -447,11 +447,11 @@ }, { "constant": false, - "id": 1062, + "id": 994, "name": "nullifierHashes", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "477:47:5", + "scope": 1320, + "src": "477:47:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -459,28 +459,28 @@ "typeString": "mapping(bytes32 => bool)" }, "typeName": { - "id": 1061, + "id": 993, "keyType": { - "id": 1059, + "id": 991, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "485:7:5", + "src": "485:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "477:24:5", + "src": "477:24:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" }, "valueType": { - "id": 1060, + "id": 992, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "496:4:5", + "src": "496:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -492,11 +492,11 @@ }, { "constant": false, - "id": 1066, + "id": 998, "name": "commitments", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "619:43:5", + "scope": 1320, + "src": "619:43:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -504,28 +504,28 @@ "typeString": "mapping(bytes32 => bool)" }, "typeName": { - "id": 1065, + "id": 997, "keyType": { - "id": 1063, + "id": 995, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "627:7:5", + "src": "627:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "619:24:5", + "src": "619:24:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" }, "valueType": { - "id": 1064, + "id": 996, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "638:4:5", + "src": "638:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -537,26 +537,26 @@ }, { "constant": false, - "id": 1068, + "id": 1000, "name": "verifier", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "666:25:5", + "scope": 1320, + "src": "666:25:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" }, "typeName": { "contractScope": null, - "id": 1067, + "id": 999, "name": "IVerifier", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1041, - "src": "666:9:5", + "referencedDeclaration": 973, + "src": "666:9:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -565,26 +565,26 @@ }, { "constant": false, - "id": 1070, + "id": 1002, "name": "feeManager", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "695:29:5", + "scope": 1320, + "src": "695:29:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" }, "typeName": { "contractScope": null, - "id": 1069, + "id": 1001, "name": "IFeeManager", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1052, - "src": "695:11:5", + "referencedDeclaration": 984, + "src": "695:11:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -593,11 +593,11 @@ }, { "constant": false, - "id": 1072, + "id": 1004, "name": "operator", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "884:23:5", + "scope": 1320, + "src": "884:23:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -605,10 +605,10 @@ "typeString": "address" }, "typeName": { - "id": 1071, + "id": 1003, "name": "address", "nodeType": "ElementaryTypeName", - "src": "884:7:5", + "src": "884:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -620,9 +620,9 @@ }, { "body": { - "id": 1083, + "id": 1015, "nodeType": "Block", - "src": "933:90:5", + "src": "933:90:4", "statements": [ { "expression": { @@ -634,7 +634,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 1078, + "id": 1010, "isConstant": false, "isLValue": false, "isPure": false, @@ -643,18 +643,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1075, + "id": 1007, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1408, - "src": "947:3:5", + "referencedDeclaration": 1365, + "src": "947:3:4", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1076, + "id": 1008, "isConstant": false, "isLValue": false, "isPure": false, @@ -662,7 +662,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "947:10:5", + "src": "947:10:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -672,18 +672,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 1077, + "id": 1009, "name": "operator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1072, - "src": "961:8:5", + "referencedDeclaration": 1004, + "src": "961:8:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "947:22:5", + "src": "947:22:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -692,14 +692,14 @@ { "argumentTypes": null, "hexValue": "4f6e6c79206f70657261746f722063616e2063616c6c20746869732066756e6374696f6e2e", - "id": 1079, + "id": 1011, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "971:39:5", + "src": "971:39:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e8393660073679be7a6133571fe2ca8983a31a683c72e9055f401ac33a2efffc", @@ -719,21 +719,21 @@ "typeString": "literal_string \"Only operator can call this function.\"" } ], - "id": 1074, + "id": 1006, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "939:7:5", + "referencedDeclaration": 1369, + "src": "939:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1080, + "id": 1012, "isConstant": false, "isLValue": false, "isPure": false, @@ -741,54 +741,54 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "939:72:5", + "src": "939:72:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1081, + "id": 1013, "nodeType": "ExpressionStatement", - "src": "939:72:5" + "src": "939:72:4" }, { - "id": 1082, + "id": 1014, "nodeType": "PlaceholderStatement", - "src": "1017:1:5" + "src": "1017:1:4" } ] }, "documentation": null, - "id": 1084, + "id": 1016, "name": "onlyOperator", "nodeType": "ModifierDefinition", "parameters": { - "id": 1073, + "id": 1005, "nodeType": "ParameterList", "parameters": [], - "src": "933:0:5" + "src": "933:0:4" }, - "src": "911:112:5", + "src": "911:112:4", "visibility": "internal" }, { "anonymous": false, "documentation": null, - "id": 1092, + "id": 1024, "name": "Deposit", "nodeType": "EventDefinition", "parameters": { - "id": 1091, + "id": 1023, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1086, + "id": 1018, "indexed": true, "name": "commitment", "nodeType": "VariableDeclaration", - "scope": 1092, - "src": "1041:26:5", + "scope": 1024, + "src": "1041:26:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -796,10 +796,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1085, + "id": 1017, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1041:7:5", + "src": "1041:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -810,12 +810,12 @@ }, { "constant": false, - "id": 1088, + "id": 1020, "indexed": false, "name": "leafIndex", "nodeType": "VariableDeclaration", - "scope": 1092, - "src": "1069:16:5", + "scope": 1024, + "src": "1069:16:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -823,10 +823,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1087, + "id": 1019, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "1069:6:5", + "src": "1069:6:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -837,12 +837,12 @@ }, { "constant": false, - "id": 1090, + "id": 1022, "indexed": false, "name": "timestamp", "nodeType": "VariableDeclaration", - "scope": 1092, - "src": "1087:17:5", + "scope": 1024, + "src": "1087:17:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -850,10 +850,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1089, + "id": 1021, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1087:7:5", + "src": "1087:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -863,28 +863,28 @@ "visibility": "internal" } ], - "src": "1040:65:5" + "src": "1040:65:4" }, - "src": "1027:79:5" + "src": "1027:79:4" }, { "anonymous": false, "documentation": null, - "id": 1102, + "id": 1034, "name": "Withdrawal", "nodeType": "EventDefinition", "parameters": { - "id": 1101, + "id": 1033, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1094, + "id": 1026, "indexed": false, "name": "to", "nodeType": "VariableDeclaration", - "scope": 1102, - "src": "1126:10:5", + "scope": 1034, + "src": "1126:10:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -892,10 +892,10 @@ "typeString": "address" }, "typeName": { - "id": 1093, + "id": 1025, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1126:7:5", + "src": "1126:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -907,12 +907,12 @@ }, { "constant": false, - "id": 1096, + "id": 1028, "indexed": false, "name": "nullifierHash", "nodeType": "VariableDeclaration", - "scope": 1102, - "src": "1138:21:5", + "scope": 1034, + "src": "1138:21:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -920,10 +920,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1095, + "id": 1027, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1138:7:5", + "src": "1138:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -934,12 +934,12 @@ }, { "constant": false, - "id": 1098, + "id": 1030, "indexed": true, "name": "relayer", "nodeType": "VariableDeclaration", - "scope": 1102, - "src": "1161:23:5", + "scope": 1034, + "src": "1161:23:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -947,10 +947,10 @@ "typeString": "address" }, "typeName": { - "id": 1097, + "id": 1029, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1161:7:5", + "src": "1161:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -962,12 +962,12 @@ }, { "constant": false, - "id": 1100, + "id": 1032, "indexed": false, "name": "fee", "nodeType": "VariableDeclaration", - "scope": 1102, - "src": "1186:11:5", + "scope": 1034, + "src": "1186:11:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -975,10 +975,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1099, + "id": 1031, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1186:7:5", + "src": "1186:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -988,15 +988,156 @@ "visibility": "internal" } ], - "src": "1125:73:5" + "src": "1125:73:4" }, - "src": "1109:90:5" + "src": "1109:90:4" + }, + { + "anonymous": false, + "documentation": null, + "id": 1040, + "name": "OwnershipTransferred", + "nodeType": "EventDefinition", + "parameters": { + "id": 1039, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 1036, + "indexed": true, + "name": "previousOwner", + "nodeType": "VariableDeclaration", + "scope": 1040, + "src": "1229:29:4", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 1035, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1229:7:4", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 1038, + "indexed": true, + "name": "newOwner", + "nodeType": "VariableDeclaration", + "scope": 1040, + "src": "1260:24:4", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 1037, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1260:7:4", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "1228:57:4" + }, + "src": "1202:84:4" + }, + { + "anonymous": false, + "documentation": null, + "id": 1046, + "name": "EncryptedNote", + "nodeType": "EventDefinition", + "parameters": { + "id": 1045, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 1042, + "indexed": true, + "name": "sender", + "nodeType": "VariableDeclaration", + "scope": 1046, + "src": "1309:22:4", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 1041, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1309:7:4", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 1044, + "indexed": false, + "name": "encryptedNote", + "nodeType": "VariableDeclaration", + "scope": 1046, + "src": "1333:19:4", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_bytes_memory_ptr", + "typeString": "bytes" + }, + "typeName": { + "id": 1043, + "name": "bytes", + "nodeType": "ElementaryTypeName", + "src": "1333:5:4", + "typeDescriptions": { + "typeIdentifier": "t_bytes_storage_ptr", + "typeString": "bytes" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "1308:45:4" + }, + "src": "1289:65:4" }, { "body": { - "id": 1141, + "id": 1085, "nodeType": "Block", - "src": "1696:194:5", + "src": "1851:194:4", "statements": [ { "expression": { @@ -1008,19 +1149,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1121, + "id": 1065, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1119, + "id": 1063, "name": "_denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1108, - "src": "1710:13:5", + "referencedDeclaration": 1052, + "src": "1865:13:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1031,14 +1172,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1120, + "id": 1064, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1726:1:5", + "src": "1881:1:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -1046,7 +1187,7 @@ }, "value": "0" }, - "src": "1710:17:5", + "src": "1865:17:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1055,14 +1196,14 @@ { "argumentTypes": null, "hexValue": "64656e6f6d696e6174696f6e2073686f756c642062652067726561746572207468616e2030", - "id": 1122, + "id": 1066, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "1729:39:5", + "src": "1884:39:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_04818fb803bf7e7ff6c9059d97eae335b77b108931ead0a529924d35ccaf3fc8", @@ -1082,21 +1223,21 @@ "typeString": "literal_string \"denomination should be greater than 0\"" } ], - "id": 1118, + "id": 1062, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "1702:7:5", + "referencedDeclaration": 1369, + "src": "1857:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1123, + "id": 1067, "isConstant": false, "isLValue": false, "isPure": false, @@ -1104,34 +1245,34 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1702:67:5", + "src": "1857:67:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1124, + "id": 1068, "nodeType": "ExpressionStatement", - "src": "1702:67:5" + "src": "1857:67:4" }, { "expression": { "argumentTypes": null, - "id": 1127, + "id": 1071, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1125, + "id": 1069, "name": "verifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "1775:8:5", + "referencedDeclaration": 1000, + "src": "1930:8:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -1139,45 +1280,45 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1126, + "id": 1070, "name": "_verifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1104, - "src": "1786:9:5", + "referencedDeclaration": 1048, + "src": "1941:9:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "src": "1775:20:5", + "src": "1930:20:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "id": 1128, + "id": 1072, "nodeType": "ExpressionStatement", - "src": "1775:20:5" + "src": "1930:20:4" }, { "expression": { "argumentTypes": null, - "id": 1131, + "id": 1075, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1129, + "id": 1073, "name": "feeManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1070, - "src": "1801:10:5", + "referencedDeclaration": 1002, + "src": "1956:10:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -1185,43 +1326,43 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1130, + "id": 1074, "name": "_feeManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1106, - "src": "1814:11:5", + "referencedDeclaration": 1050, + "src": "1969:11:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, - "src": "1801:24:5", + "src": "1956:24:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, - "id": 1132, + "id": 1076, "nodeType": "ExpressionStatement", - "src": "1801:24:5" + "src": "1956:24:4" }, { "expression": { "argumentTypes": null, - "id": 1135, + "id": 1079, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1133, + "id": 1077, "name": "operator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1072, - "src": "1831:8:5", + "referencedDeclaration": 1004, + "src": "1986:8:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1231,43 +1372,43 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1134, + "id": 1078, "name": "_operator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1112, - "src": "1842:9:5", + "referencedDeclaration": 1056, + "src": "1997:9:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "1831:20:5", + "src": "1986:20:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1136, + "id": 1080, "nodeType": "ExpressionStatement", - "src": "1831:20:5" + "src": "1986:20:4" }, { "expression": { "argumentTypes": null, - "id": 1139, + "id": 1083, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1137, + "id": 1081, "name": "denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1058, - "src": "1857:12:5", + "referencedDeclaration": 990, + "src": "2012:12:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1277,31 +1418,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1138, + "id": 1082, "name": "_denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1108, - "src": "1872:13:5", + "referencedDeclaration": 1052, + "src": "2027:13:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1857:28:5", + "src": "2012:28:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1140, + "id": 1084, "nodeType": "ExpressionStatement", - "src": "1857:28:5" + "src": "2012:28:4" } ] }, "documentation": "@dev The constructor\n@param _verifier the address of SNARK verifier for this contract\n@param _denomination transfer amount for each deposit\n@param _merkleTreeHeight the height of deposits' Merkle Tree\n@param _operator operator address (see operator comment above)", - "id": 1142, + "id": 1086, "implemented": true, "kind": "constructor", "modifiers": [ @@ -1309,64 +1450,64 @@ "arguments": [ { "argumentTypes": null, - "id": 1115, + "id": 1059, "name": "_merkleTreeHeight", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1110, - "src": "1670:17:5", + "referencedDeclaration": 1054, + "src": "1825:17:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" } } ], - "id": 1116, + "id": 1060, "modifierName": { "argumentTypes": null, - "id": 1114, + "id": 1058, "name": "MerkleTreeWithHistory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 838, - "src": "1648:21:5", + "referencedDeclaration": 770, + "src": "1803:21:4", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_MerkleTreeWithHistory_$838_$", + "typeIdentifier": "t_type$_t_contract$_MerkleTreeWithHistory_$770_$", "typeString": "type(contract MerkleTreeWithHistory)" } }, "nodeType": "ModifierInvocation", - "src": "1648:40:5" + "src": "1803:40:4" } ], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 1113, + "id": 1057, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1104, + "id": 1048, "name": "_verifier", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1515:19:5", + "scope": 1086, + "src": "1670:19:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" }, "typeName": { "contractScope": null, - "id": 1103, + "id": 1047, "name": "IVerifier", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1041, - "src": "1515:9:5", + "referencedDeclaration": 973, + "src": "1670:9:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -1375,26 +1516,26 @@ }, { "constant": false, - "id": 1106, + "id": 1050, "name": "_feeManager", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1540:23:5", + "scope": 1086, + "src": "1695:23:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" }, "typeName": { "contractScope": null, - "id": 1105, + "id": 1049, "name": "IFeeManager", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1052, - "src": "1540:11:5", + "referencedDeclaration": 984, + "src": "1695:11:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -1403,11 +1544,11 @@ }, { "constant": false, - "id": 1108, + "id": 1052, "name": "_denomination", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1569:21:5", + "scope": 1086, + "src": "1724:21:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1415,10 +1556,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1107, + "id": 1051, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1569:7:5", + "src": "1724:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1429,11 +1570,11 @@ }, { "constant": false, - "id": 1110, + "id": 1054, "name": "_merkleTreeHeight", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1596:24:5", + "scope": 1086, + "src": "1751:24:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1441,10 +1582,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1109, + "id": 1053, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "1596:6:5", + "src": "1751:6:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -1455,11 +1596,11 @@ }, { "constant": false, - "id": 1112, + "id": 1056, "name": "_operator", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1626:17:5", + "scope": 1086, + "src": "1781:17:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1467,10 +1608,10 @@ "typeString": "address" }, "typeName": { - "id": 1111, + "id": 1055, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1626:7:5", + "src": "1781:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1481,25 +1622,25 @@ "visibility": "internal" } ], - "src": "1509:138:5" + "src": "1664:138:4" }, "returnParameters": { - "id": 1117, + "id": 1061, "nodeType": "ParameterList", "parameters": [], - "src": "1696:0:5" + "src": "1851:0:4" }, - "scope": 1363, - "src": "1498:392:5", + "scope": 1320, + "src": "1653:392:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1179, + "id": 1131, "nodeType": "Block", - "src": "2206:256:5", + "src": "2392:308:4", "statements": [ { "expression": { @@ -1507,7 +1648,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1153, + "id": 1099, "isConstant": false, "isLValue": false, "isPure": false, @@ -1515,31 +1656,31 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "2220:25:5", + "src": "2406:25:4", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1150, + "id": 1096, "name": "commitments", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1066, - "src": "2221:11:5", + "referencedDeclaration": 998, + "src": "2407:11:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1152, + "id": 1098, "indexExpression": { "argumentTypes": null, - "id": 1151, + "id": 1097, "name": "_commitment", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1144, - "src": "2233:11:5", + "referencedDeclaration": 1088, + "src": "2419:11:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1550,7 +1691,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2221:24:5", + "src": "2407:24:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1564,14 +1705,14 @@ { "argumentTypes": null, "hexValue": "54686520636f6d6d69746d656e7420686173206265656e207375626d6974746564", - "id": 1154, + "id": 1100, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2247:35:5", + "src": "2433:35:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_ae5f231636554c1cb3bf839359e4dfbb338ccb221c7c5dbdf2da91ddc6e2ee6b", @@ -1591,21 +1732,21 @@ "typeString": "literal_string \"The commitment has been submitted\"" } ], - "id": 1149, + "id": 1095, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "2212:7:5", + "referencedDeclaration": 1369, + "src": "2398:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1155, + "id": 1101, "isConstant": false, "isLValue": false, "isPure": false, @@ -1613,28 +1754,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2212:71:5", + "src": "2398:71:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1156, + "id": 1102, "nodeType": "ExpressionStatement", - "src": "2212:71:5" + "src": "2398:71:4" }, { "assignments": [ - 1158 + 1104 ], "declarations": [ { "constant": false, - "id": 1158, + "id": 1104, "name": "insertedIndex", "nodeType": "VariableDeclaration", - "scope": 1179, - "src": "2290:20:5", + "scope": 1131, + "src": "2476:20:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1642,10 +1783,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1157, + "id": 1103, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "2290:6:5", + "src": "2476:6:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -1655,18 +1796,18 @@ "visibility": "internal" } ], - "id": 1162, + "id": 1108, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1160, + "id": 1106, "name": "_commitment", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1144, - "src": "2321:11:5", + "referencedDeclaration": 1088, + "src": "2507:11:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1680,18 +1821,18 @@ "typeString": "bytes32" } ], - "id": 1159, + "id": 1105, "name": "_insert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 780, - "src": "2313:7:5", + "referencedDeclaration": 712, + "src": "2499:7:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$_t_uint32_$", "typeString": "function (bytes32) returns (uint32)" } }, - "id": 1161, + "id": 1107, "isConstant": false, "isLValue": false, "isPure": false, @@ -1699,19 +1840,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2313:20:5", + "src": "2499:20:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" } }, "nodeType": "VariableDeclarationStatement", - "src": "2290:43:5" + "src": "2476:43:4" }, { "expression": { "argumentTypes": null, - "id": 1167, + "id": 1113, "isConstant": false, "isLValue": false, "isPure": false, @@ -1720,26 +1861,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1163, + "id": 1109, "name": "commitments", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1066, - "src": "2339:11:5", + "referencedDeclaration": 998, + "src": "2525:11:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1165, + "id": 1111, "indexExpression": { "argumentTypes": null, - "id": 1164, + "id": 1110, "name": "_commitment", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1144, - "src": "2351:11:5", + "referencedDeclaration": 1088, + "src": "2537:11:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1750,7 +1891,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "2339:24:5", + "src": "2525:24:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1761,14 +1902,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1166, + "id": 1112, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "2366:4:5", + "src": "2552:4:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -1776,15 +1917,15 @@ }, "value": "true" }, - "src": "2339:31:5", + "src": "2525:31:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1168, + "id": 1114, "nodeType": "ExpressionStatement", - "src": "2339:31:5" + "src": "2525:31:4" }, { "expression": { @@ -1792,18 +1933,18 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 1169, + "id": 1115, "name": "_processDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1183, - "src": "2376:15:5", + "referencedDeclaration": 1135, + "src": "2562:15:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$", "typeString": "function ()" } }, - "id": 1170, + "id": 1116, "isConstant": false, "isLValue": false, "isPure": false, @@ -1811,15 +1952,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2376:17:5", + "src": "2562:17:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1171, + "id": 1117, "nodeType": "ExpressionStatement", - "src": "2376:17:5" + "src": "2562:17:4" }, { "eventCall": { @@ -1827,12 +1968,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1173, + "id": 1119, "name": "_commitment", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1144, - "src": "2413:11:5", + "referencedDeclaration": 1088, + "src": "2599:11:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1840,12 +1981,12 @@ }, { "argumentTypes": null, - "id": 1174, + "id": 1120, "name": "insertedIndex", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1158, - "src": "2426:13:5", + "referencedDeclaration": 1104, + "src": "2612:13:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -1855,18 +1996,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1175, + "id": 1121, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1398, - "src": "2441:5:5", + "referencedDeclaration": 1355, + "src": "2627:5:4", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1176, + "id": 1122, "isConstant": false, "isLValue": false, "isPure": false, @@ -1874,7 +2015,7 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2441:15:5", + "src": "2627:15:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1896,18 +2037,18 @@ "typeString": "uint256" } ], - "id": 1172, + "id": 1118, "name": "Deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1092, - "src": "2405:7:5", + "referencedDeclaration": 1024, + "src": "2591:7:4", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint32_$_t_uint256_$returns$__$", "typeString": "function (bytes32,uint32,uint256)" } }, - "id": 1177, + "id": 1123, "isConstant": false, "isLValue": false, "isPure": false, @@ -1915,56 +2056,143 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2405:52:5", + "src": "2591:52:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1178, + "id": 1124, "nodeType": "EmitStatement", - "src": "2400:57:5" + "src": "2586:57:4" + }, + { + "eventCall": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 1126, + "name": "msg", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1365, + "src": "2668:3:4", + "typeDescriptions": { + "typeIdentifier": "t_magic_message", + "typeString": "msg" + } + }, + "id": 1127, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sender", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "2668:10:4", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + }, + { + "argumentTypes": null, + "id": 1128, + "name": "_encryptedNote", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1090, + "src": "2680:14:4", + "typeDescriptions": { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + ], + "id": 1125, + "name": "EncryptedNote", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1046, + "src": "2654:13:4", + "typeDescriptions": { + "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$__$", + "typeString": "function (address,bytes memory)" + } + }, + "id": 1129, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2654:41:4", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 1130, + "nodeType": "EmitStatement", + "src": "2649:46:4" } ] }, "documentation": "@dev Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\n@param _commitment the note commitment, which is PedersenHash(nullifier + secret)", - "id": 1180, + "id": 1132, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 1147, + "id": 1093, "modifierName": { "argumentTypes": null, - "id": 1146, + "id": 1092, "name": "nonReentrant", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1392, - "src": "2193:12:5", + "referencedDeclaration": 1349, + "src": "2379:12:4", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "2193:12:5" + "src": "2379:12:4" } ], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 1145, + "id": 1091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1144, + "id": 1088, "name": "_commitment", "nodeType": "VariableDeclaration", - "scope": 1180, - "src": "2155:19:5", + "scope": 1132, + "src": "2310:19:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1972,10 +2200,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1143, + "id": 1087, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2155:7:5", + "src": "2310:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1983,18 +2211,44 @@ }, "value": null, "visibility": "internal" + }, + { + "constant": false, + "id": 1090, + "name": "_encryptedNote", + "nodeType": "VariableDeclaration", + "scope": 1132, + "src": "2331:29:4", + "stateVariable": false, + "storageLocation": "calldata", + "typeDescriptions": { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes" + }, + "typeName": { + "id": 1089, + "name": "bytes", + "nodeType": "ElementaryTypeName", + "src": "2331:5:4", + "typeDescriptions": { + "typeIdentifier": "t_bytes_storage_ptr", + "typeString": "bytes" + } + }, + "value": null, + "visibility": "internal" } ], - "src": "2154:21:5" + "src": "2309:52:4" }, "returnParameters": { - "id": 1148, + "id": 1094, "nodeType": "ParameterList", "parameters": [], - "src": "2206:0:5" + "src": "2392:0:4" }, - "scope": 1363, - "src": "2138:324:5", + "scope": 1320, + "src": "2293:407:4", "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -2002,35 +2256,35 @@ { "body": null, "documentation": "@dev this function is defined in a child contract ", - "id": 1183, + "id": 1135, "implemented": false, "kind": "function", "modifiers": [], "name": "_processDeposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 1181, + "id": 1133, "nodeType": "ParameterList", "parameters": [], - "src": "2549:2:5" + "src": "2787:2:4" }, "returnParameters": { - "id": 1182, + "id": 1134, "nodeType": "ParameterList", "parameters": [], - "src": "2560:0:5" + "src": "2798:0:4" }, - "scope": 1363, - "src": "2525:36:5", + "scope": 1320, + "src": "2763:36:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 1267, + "id": 1219, "nodeType": "Block", - "src": "3153:586:5", + "src": "3391:586:4", "statements": [ { "expression": { @@ -2042,19 +2296,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1205, + "id": 1157, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1203, + "id": 1155, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1195, - "src": "3167:4:5", + "referencedDeclaration": 1147, + "src": "3405:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2064,18 +2318,18 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 1204, + "id": 1156, "name": "denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1058, - "src": "3175:12:5", + "referencedDeclaration": 990, + "src": "3413:12:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3167:20:5", + "src": "3405:20:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2084,14 +2338,14 @@ { "argumentTypes": null, "hexValue": "4665652065786365656473207472616e736665722076616c7565", - "id": 1206, + "id": 1158, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3189:28:5", + "src": "3427:28:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_2ce218df547d416f80ea8a5deadaf9453d23523ffa5f2e880a48adfdb4053a9c", @@ -2111,21 +2365,21 @@ "typeString": "literal_string \"Fee exceeds transfer value\"" } ], - "id": 1202, + "id": 1154, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3159:7:5", + "referencedDeclaration": 1369, + "src": "3397:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1207, + "id": 1159, "isConstant": false, "isLValue": false, "isPure": false, @@ -2133,15 +2387,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3159:59:5", + "src": "3397:59:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1208, + "id": 1160, "nodeType": "ExpressionStatement", - "src": "3159:59:5" + "src": "3397:59:4" }, { "expression": { @@ -2149,7 +2403,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1213, + "id": 1165, "isConstant": false, "isLValue": false, "isPure": false, @@ -2157,31 +2411,31 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "3232:32:5", + "src": "3470:32:4", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1210, + "id": 1162, "name": "nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "3233:15:5", + "referencedDeclaration": 994, + "src": "3471:15:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1212, + "id": 1164, "indexExpression": { "argumentTypes": null, - "id": 1211, + "id": 1163, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "3249:14:5", + "referencedDeclaration": 1141, + "src": "3487:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2192,7 +2446,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3233:31:5", + "src": "3471:31:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2206,14 +2460,14 @@ { "argumentTypes": null, "hexValue": "546865206e6f746520686173206265656e20616c7265616479207370656e74", - "id": 1214, + "id": 1166, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3266:33:5", + "src": "3504:33:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_a1bef92d7a18b1c6975dc8de68df6140a52afea05a2c6c91da2b1562c617e896", @@ -2233,21 +2487,21 @@ "typeString": "literal_string \"The note has been already spent\"" } ], - "id": 1209, + "id": 1161, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3224:7:5", + "referencedDeclaration": 1369, + "src": "3462:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1215, + "id": 1167, "isConstant": false, "isLValue": false, "isPure": false, @@ -2255,15 +2509,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3224:76:5", + "src": "3462:76:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1216, + "id": 1168, "nodeType": "ExpressionStatement", - "src": "3224:76:5" + "src": "3462:76:4" }, { "expression": { @@ -2274,12 +2528,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1219, + "id": 1171, "name": "_root", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1187, - "src": "3326:5:5", + "referencedDeclaration": 1139, + "src": "3564:5:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2293,18 +2547,18 @@ "typeString": "bytes32" } ], - "id": 1218, + "id": 1170, "name": "isKnownRoot", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 827, - "src": "3314:11:5", + "referencedDeclaration": 759, + "src": "3552:11:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 1220, + "id": 1172, "isConstant": false, "isLValue": false, "isPure": false, @@ -2312,7 +2566,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3314:18:5", + "src": "3552:18:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2321,14 +2575,14 @@ { "argumentTypes": null, "hexValue": "43616e6e6f742066696e6420796f7572206d65726b6c6520726f6f74", - "id": 1221, + "id": 1173, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3334:30:5", + "src": "3572:30:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_2a69086763073955418d2fd7dfee3d2f1fbc5b21047a216b7855d3f313d8e204", @@ -2348,21 +2602,21 @@ "typeString": "literal_string \"Cannot find your merkle root\"" } ], - "id": 1217, + "id": 1169, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3306:7:5", + "referencedDeclaration": 1369, + "src": "3544:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1222, + "id": 1174, "isConstant": false, "isLValue": false, "isPure": false, @@ -2370,15 +2624,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3306:59:5", + "src": "3544:59:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1223, + "id": 1175, "nodeType": "ExpressionStatement", - "src": "3306:59:5" + "src": "3544:59:4" }, { "expression": { @@ -2389,12 +2643,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1227, + "id": 1179, "name": "_proof", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1185, - "src": "3433:6:5", + "referencedDeclaration": 1137, + "src": "3671:6:4", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", "typeString": "bytes calldata" @@ -2408,12 +2662,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1229, + "id": 1181, "name": "_root", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1187, - "src": "3450:5:5", + "referencedDeclaration": 1139, + "src": "3688:5:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2427,20 +2681,20 @@ "typeString": "bytes32" } ], - "id": 1228, + "id": 1180, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3442:7:5", + "src": "3680:7:4", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1230, + "id": 1182, "isConstant": false, "isLValue": false, "isPure": false, @@ -2448,7 +2702,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3442:14:5", + "src": "3680:14:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2459,12 +2713,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1232, + "id": 1184, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "3466:14:5", + "referencedDeclaration": 1141, + "src": "3704:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2478,20 +2732,20 @@ "typeString": "bytes32" } ], - "id": 1231, + "id": 1183, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3458:7:5", + "src": "3696:7:4", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1233, + "id": 1185, "isConstant": false, "isLValue": false, "isPure": false, @@ -2499,7 +2753,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3458:23:5", + "src": "3696:23:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2510,12 +2764,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1235, + "id": 1187, "name": "_recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1191, - "src": "3491:10:5", + "referencedDeclaration": 1143, + "src": "3729:10:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2529,20 +2783,20 @@ "typeString": "address payable" } ], - "id": 1234, + "id": 1186, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3483:7:5", + "src": "3721:7:4", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1236, + "id": 1188, "isConstant": false, "isLValue": false, "isPure": false, @@ -2550,7 +2804,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3483:19:5", + "src": "3721:19:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2561,12 +2815,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1238, + "id": 1190, "name": "_relayer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1193, - "src": "3512:8:5", + "referencedDeclaration": 1145, + "src": "3750:8:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2580,20 +2834,20 @@ "typeString": "address payable" } ], - "id": 1237, + "id": 1189, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3504:7:5", + "src": "3742:7:4", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1239, + "id": 1191, "isConstant": false, "isLValue": false, "isPure": false, @@ -2601,7 +2855,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3504:17:5", + "src": "3742:17:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2609,12 +2863,12 @@ }, { "argumentTypes": null, - "id": 1240, + "id": 1192, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1195, - "src": "3523:4:5", + "referencedDeclaration": 1147, + "src": "3761:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2622,26 +2876,26 @@ }, { "argumentTypes": null, - "id": 1241, + "id": 1193, "name": "_refund", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1197, - "src": "3529:7:5", + "referencedDeclaration": 1149, + "src": "3767:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } } ], - "id": 1242, + "id": 1194, "isConstant": false, "isInlineArray": true, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "3441:96:5", + "src": "3679:96:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$6_memory_ptr", "typeString": "uint256[6] memory" @@ -2661,32 +2915,32 @@ ], "expression": { "argumentTypes": null, - "id": 1225, + "id": 1177, "name": "verifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "3412:8:5", + "referencedDeclaration": 1000, + "src": "3650:8:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "id": 1226, + "id": 1178, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "verifyProof", "nodeType": "MemberAccess", - "referencedDeclaration": 1040, - "src": "3412:20:5", + "referencedDeclaration": 972, + "src": "3650:20:4", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes_memory_ptr_$_t_array$_t_uint256_$6_memory_ptr_$returns$_t_bool_$", "typeString": "function (bytes memory,uint256[6] memory) external returns (bool)" } }, - "id": 1243, + "id": 1195, "isConstant": false, "isLValue": false, "isPure": false, @@ -2694,7 +2948,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3412:126:5", + "src": "3650:126:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2703,14 +2957,14 @@ { "argumentTypes": null, "hexValue": "496e76616c69642077697468647261772070726f6f66", - "id": 1244, + "id": 1196, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3540:24:5", + "src": "3778:24:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_7021ea58137dba96e572e94936410b0b0e4cbc344e1ab2ee7f47660768b81ff4", @@ -2730,21 +2984,21 @@ "typeString": "literal_string \"Invalid withdraw proof\"" } ], - "id": 1224, + "id": 1176, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3404:7:5", + "referencedDeclaration": 1369, + "src": "3642:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1245, + "id": 1197, "isConstant": false, "isLValue": false, "isPure": false, @@ -2752,20 +3006,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3404:161:5", + "src": "3642:161:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1246, + "id": 1198, "nodeType": "ExpressionStatement", - "src": "3404:161:5" + "src": "3642:161:4" }, { "expression": { "argumentTypes": null, - "id": 1251, + "id": 1203, "isConstant": false, "isLValue": false, "isPure": false, @@ -2774,26 +3028,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1247, + "id": 1199, "name": "nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "3572:15:5", + "referencedDeclaration": 994, + "src": "3810:15:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1249, + "id": 1201, "indexExpression": { "argumentTypes": null, - "id": 1248, + "id": 1200, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "3588:14:5", + "referencedDeclaration": 1141, + "src": "3826:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2804,7 +3058,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "3572:31:5", + "src": "3810:31:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2815,14 +3069,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1250, + "id": 1202, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "3606:4:5", + "src": "3844:4:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -2830,15 +3084,15 @@ }, "value": "true" }, - "src": "3572:38:5", + "src": "3810:38:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1252, + "id": 1204, "nodeType": "ExpressionStatement", - "src": "3572:38:5" + "src": "3810:38:4" }, { "expression": { @@ -2846,12 +3100,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1254, + "id": 1206, "name": "_recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1191, - "src": "3633:10:5", + "referencedDeclaration": 1143, + "src": "3871:10:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2859,12 +3113,12 @@ }, { "argumentTypes": null, - "id": 1255, + "id": 1207, "name": "_relayer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1193, - "src": "3645:8:5", + "referencedDeclaration": 1145, + "src": "3883:8:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2872,12 +3126,12 @@ }, { "argumentTypes": null, - "id": 1256, + "id": 1208, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1195, - "src": "3655:4:5", + "referencedDeclaration": 1147, + "src": "3893:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2885,12 +3139,12 @@ }, { "argumentTypes": null, - "id": 1257, + "id": 1209, "name": "_refund", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1197, - "src": "3661:7:5", + "referencedDeclaration": 1149, + "src": "3899:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2916,18 +3170,18 @@ "typeString": "uint256" } ], - "id": 1253, + "id": 1205, "name": "_processWithdraw", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1279, - "src": "3616:16:5", + "referencedDeclaration": 1231, + "src": "3854:16:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_payable_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (address payable,address payable,uint256,uint256)" } }, - "id": 1258, + "id": 1210, "isConstant": false, "isLValue": false, "isPure": false, @@ -2935,15 +3189,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3616:53:5", + "src": "3854:53:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1259, + "id": 1211, "nodeType": "ExpressionStatement", - "src": "3616:53:5" + "src": "3854:53:4" }, { "eventCall": { @@ -2951,12 +3205,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1261, + "id": 1213, "name": "_recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1191, - "src": "3691:10:5", + "referencedDeclaration": 1143, + "src": "3929:10:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2964,12 +3218,12 @@ }, { "argumentTypes": null, - "id": 1262, + "id": 1214, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "3703:14:5", + "referencedDeclaration": 1141, + "src": "3941:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2977,12 +3231,12 @@ }, { "argumentTypes": null, - "id": 1263, + "id": 1215, "name": "_relayer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1193, - "src": "3719:8:5", + "referencedDeclaration": 1145, + "src": "3957:8:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2990,12 +3244,12 @@ }, { "argumentTypes": null, - "id": 1264, + "id": 1216, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1195, - "src": "3729:4:5", + "referencedDeclaration": 1147, + "src": "3967:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3021,18 +3275,18 @@ "typeString": "uint256" } ], - "id": 1260, + "id": 1212, "name": "Withdrawal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1102, - "src": "3680:10:5", + "referencedDeclaration": 1034, + "src": "3918:10:4", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_bytes32_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,bytes32,address,uint256)" } }, - "id": 1265, + "id": 1217, "isConstant": false, "isLValue": false, "isPure": false, @@ -3040,56 +3294,56 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3680:54:5", + "src": "3918:54:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1266, + "id": 1218, "nodeType": "EmitStatement", - "src": "3675:59:5" + "src": "3913:59:4" } ] }, "documentation": "@dev Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs\n`input` array consists of:\n- merkle root of all deposits in the contract\n- hash of unique deposit nullifier to prevent double spends\n- the recipient of funds\n- optional fee that goes to the transaction sender (usually a relay)", - "id": 1268, + "id": 1220, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 1200, + "id": 1152, "modifierName": { "argumentTypes": null, - "id": 1199, + "id": 1151, "name": "nonReentrant", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1392, - "src": "3140:12:5", + "referencedDeclaration": 1349, + "src": "3378:12:4", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "3140:12:5" + "src": "3378:12:4" } ], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1198, + "id": 1150, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1185, + "id": 1137, "name": "_proof", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "2976:21:5", + "scope": 1220, + "src": "3214:21:4", "stateVariable": false, "storageLocation": "calldata", "typeDescriptions": { @@ -3097,10 +3351,10 @@ "typeString": "bytes" }, "typeName": { - "id": 1184, + "id": 1136, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "2976:5:5", + "src": "3214:5:4", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -3111,11 +3365,11 @@ }, { "constant": false, - "id": 1187, + "id": 1139, "name": "_root", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "2999:13:5", + "scope": 1220, + "src": "3237:13:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3123,10 +3377,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1186, + "id": 1138, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2999:7:5", + "src": "3237:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3137,11 +3391,11 @@ }, { "constant": false, - "id": 1189, + "id": 1141, "name": "_nullifierHash", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3014:22:5", + "scope": 1220, + "src": "3252:22:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3149,10 +3403,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1188, + "id": 1140, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "3014:7:5", + "src": "3252:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3163,11 +3417,11 @@ }, { "constant": false, - "id": 1191, + "id": 1143, "name": "_recipient", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3038:26:5", + "scope": 1220, + "src": "3276:26:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3175,10 +3429,10 @@ "typeString": "address payable" }, "typeName": { - "id": 1190, + "id": 1142, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3038:15:5", + "src": "3276:15:4", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3190,11 +3444,11 @@ }, { "constant": false, - "id": 1193, + "id": 1145, "name": "_relayer", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3066:24:5", + "scope": 1220, + "src": "3304:24:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3202,10 +3456,10 @@ "typeString": "address payable" }, "typeName": { - "id": 1192, + "id": 1144, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3066:15:5", + "src": "3304:15:4", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3217,11 +3471,11 @@ }, { "constant": false, - "id": 1195, + "id": 1147, "name": "_fee", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3092:12:5", + "scope": 1220, + "src": "3330:12:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3229,10 +3483,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1194, + "id": 1146, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3092:7:5", + "src": "3330:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3243,11 +3497,11 @@ }, { "constant": false, - "id": 1197, + "id": 1149, "name": "_refund", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3106:15:5", + "scope": 1220, + "src": "3344:15:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3255,10 +3509,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1196, + "id": 1148, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3106:7:5", + "src": "3344:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3268,16 +3522,16 @@ "visibility": "internal" } ], - "src": "2975:147:5" + "src": "3213:147:4" }, "returnParameters": { - "id": 1201, + "id": 1153, "nodeType": "ParameterList", "parameters": [], - "src": "3153:0:5" + "src": "3391:0:4" }, - "scope": 1363, - "src": "2958:781:5", + "scope": 1320, + "src": "3196:781:4", "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -3285,23 +3539,23 @@ { "body": null, "documentation": "@dev this function is defined in a child contract ", - "id": 1279, + "id": 1231, "implemented": false, "kind": "function", "modifiers": [], "name": "_processWithdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1277, + "id": 1229, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1270, + "id": 1222, "name": "_recipient", "nodeType": "VariableDeclaration", - "scope": 1279, - "src": "3828:26:5", + "scope": 1231, + "src": "4066:26:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3309,10 +3563,10 @@ "typeString": "address payable" }, "typeName": { - "id": 1269, + "id": 1221, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3828:15:5", + "src": "4066:15:4", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3324,11 +3578,11 @@ }, { "constant": false, - "id": 1272, + "id": 1224, "name": "_relayer", "nodeType": "VariableDeclaration", - "scope": 1279, - "src": "3856:24:5", + "scope": 1231, + "src": "4094:24:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3336,10 +3590,10 @@ "typeString": "address payable" }, "typeName": { - "id": 1271, + "id": 1223, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3856:15:5", + "src": "4094:15:4", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3351,11 +3605,11 @@ }, { "constant": false, - "id": 1274, + "id": 1226, "name": "_relayer_fee", "nodeType": "VariableDeclaration", - "scope": 1279, - "src": "3882:20:5", + "scope": 1231, + "src": "4120:20:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3363,10 +3617,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1273, + "id": 1225, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3882:7:5", + "src": "4120:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3377,11 +3631,11 @@ }, { "constant": false, - "id": 1276, + "id": 1228, "name": "_refund", "nodeType": "VariableDeclaration", - "scope": 1279, - "src": "3904:15:5", + "scope": 1231, + "src": "4142:15:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3389,10 +3643,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1275, + "id": 1227, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3904:7:5", + "src": "4142:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3402,51 +3656,51 @@ "visibility": "internal" } ], - "src": "3827:93:5" + "src": "4065:93:4" }, "returnParameters": { - "id": 1278, + "id": 1230, "nodeType": "ParameterList", "parameters": [], - "src": "3929:0:5" + "src": "4167:0:4" }, - "scope": 1363, - "src": "3802:128:5", + "scope": 1320, + "src": "4040:128:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 1290, + "id": 1242, "nodeType": "Block", - "src": "4047:49:5", + "src": "4285:49:4", "statements": [ { "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1286, + "id": 1238, "name": "nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "4060:15:5", + "referencedDeclaration": 994, + "src": "4298:15:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1288, + "id": 1240, "indexExpression": { "argumentTypes": null, - "id": 1287, + "id": 1239, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1281, - "src": "4076:14:5", + "referencedDeclaration": 1233, + "src": "4314:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3457,37 +3711,37 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4060:31:5", + "src": "4298:31:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1285, - "id": 1289, + "functionReturnParameters": 1237, + "id": 1241, "nodeType": "Return", - "src": "4053:38:5" + "src": "4291:38:4" } ] }, "documentation": "@dev whether a note is already spent ", - "id": 1291, + "id": 1243, "implemented": true, "kind": "function", "modifiers": [], "name": "isSpent", "nodeType": "FunctionDefinition", "parameters": { - "id": 1282, + "id": 1234, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1281, + "id": 1233, "name": "_nullifierHash", "nodeType": "VariableDeclaration", - "scope": 1291, - "src": "3997:22:5", + "scope": 1243, + "src": "4235:22:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3495,10 +3749,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1280, + "id": 1232, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "3997:7:5", + "src": "4235:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3508,19 +3762,19 @@ "visibility": "internal" } ], - "src": "3996:24:5" + "src": "4234:24:4" }, "returnParameters": { - "id": 1285, + "id": 1237, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1284, + "id": 1236, "name": "", "nodeType": "VariableDeclaration", - "scope": 1291, - "src": "4041:4:5", + "scope": 1243, + "src": "4279:4:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3528,10 +3782,10 @@ "typeString": "bool" }, "typeName": { - "id": 1283, + "id": 1235, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "4041:4:5", + "src": "4279:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3541,36 +3795,36 @@ "visibility": "internal" } ], - "src": "4040:6:5" + "src": "4278:6:4" }, - "scope": 1363, - "src": "3980:116:5", + "scope": 1320, + "src": "4218:116:4", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1335, + "id": 1287, "nodeType": "Block", - "src": "4259:191:5", + "src": "4497:191:4", "statements": [ { "expression": { "argumentTypes": null, - "id": 1307, + "id": 1259, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1300, + "id": 1252, "name": "spent", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1298, - "src": "4265:5:5", + "referencedDeclaration": 1250, + "src": "4503:5:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr", "typeString": "bool[] memory" @@ -3585,18 +3839,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1304, + "id": 1256, "name": "_nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1294, - "src": "4284:16:5", + "referencedDeclaration": 1246, + "src": "4522:16:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" } }, - "id": 1305, + "id": 1257, "isConstant": false, "isLValue": false, "isPure": false, @@ -3604,7 +3858,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4284:23:5", + "src": "4522:23:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3618,39 +3872,39 @@ "typeString": "uint256" } ], - "id": 1303, + "id": 1255, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "NewExpression", - "src": "4273:10:5", + "src": "4511:10:4", "typeDescriptions": { "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_bool_$dyn_memory_$", "typeString": "function (uint256) pure returns (bool[] memory)" }, "typeName": { "baseType": { - "id": 1301, + "id": 1253, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "4277:4:5", + "src": "4515:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1302, + "id": 1254, "length": null, "nodeType": "ArrayTypeName", - "src": "4277:6:5", + "src": "4515:6:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr", "typeString": "bool[]" } } }, - "id": 1306, + "id": 1258, "isConstant": false, "isLValue": false, "isPure": false, @@ -3658,27 +3912,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4273:35:5", + "src": "4511:35:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_memory", "typeString": "bool[] memory" } }, - "src": "4265:43:5", + "src": "4503:43:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr", "typeString": "bool[] memory" } }, - "id": 1308, + "id": 1260, "nodeType": "ExpressionStatement", - "src": "4265:43:5" + "src": "4503:43:4" }, { "body": { - "id": 1333, + "id": 1285, "nodeType": "Block", - "src": "4364:82:5", + "src": "4602:82:4", "statements": [ { "condition": { @@ -3688,26 +3942,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1321, + "id": 1273, "name": "_nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1294, - "src": "4384:16:5", + "referencedDeclaration": 1246, + "src": "4622:16:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" } }, - "id": 1323, + "id": 1275, "indexExpression": { "argumentTypes": null, - "id": 1322, + "id": 1274, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1310, - "src": "4401:1:5", + "referencedDeclaration": 1262, + "src": "4639:1:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3718,7 +3972,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4384:19:5", + "src": "4622:19:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3732,18 +3986,18 @@ "typeString": "bytes32" } ], - "id": 1320, + "id": 1272, "name": "isSpent", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1291, - "src": "4376:7:5", + "referencedDeclaration": 1243, + "src": "4614:7:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 1324, + "id": 1276, "isConstant": false, "isLValue": false, "isPure": false, @@ -3751,25 +4005,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4376:28:5", + "src": "4614:28:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1332, + "id": 1284, "nodeType": "IfStatement", - "src": "4372:68:5", + "src": "4610:68:4", "trueBody": { - "id": 1331, + "id": 1283, "nodeType": "Block", - "src": "4406:34:5", + "src": "4644:34:4", "statements": [ { "expression": { "argumentTypes": null, - "id": 1329, + "id": 1281, "isConstant": false, "isLValue": false, "isPure": false, @@ -3778,26 +4032,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1325, + "id": 1277, "name": "spent", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1298, - "src": "4416:5:5", + "referencedDeclaration": 1250, + "src": "4654:5:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr", "typeString": "bool[] memory" } }, - "id": 1327, + "id": 1279, "indexExpression": { "argumentTypes": null, - "id": 1326, + "id": 1278, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1310, - "src": "4422:1:5", + "referencedDeclaration": 1262, + "src": "4660:1:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3808,7 +4062,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "4416:8:5", + "src": "4654:8:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3819,14 +4073,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1328, + "id": 1280, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "4427:4:5", + "src": "4665:4:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -3834,15 +4088,15 @@ }, "value": "true" }, - "src": "4416:15:5", + "src": "4654:15:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1330, + "id": 1282, "nodeType": "ExpressionStatement", - "src": "4416:15:5" + "src": "4654:15:4" } ] } @@ -3855,19 +4109,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1316, + "id": 1268, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1313, + "id": 1265, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1310, - "src": "4330:1:5", + "referencedDeclaration": 1262, + "src": "4568:1:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3879,18 +4133,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1314, + "id": 1266, "name": "_nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1294, - "src": "4334:16:5", + "referencedDeclaration": 1246, + "src": "4572:16:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" } }, - "id": 1315, + "id": 1267, "isConstant": false, "isLValue": false, "isPure": false, @@ -3898,31 +4152,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4334:23:5", + "src": "4572:23:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4330:27:5", + "src": "4568:27:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1334, + "id": 1286, "initializationExpression": { "assignments": [ - 1310 + 1262 ], "declarations": [ { "constant": false, - "id": 1310, + "id": 1262, "name": "i", "nodeType": "VariableDeclaration", - "scope": 1334, - "src": "4318:6:5", + "scope": 1286, + "src": "4556:6:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3930,10 +4184,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1309, + "id": 1261, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4318:4:5", + "src": "4556:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3943,18 +4197,18 @@ "visibility": "internal" } ], - "id": 1312, + "id": 1264, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 1311, + "id": 1263, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4327:1:5", + "src": "4565:1:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -3963,12 +4217,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "4318:10:5" + "src": "4556:10:4" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 1318, + "id": 1270, "isConstant": false, "isLValue": false, "isPure": false, @@ -3976,15 +4230,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "4359:3:5", + "src": "4597:3:4", "subExpression": { "argumentTypes": null, - "id": 1317, + "id": 1269, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1310, - "src": "4359:1:5", + "referencedDeclaration": 1262, + "src": "4597:1:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3995,33 +4249,33 @@ "typeString": "uint256" } }, - "id": 1319, + "id": 1271, "nodeType": "ExpressionStatement", - "src": "4359:3:5" + "src": "4597:3:4" }, "nodeType": "ForStatement", - "src": "4314:132:5" + "src": "4552:132:4" } ] }, "documentation": "@dev whether an array of notes is already spent ", - "id": 1336, + "id": 1288, "implemented": true, "kind": "function", "modifiers": [], "name": "isSpentArray", "nodeType": "FunctionDefinition", "parameters": { - "id": 1295, + "id": 1247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1294, + "id": 1246, "name": "_nullifierHashes", "nodeType": "VariableDeclaration", - "scope": 1336, - "src": "4179:35:5", + "scope": 1288, + "src": "4417:35:4", "stateVariable": false, "storageLocation": "calldata", "typeDescriptions": { @@ -4030,19 +4284,19 @@ }, "typeName": { "baseType": { - "id": 1292, + "id": 1244, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4179:7:5", + "src": "4417:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1293, + "id": 1245, "length": null, "nodeType": "ArrayTypeName", - "src": "4179:9:5", + "src": "4417:9:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -4052,19 +4306,19 @@ "visibility": "internal" } ], - "src": "4178:37:5" + "src": "4416:37:4" }, "returnParameters": { - "id": 1299, + "id": 1251, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1298, + "id": 1250, "name": "spent", "nodeType": "VariableDeclaration", - "scope": 1336, - "src": "4238:19:5", + "scope": 1288, + "src": "4476:19:4", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -4073,19 +4327,19 @@ }, "typeName": { "baseType": { - "id": 1296, + "id": 1248, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "4238:4:5", + "src": "4476:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1297, + "id": 1249, "length": null, "nodeType": "ArrayTypeName", - "src": "4238:6:5", + "src": "4476:6:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr", "typeString": "bool[]" @@ -4095,38 +4349,38 @@ "visibility": "internal" } ], - "src": "4237:21:5" + "src": "4475:21:4" }, - "scope": 1363, - "src": "4157:293:5", + "scope": 1320, + "src": "4395:293:4", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1349, + "id": 1301, "nodeType": "Block", - "src": "4748:45:5", + "src": "4986:45:4", "statements": [ { "expression": { "argumentTypes": null, - "id": 1347, + "id": 1299, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1343, + "id": 1295, "name": "verifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "4754:8:5", + "referencedDeclaration": 1000, + "src": "4992:8:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -4137,12 +4391,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1345, + "id": 1297, "name": "_newVerifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1338, - "src": "4775:12:5", + "referencedDeclaration": 1290, + "src": "5013:12:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4156,18 +4410,18 @@ "typeString": "address" } ], - "id": 1344, + "id": 1296, "name": "IVerifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1041, - "src": "4765:9:5", + "referencedDeclaration": 973, + "src": "5003:9:4", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IVerifier_$1041_$", + "typeIdentifier": "t_type$_t_contract$_IVerifier_$973_$", "typeString": "type(contract IVerifier)" } }, - "id": 1346, + "id": 1298, "isConstant": false, "isLValue": false, "isPure": false, @@ -4175,62 +4429,62 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4765:23:5", + "src": "5003:23:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "src": "4754:34:5", + "src": "4992:34:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "id": 1348, + "id": 1300, "nodeType": "ExpressionStatement", - "src": "4754:34:5" + "src": "4992:34:4" } ] }, "documentation": "@dev allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held.\nAfter that operator rights are supposed to be transferred to zero address", - "id": 1350, + "id": 1302, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 1341, + "id": 1293, "modifierName": { "argumentTypes": null, - "id": 1340, + "id": 1292, "name": "onlyOperator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1084, - "src": "4735:12:5", + "referencedDeclaration": 1016, + "src": "4973:12:4", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "4735:12:5" + "src": "4973:12:4" } ], "name": "updateVerifier", "nodeType": "FunctionDefinition", "parameters": { - "id": 1339, + "id": 1291, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1338, + "id": 1290, "name": "_newVerifier", "nodeType": "VariableDeclaration", - "scope": 1350, - "src": "4704:20:5", + "scope": 1302, + "src": "4942:20:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4238,10 +4492,10 @@ "typeString": "address" }, "typeName": { - "id": 1337, + "id": 1289, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4704:7:5", + "src": "4942:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4252,42 +4506,113 @@ "visibility": "internal" } ], - "src": "4703:22:5" + "src": "4941:22:4" }, "returnParameters": { - "id": 1342, + "id": 1294, "nodeType": "ParameterList", "parameters": [], - "src": "4748:0:5" + "src": "4986:0:4" }, - "scope": 1363, - "src": "4680:113:5", + "scope": 1320, + "src": "4918:113:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1361, + "id": 1318, "nodeType": "Block", - "src": "4911:34:5", + "src": "5149:89:4", "statements": [ + { + "eventCall": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 1310, + "name": "operator", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1004, + "src": "5181:8:4", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 1311, + "name": "_newOperator", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1304, + "src": "5191:12:4", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 1309, + "name": "OwnershipTransferred", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1040, + "src": "5160:20:4", + "typeDescriptions": { + "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$", + "typeString": "function (address,address)" + } + }, + "id": 1312, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5160:44:4", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 1313, + "nodeType": "EmitStatement", + "src": "5155:49:4" + }, { "expression": { "argumentTypes": null, - "id": 1359, + "id": 1316, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1357, + "id": 1314, "name": "operator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1072, - "src": "4917:8:5", + "referencedDeclaration": 1004, + "src": "5210:8:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4297,67 +4622,67 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1358, + "id": 1315, "name": "_newOperator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1352, - "src": "4928:12:5", + "referencedDeclaration": 1304, + "src": "5221:12:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "4917:23:5", + "src": "5210:23:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1360, + "id": 1317, "nodeType": "ExpressionStatement", - "src": "4917:23:5" + "src": "5210:23:4" } ] }, "documentation": "@dev operator can change his address ", - "id": 1362, + "id": 1319, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 1355, + "id": 1307, "modifierName": { "argumentTypes": null, - "id": 1354, + "id": 1306, "name": "onlyOperator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1084, - "src": "4898:12:5", + "referencedDeclaration": 1016, + "src": "5136:12:4", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "4898:12:5" + "src": "5136:12:4" } ], "name": "changeOperator", "nodeType": "FunctionDefinition", "parameters": { - "id": 1353, + "id": 1305, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1352, + "id": 1304, "name": "_newOperator", "nodeType": "VariableDeclaration", - "scope": 1362, - "src": "4867:20:5", + "scope": 1319, + "src": "5105:20:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4365,10 +4690,10 @@ "typeString": "address" }, "typeName": { - "id": 1351, + "id": 1303, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4867:7:5", + "src": "5105:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4379,39 +4704,39 @@ "visibility": "internal" } ], - "src": "4866:22:5" + "src": "5104:22:4" }, "returnParameters": { - "id": 1356, + "id": 1308, "nodeType": "ParameterList", "parameters": [], - "src": "4911:0:5" + "src": "5149:0:4" }, - "scope": 1363, - "src": "4843:102:5", + "scope": 1320, + "src": "5081:157:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 1364, - "src": "383:4564:5" + "scope": 1321, + "src": "383:4857:4" } ], - "src": "0:4948:5" + "src": "0:5241:4" }, "legacyAST": { "attributes": { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/Tornado.sol", "exportedSymbols": { "IFeeManager": [ - 1052 + 984 ], "IVerifier": [ - 1041 + 973 ], "Tornado": [ - 1363 + 1320 ] } }, @@ -4424,39 +4749,39 @@ ".17" ] }, - "id": 1027, + "id": 959, "name": "PragmaDirective", - "src": "0:23:5" + "src": "0:23:4" }, { "attributes": { - "SourceUnit": 839, + "SourceUnit": 771, "absolutePath": "/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol", "file": "./MerkleTreeWithHistory.sol", - "scope": 1364, + "scope": 1321, "symbolAliases": [ null ], "unitAlias": "" }, - "id": 1028, + "id": 960, "name": "ImportDirective", - "src": "25:37:5" + "src": "25:37:4" }, { "attributes": { - "SourceUnit": 1394, + "SourceUnit": 1351, "absolutePath": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", "file": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", - "scope": 1364, + "scope": 1321, "symbolAliases": [ null ], "unitAlias": "" }, - "id": 1029, + "id": 961, "name": "ImportDirective", - "src": "63:59:5" + "src": "63:59:4" }, { "attributes": { @@ -4470,10 +4795,10 @@ "documentation": null, "fullyImplemented": false, "linearizedBaseContracts": [ - 1041 + 973 ], "name": "IVerifier", - "scope": 1364 + "scope": 1321 }, "children": [ { @@ -4487,7 +4812,7 @@ null ], "name": "verifyProof", - "scope": 1041, + "scope": 973, "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -4499,7 +4824,7 @@ "attributes": { "constant": false, "name": "_proof", - "scope": 1040, + "scope": 972, "stateVariable": false, "storageLocation": "memory", "type": "bytes", @@ -4512,20 +4837,20 @@ "name": "bytes", "type": "bytes" }, - "id": 1030, + "id": 962, "name": "ElementaryTypeName", - "src": "168:5:5" + "src": "168:5:4" } ], - "id": 1031, + "id": 963, "name": "VariableDeclaration", - "src": "168:19:5" + "src": "168:19:4" }, { "attributes": { "constant": false, "name": "_input", - "scope": 1040, + "scope": 972, "stateVariable": false, "storageLocation": "memory", "type": "uint256[6]", @@ -4543,9 +4868,9 @@ "name": "uint256", "type": "uint256" }, - "id": 1032, + "id": 964, "name": "ElementaryTypeName", - "src": "189:7:5" + "src": "189:7:4" }, { "attributes": { @@ -4560,24 +4885,24 @@ "type": "int_const 6", "value": "6" }, - "id": 1033, + "id": 965, "name": "Literal", - "src": "197:1:5" + "src": "197:1:4" } ], - "id": 1034, + "id": 966, "name": "ArrayTypeName", - "src": "189:10:5" + "src": "189:10:4" } ], - "id": 1035, + "id": 967, "name": "VariableDeclaration", - "src": "189:24:5" + "src": "189:24:4" } ], - "id": 1036, + "id": 968, "name": "ParameterList", - "src": "167:47:5" + "src": "167:47:4" }, { "children": [ @@ -4585,7 +4910,7 @@ "attributes": { "constant": false, "name": "", - "scope": 1040, + "scope": 972, "stateVariable": false, "storageLocation": "default", "type": "bool", @@ -4598,29 +4923,29 @@ "name": "bool", "type": "bool" }, - "id": 1037, + "id": 969, "name": "ElementaryTypeName", - "src": "230:4:5" + "src": "230:4:4" } ], - "id": 1038, + "id": 970, "name": "VariableDeclaration", - "src": "230:4:5" + "src": "230:4:4" } ], - "id": 1039, + "id": 971, "name": "ParameterList", - "src": "229:6:5" + "src": "229:6:4" } ], - "id": 1040, + "id": 972, "name": "FunctionDefinition", - "src": "147:89:5" + "src": "147:89:4" } ], - "id": 1041, + "id": 973, "name": "ContractDefinition", - "src": "124:114:5" + "src": "124:114:4" }, { "attributes": { @@ -4634,10 +4959,10 @@ "documentation": null, "fullyImplemented": false, "linearizedBaseContracts": [ - 1052 + 984 ], "name": "IFeeManager", - "scope": 1364 + "scope": 1321 }, "children": [ { @@ -4651,7 +4976,7 @@ null ], "name": "feeTo", - "scope": 1052, + "scope": 984, "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -4664,9 +4989,9 @@ ] }, "children": [], - "id": 1042, + "id": 974, "name": "ParameterList", - "src": "279:2:5" + "src": "279:2:4" }, { "children": [ @@ -4674,7 +4999,7 @@ "attributes": { "constant": false, "name": "", - "scope": 1046, + "scope": 978, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -4688,24 +5013,24 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1043, + "id": 975, "name": "ElementaryTypeName", - "src": "305:7:5" + "src": "305:7:4" } ], - "id": 1044, + "id": 976, "name": "VariableDeclaration", - "src": "305:7:5" + "src": "305:7:4" } ], - "id": 1045, + "id": 977, "name": "ParameterList", - "src": "304:9:5" + "src": "304:9:4" } ], - "id": 1046, + "id": 978, "name": "FunctionDefinition", - "src": "265:49:5" + "src": "265:49:4" }, { "attributes": { @@ -4718,7 +5043,7 @@ null ], "name": "protocolFeeDivisor", - "scope": 1052, + "scope": 984, "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -4731,9 +5056,9 @@ ] }, "children": [], - "id": 1047, + "id": 979, "name": "ParameterList", - "src": "344:2:5" + "src": "344:2:4" }, { "children": [ @@ -4741,7 +5066,7 @@ "attributes": { "constant": false, "name": "", - "scope": 1051, + "scope": 983, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -4754,46 +5079,46 @@ "name": "uint256", "type": "uint256" }, - "id": 1048, + "id": 980, "name": "ElementaryTypeName", - "src": "370:7:5" + "src": "370:7:4" } ], - "id": 1049, + "id": 981, "name": "VariableDeclaration", - "src": "370:7:5" + "src": "370:7:4" } ], - "id": 1050, + "id": 982, "name": "ParameterList", - "src": "369:9:5" + "src": "369:9:4" } ], - "id": 1051, + "id": 983, "name": "FunctionDefinition", - "src": "317:62:5" + "src": "317:62:4" } ], - "id": 1052, + "id": 984, "name": "ContractDefinition", - "src": "240:141:5" + "src": "240:141:4" }, { "attributes": { "contractDependencies": [ - 838, - 1393 + 770, + 1350 ], "contractKind": "contract", "documentation": null, "fullyImplemented": false, "linearizedBaseContracts": [ - 1363, - 1393, - 838 + 1320, + 1350, + 770 ], "name": "Tornado", - "scope": 1364 + "scope": 1321 }, "children": [ { @@ -4805,17 +5130,17 @@ "attributes": { "contractScope": null, "name": "MerkleTreeWithHistory", - "referencedDeclaration": 838, + "referencedDeclaration": 770, "type": "contract MerkleTreeWithHistory" }, - "id": 1053, + "id": 985, "name": "UserDefinedTypeName", - "src": "403:21:5" + "src": "403:21:4" } ], - "id": 1054, + "id": 986, "name": "InheritanceSpecifier", - "src": "403:21:5" + "src": "403:21:4" }, { "attributes": { @@ -4826,23 +5151,23 @@ "attributes": { "contractScope": null, "name": "ReentrancyGuard", - "referencedDeclaration": 1393, + "referencedDeclaration": 1350, "type": "contract ReentrancyGuard" }, - "id": 1055, + "id": 987, "name": "UserDefinedTypeName", - "src": "426:15:5" + "src": "426:15:4" } ], - "id": 1056, + "id": 988, "name": "InheritanceSpecifier", - "src": "426:15:5" + "src": "426:15:4" }, { "attributes": { "constant": false, "name": "denomination", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "uint256", @@ -4855,20 +5180,20 @@ "name": "uint256", "type": "uint256" }, - "id": 1057, + "id": 989, "name": "ElementaryTypeName", - "src": "446:7:5" + "src": "446:7:4" } ], - "id": 1058, + "id": 990, "name": "VariableDeclaration", - "src": "446:27:5" + "src": "446:27:4" }, { "attributes": { "constant": false, "name": "nullifierHashes", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "mapping(bytes32 => bool)", @@ -4886,34 +5211,34 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1059, + "id": 991, "name": "ElementaryTypeName", - "src": "485:7:5" + "src": "485:7:4" }, { "attributes": { "name": "bool", "type": "bool" }, - "id": 1060, + "id": 992, "name": "ElementaryTypeName", - "src": "496:4:5" + "src": "496:4:4" } ], - "id": 1061, + "id": 993, "name": "Mapping", - "src": "477:24:5" + "src": "477:24:4" } ], - "id": 1062, + "id": 994, "name": "VariableDeclaration", - "src": "477:47:5" + "src": "477:47:4" }, { "attributes": { "constant": false, "name": "commitments", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "mapping(bytes32 => bool)", @@ -4931,34 +5256,34 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1063, + "id": 995, "name": "ElementaryTypeName", - "src": "627:7:5" + "src": "627:7:4" }, { "attributes": { "name": "bool", "type": "bool" }, - "id": 1064, + "id": 996, "name": "ElementaryTypeName", - "src": "638:4:5" + "src": "638:4:4" } ], - "id": 1065, + "id": 997, "name": "Mapping", - "src": "619:24:5" + "src": "619:24:4" } ], - "id": 1066, + "id": 998, "name": "VariableDeclaration", - "src": "619:43:5" + "src": "619:43:4" }, { "attributes": { "constant": false, "name": "verifier", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "contract IVerifier", @@ -4970,23 +5295,23 @@ "attributes": { "contractScope": null, "name": "IVerifier", - "referencedDeclaration": 1041, + "referencedDeclaration": 973, "type": "contract IVerifier" }, - "id": 1067, + "id": 999, "name": "UserDefinedTypeName", - "src": "666:9:5" + "src": "666:9:4" } ], - "id": 1068, + "id": 1000, "name": "VariableDeclaration", - "src": "666:25:5" + "src": "666:25:4" }, { "attributes": { "constant": false, "name": "feeManager", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "contract IFeeManager", @@ -4998,23 +5323,23 @@ "attributes": { "contractScope": null, "name": "IFeeManager", - "referencedDeclaration": 1052, + "referencedDeclaration": 984, "type": "contract IFeeManager" }, - "id": 1069, + "id": 1001, "name": "UserDefinedTypeName", - "src": "695:11:5" + "src": "695:11:4" } ], - "id": 1070, + "id": 1002, "name": "VariableDeclaration", - "src": "695:29:5" + "src": "695:29:4" }, { "attributes": { "constant": false, "name": "operator", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "address", @@ -5028,14 +5353,14 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1071, + "id": 1003, "name": "ElementaryTypeName", - "src": "884:7:5" + "src": "884:7:4" } ], - "id": 1072, + "id": 1004, "name": "VariableDeclaration", - "src": "884:23:5" + "src": "884:23:4" }, { "attributes": { @@ -5051,9 +5376,9 @@ ] }, "children": [], - "id": 1073, + "id": 1005, "name": "ParameterList", - "src": "933:0:5" + "src": "933:0:4" }, { "children": [ @@ -5087,16 +5412,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1074, + "id": 1006, "name": "Identifier", - "src": "939:7:5" + "src": "939:7:4" }, { "attributes": { @@ -5131,18 +5456,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1408, + "referencedDeclaration": 1365, "type": "msg", "value": "msg" }, - "id": 1075, + "id": 1007, "name": "Identifier", - "src": "947:3:5" + "src": "947:3:4" } ], - "id": 1076, + "id": 1008, "name": "MemberAccess", - "src": "947:10:5" + "src": "947:10:4" }, { "attributes": { @@ -5150,18 +5475,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1072, + "referencedDeclaration": 1004, "type": "address", "value": "operator" }, - "id": 1077, + "id": 1009, "name": "Identifier", - "src": "961:8:5" + "src": "961:8:4" } ], - "id": 1078, + "id": 1010, "name": "BinaryOperation", - "src": "947:22:5" + "src": "947:22:4" }, { "attributes": { @@ -5176,34 +5501,34 @@ "type": "literal_string \"Only operator can call this function.\"", "value": "Only operator can call this function." }, - "id": 1079, + "id": 1011, "name": "Literal", - "src": "971:39:5" + "src": "971:39:4" } ], - "id": 1080, + "id": 1012, "name": "FunctionCall", - "src": "939:72:5" + "src": "939:72:4" } ], - "id": 1081, + "id": 1013, "name": "ExpressionStatement", - "src": "939:72:5" + "src": "939:72:4" }, { - "id": 1082, + "id": 1014, "name": "PlaceholderStatement", - "src": "1017:1:5" + "src": "1017:1:4" } ], - "id": 1083, + "id": 1015, "name": "Block", - "src": "933:90:5" + "src": "933:90:4" } ], - "id": 1084, + "id": 1016, "name": "ModifierDefinition", - "src": "911:112:5" + "src": "911:112:4" }, { "attributes": { @@ -5219,7 +5544,7 @@ "constant": false, "indexed": true, "name": "commitment", - "scope": 1092, + "scope": 1024, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -5232,21 +5557,21 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1085, + "id": 1017, "name": "ElementaryTypeName", - "src": "1041:7:5" + "src": "1041:7:4" } ], - "id": 1086, + "id": 1018, "name": "VariableDeclaration", - "src": "1041:26:5" + "src": "1041:26:4" }, { "attributes": { "constant": false, "indexed": false, "name": "leafIndex", - "scope": 1092, + "scope": 1024, "stateVariable": false, "storageLocation": "default", "type": "uint32", @@ -5259,21 +5584,21 @@ "name": "uint32", "type": "uint32" }, - "id": 1087, + "id": 1019, "name": "ElementaryTypeName", - "src": "1069:6:5" + "src": "1069:6:4" } ], - "id": 1088, + "id": 1020, "name": "VariableDeclaration", - "src": "1069:16:5" + "src": "1069:16:4" }, { "attributes": { "constant": false, "indexed": false, "name": "timestamp", - "scope": 1092, + "scope": 1024, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -5286,24 +5611,24 @@ "name": "uint256", "type": "uint256" }, - "id": 1089, + "id": 1021, "name": "ElementaryTypeName", - "src": "1087:7:5" + "src": "1087:7:4" } ], - "id": 1090, + "id": 1022, "name": "VariableDeclaration", - "src": "1087:17:5" + "src": "1087:17:4" } ], - "id": 1091, + "id": 1023, "name": "ParameterList", - "src": "1040:65:5" + "src": "1040:65:4" } ], - "id": 1092, + "id": 1024, "name": "EventDefinition", - "src": "1027:79:5" + "src": "1027:79:4" }, { "attributes": { @@ -5319,7 +5644,7 @@ "constant": false, "indexed": false, "name": "to", - "scope": 1102, + "scope": 1034, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -5333,21 +5658,21 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1093, + "id": 1025, "name": "ElementaryTypeName", - "src": "1126:7:5" + "src": "1126:7:4" } ], - "id": 1094, + "id": 1026, "name": "VariableDeclaration", - "src": "1126:10:5" + "src": "1126:10:4" }, { "attributes": { "constant": false, "indexed": false, "name": "nullifierHash", - "scope": 1102, + "scope": 1034, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -5360,21 +5685,21 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1095, + "id": 1027, "name": "ElementaryTypeName", - "src": "1138:7:5" + "src": "1138:7:4" } ], - "id": 1096, + "id": 1028, "name": "VariableDeclaration", - "src": "1138:21:5" + "src": "1138:21:4" }, { "attributes": { "constant": false, "indexed": true, "name": "relayer", - "scope": 1102, + "scope": 1034, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -5388,21 +5713,21 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1097, + "id": 1029, "name": "ElementaryTypeName", - "src": "1161:7:5" + "src": "1161:7:4" } ], - "id": 1098, + "id": 1030, "name": "VariableDeclaration", - "src": "1161:23:5" + "src": "1161:23:4" }, { "attributes": { "constant": false, "indexed": false, "name": "fee", - "scope": 1102, + "scope": 1034, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -5415,24 +5740,173 @@ "name": "uint256", "type": "uint256" }, - "id": 1099, + "id": 1031, "name": "ElementaryTypeName", - "src": "1186:7:5" + "src": "1186:7:4" } ], - "id": 1100, + "id": 1032, "name": "VariableDeclaration", - "src": "1186:11:5" + "src": "1186:11:4" } ], - "id": 1101, + "id": 1033, "name": "ParameterList", - "src": "1125:73:5" + "src": "1125:73:4" } ], - "id": 1102, + "id": 1034, "name": "EventDefinition", - "src": "1109:90:5" + "src": "1109:90:4" + }, + { + "attributes": { + "anonymous": false, + "documentation": null, + "name": "OwnershipTransferred" + }, + "children": [ + { + "children": [ + { + "attributes": { + "constant": false, + "indexed": true, + "name": "previousOwner", + "scope": 1040, + "stateVariable": false, + "storageLocation": "default", + "type": "address", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "address", + "stateMutability": "nonpayable", + "type": "address" + }, + "id": 1035, + "name": "ElementaryTypeName", + "src": "1229:7:4" + } + ], + "id": 1036, + "name": "VariableDeclaration", + "src": "1229:29:4" + }, + { + "attributes": { + "constant": false, + "indexed": true, + "name": "newOwner", + "scope": 1040, + "stateVariable": false, + "storageLocation": "default", + "type": "address", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "address", + "stateMutability": "nonpayable", + "type": "address" + }, + "id": 1037, + "name": "ElementaryTypeName", + "src": "1260:7:4" + } + ], + "id": 1038, + "name": "VariableDeclaration", + "src": "1260:24:4" + } + ], + "id": 1039, + "name": "ParameterList", + "src": "1228:57:4" + } + ], + "id": 1040, + "name": "EventDefinition", + "src": "1202:84:4" + }, + { + "attributes": { + "anonymous": false, + "documentation": null, + "name": "EncryptedNote" + }, + "children": [ + { + "children": [ + { + "attributes": { + "constant": false, + "indexed": true, + "name": "sender", + "scope": 1046, + "stateVariable": false, + "storageLocation": "default", + "type": "address", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "address", + "stateMutability": "nonpayable", + "type": "address" + }, + "id": 1041, + "name": "ElementaryTypeName", + "src": "1309:7:4" + } + ], + "id": 1042, + "name": "VariableDeclaration", + "src": "1309:22:4" + }, + { + "attributes": { + "constant": false, + "indexed": false, + "name": "encryptedNote", + "scope": 1046, + "stateVariable": false, + "storageLocation": "default", + "type": "bytes", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "bytes", + "type": "bytes" + }, + "id": 1043, + "name": "ElementaryTypeName", + "src": "1333:5:4" + } + ], + "id": 1044, + "name": "VariableDeclaration", + "src": "1333:19:4" + } + ], + "id": 1045, + "name": "ParameterList", + "src": "1308:45:4" + } + ], + "id": 1046, + "name": "EventDefinition", + "src": "1289:65:4" }, { "attributes": { @@ -5441,7 +5915,7 @@ "isConstructor": true, "kind": "constructor", "name": "", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -5453,7 +5927,7 @@ "attributes": { "constant": false, "name": "_verifier", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "contract IVerifier", @@ -5465,23 +5939,23 @@ "attributes": { "contractScope": null, "name": "IVerifier", - "referencedDeclaration": 1041, + "referencedDeclaration": 973, "type": "contract IVerifier" }, - "id": 1103, + "id": 1047, "name": "UserDefinedTypeName", - "src": "1515:9:5" + "src": "1670:9:4" } ], - "id": 1104, + "id": 1048, "name": "VariableDeclaration", - "src": "1515:19:5" + "src": "1670:19:4" }, { "attributes": { "constant": false, "name": "_feeManager", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "contract IFeeManager", @@ -5493,23 +5967,23 @@ "attributes": { "contractScope": null, "name": "IFeeManager", - "referencedDeclaration": 1052, + "referencedDeclaration": 984, "type": "contract IFeeManager" }, - "id": 1105, + "id": 1049, "name": "UserDefinedTypeName", - "src": "1540:11:5" + "src": "1695:11:4" } ], - "id": 1106, + "id": 1050, "name": "VariableDeclaration", - "src": "1540:23:5" + "src": "1695:23:4" }, { "attributes": { "constant": false, "name": "_denomination", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -5522,20 +5996,20 @@ "name": "uint256", "type": "uint256" }, - "id": 1107, + "id": 1051, "name": "ElementaryTypeName", - "src": "1569:7:5" + "src": "1724:7:4" } ], - "id": 1108, + "id": 1052, "name": "VariableDeclaration", - "src": "1569:21:5" + "src": "1724:21:4" }, { "attributes": { "constant": false, "name": "_merkleTreeHeight", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "uint32", @@ -5548,20 +6022,20 @@ "name": "uint32", "type": "uint32" }, - "id": 1109, + "id": 1053, "name": "ElementaryTypeName", - "src": "1596:6:5" + "src": "1751:6:4" } ], - "id": 1110, + "id": 1054, "name": "VariableDeclaration", - "src": "1596:24:5" + "src": "1751:24:4" }, { "attributes": { "constant": false, "name": "_operator", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -5575,19 +6049,19 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1111, + "id": 1055, "name": "ElementaryTypeName", - "src": "1626:7:5" + "src": "1781:7:4" } ], - "id": 1112, + "id": 1056, "name": "VariableDeclaration", - "src": "1626:17:5" + "src": "1781:17:4" } ], - "id": 1113, + "id": 1057, "name": "ParameterList", - "src": "1509:138:5" + "src": "1664:138:4" }, { "attributes": { @@ -5596,9 +6070,9 @@ ] }, "children": [], - "id": 1117, + "id": 1061, "name": "ParameterList", - "src": "1696:0:5" + "src": "1851:0:4" }, { "children": [ @@ -5608,13 +6082,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 838, + "referencedDeclaration": 770, "type": "type(contract MerkleTreeWithHistory)", "value": "MerkleTreeWithHistory" }, - "id": 1114, + "id": 1058, "name": "Identifier", - "src": "1648:21:5" + "src": "1803:21:4" }, { "attributes": { @@ -5622,18 +6096,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1110, + "referencedDeclaration": 1054, "type": "uint32", "value": "_merkleTreeHeight" }, - "id": 1115, + "id": 1059, "name": "Identifier", - "src": "1670:17:5" + "src": "1825:17:4" } ], - "id": 1116, + "id": 1060, "name": "ModifierInvocation", - "src": "1648:40:5" + "src": "1803:40:4" }, { "children": [ @@ -5667,16 +6141,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1118, + "id": 1062, "name": "Identifier", - "src": "1702:7:5" + "src": "1857:7:4" }, { "attributes": { @@ -5699,13 +6173,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1108, + "referencedDeclaration": 1052, "type": "uint256", "value": "_denomination" }, - "id": 1119, + "id": 1063, "name": "Identifier", - "src": "1710:13:5" + "src": "1865:13:4" }, { "attributes": { @@ -5720,14 +6194,14 @@ "type": "int_const 0", "value": "0" }, - "id": 1120, + "id": 1064, "name": "Literal", - "src": "1726:1:5" + "src": "1881:1:4" } ], - "id": 1121, + "id": 1065, "name": "BinaryOperation", - "src": "1710:17:5" + "src": "1865:17:4" }, { "attributes": { @@ -5742,19 +6216,19 @@ "type": "literal_string \"denomination should be greater than 0\"", "value": "denomination should be greater than 0" }, - "id": 1122, + "id": 1066, "name": "Literal", - "src": "1729:39:5" + "src": "1884:39:4" } ], - "id": 1123, + "id": 1067, "name": "FunctionCall", - "src": "1702:67:5" + "src": "1857:67:4" } ], - "id": 1124, + "id": 1068, "name": "ExpressionStatement", - "src": "1702:67:5" + "src": "1857:67:4" }, { "children": [ @@ -5775,13 +6249,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1068, + "referencedDeclaration": 1000, "type": "contract IVerifier", "value": "verifier" }, - "id": 1125, + "id": 1069, "name": "Identifier", - "src": "1775:8:5" + "src": "1930:8:4" }, { "attributes": { @@ -5789,23 +6263,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1104, + "referencedDeclaration": 1048, "type": "contract IVerifier", "value": "_verifier" }, - "id": 1126, + "id": 1070, "name": "Identifier", - "src": "1786:9:5" + "src": "1941:9:4" } ], - "id": 1127, + "id": 1071, "name": "Assignment", - "src": "1775:20:5" + "src": "1930:20:4" } ], - "id": 1128, + "id": 1072, "name": "ExpressionStatement", - "src": "1775:20:5" + "src": "1930:20:4" }, { "children": [ @@ -5826,13 +6300,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1070, + "referencedDeclaration": 1002, "type": "contract IFeeManager", "value": "feeManager" }, - "id": 1129, + "id": 1073, "name": "Identifier", - "src": "1801:10:5" + "src": "1956:10:4" }, { "attributes": { @@ -5840,23 +6314,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1106, + "referencedDeclaration": 1050, "type": "contract IFeeManager", "value": "_feeManager" }, - "id": 1130, + "id": 1074, "name": "Identifier", - "src": "1814:11:5" + "src": "1969:11:4" } ], - "id": 1131, + "id": 1075, "name": "Assignment", - "src": "1801:24:5" + "src": "1956:24:4" } ], - "id": 1132, + "id": 1076, "name": "ExpressionStatement", - "src": "1801:24:5" + "src": "1956:24:4" }, { "children": [ @@ -5877,13 +6351,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1072, + "referencedDeclaration": 1004, "type": "address", "value": "operator" }, - "id": 1133, + "id": 1077, "name": "Identifier", - "src": "1831:8:5" + "src": "1986:8:4" }, { "attributes": { @@ -5891,23 +6365,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1112, + "referencedDeclaration": 1056, "type": "address", "value": "_operator" }, - "id": 1134, + "id": 1078, "name": "Identifier", - "src": "1842:9:5" + "src": "1997:9:4" } ], - "id": 1135, + "id": 1079, "name": "Assignment", - "src": "1831:20:5" + "src": "1986:20:4" } ], - "id": 1136, + "id": 1080, "name": "ExpressionStatement", - "src": "1831:20:5" + "src": "1986:20:4" }, { "children": [ @@ -5928,13 +6402,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1058, + "referencedDeclaration": 990, "type": "uint256", "value": "denomination" }, - "id": 1137, + "id": 1081, "name": "Identifier", - "src": "1857:12:5" + "src": "2012:12:4" }, { "attributes": { @@ -5942,33 +6416,33 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1108, + "referencedDeclaration": 1052, "type": "uint256", "value": "_denomination" }, - "id": 1138, + "id": 1082, "name": "Identifier", - "src": "1872:13:5" + "src": "2027:13:4" } ], - "id": 1139, + "id": 1083, "name": "Assignment", - "src": "1857:28:5" + "src": "2012:28:4" } ], - "id": 1140, + "id": 1084, "name": "ExpressionStatement", - "src": "1857:28:5" + "src": "2012:28:4" } ], - "id": 1141, + "id": 1085, "name": "Block", - "src": "1696:194:5" + "src": "1851:194:4" } ], - "id": 1142, + "id": 1086, "name": "FunctionDefinition", - "src": "1498:392:5" + "src": "1653:392:4" }, { "attributes": { @@ -5977,7 +6451,7 @@ "isConstructor": false, "kind": "function", "name": "deposit", - "scope": 1363, + "scope": 1320, "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -5989,7 +6463,7 @@ "attributes": { "constant": false, "name": "_commitment", - "scope": 1180, + "scope": 1132, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -6002,19 +6476,45 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1143, + "id": 1087, "name": "ElementaryTypeName", - "src": "2155:7:5" + "src": "2310:7:4" } ], - "id": 1144, + "id": 1088, "name": "VariableDeclaration", - "src": "2155:19:5" + "src": "2310:19:4" + }, + { + "attributes": { + "constant": false, + "name": "_encryptedNote", + "scope": 1132, + "stateVariable": false, + "storageLocation": "calldata", + "type": "bytes", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "bytes", + "type": "bytes" + }, + "id": 1089, + "name": "ElementaryTypeName", + "src": "2331:5:4" + } + ], + "id": 1090, + "name": "VariableDeclaration", + "src": "2331:29:4" } ], - "id": 1145, + "id": 1091, "name": "ParameterList", - "src": "2154:21:5" + "src": "2309:52:4" }, { "attributes": { @@ -6023,9 +6523,9 @@ ] }, "children": [], - "id": 1148, + "id": 1094, "name": "ParameterList", - "src": "2206:0:5" + "src": "2392:0:4" }, { "attributes": { @@ -6038,18 +6538,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1392, + "referencedDeclaration": 1349, "type": "modifier ()", "value": "nonReentrant" }, - "id": 1146, + "id": 1092, "name": "Identifier", - "src": "2193:12:5" + "src": "2379:12:4" } ], - "id": 1147, + "id": 1093, "name": "ModifierInvocation", - "src": "2193:12:5" + "src": "2379:12:4" }, { "children": [ @@ -6083,16 +6583,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1149, + "id": 1095, "name": "Identifier", - "src": "2212:7:5" + "src": "2398:7:4" }, { "attributes": { @@ -6122,13 +6622,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1066, + "referencedDeclaration": 998, "type": "mapping(bytes32 => bool)", "value": "commitments" }, - "id": 1150, + "id": 1096, "name": "Identifier", - "src": "2221:11:5" + "src": "2407:11:4" }, { "attributes": { @@ -6136,23 +6636,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1144, + "referencedDeclaration": 1088, "type": "bytes32", "value": "_commitment" }, - "id": 1151, + "id": 1097, "name": "Identifier", - "src": "2233:11:5" + "src": "2419:11:4" } ], - "id": 1152, + "id": 1098, "name": "IndexAccess", - "src": "2221:24:5" + "src": "2407:24:4" } ], - "id": 1153, + "id": 1099, "name": "UnaryOperation", - "src": "2220:25:5" + "src": "2406:25:4" }, { "attributes": { @@ -6167,24 +6667,24 @@ "type": "literal_string \"The commitment has been submitted\"", "value": "The commitment has been submitted" }, - "id": 1154, + "id": 1100, "name": "Literal", - "src": "2247:35:5" + "src": "2433:35:4" } ], - "id": 1155, + "id": 1101, "name": "FunctionCall", - "src": "2212:71:5" + "src": "2398:71:4" } ], - "id": 1156, + "id": 1102, "name": "ExpressionStatement", - "src": "2212:71:5" + "src": "2398:71:4" }, { "attributes": { "assignments": [ - 1158 + 1104 ] }, "children": [ @@ -6192,7 +6692,7 @@ "attributes": { "constant": false, "name": "insertedIndex", - "scope": 1179, + "scope": 1131, "stateVariable": false, "storageLocation": "default", "type": "uint32", @@ -6205,14 +6705,14 @@ "name": "uint32", "type": "uint32" }, - "id": 1157, + "id": 1103, "name": "ElementaryTypeName", - "src": "2290:6:5" + "src": "2476:6:4" } ], - "id": 1158, + "id": 1104, "name": "VariableDeclaration", - "src": "2290:20:5" + "src": "2476:20:4" }, { "attributes": { @@ -6240,13 +6740,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 780, + "referencedDeclaration": 712, "type": "function (bytes32) returns (uint32)", "value": "_insert" }, - "id": 1159, + "id": 1105, "name": "Identifier", - "src": "2313:7:5" + "src": "2499:7:4" }, { "attributes": { @@ -6254,23 +6754,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1144, + "referencedDeclaration": 1088, "type": "bytes32", "value": "_commitment" }, - "id": 1160, + "id": 1106, "name": "Identifier", - "src": "2321:11:5" + "src": "2507:11:4" } ], - "id": 1161, + "id": 1107, "name": "FunctionCall", - "src": "2313:20:5" + "src": "2499:20:4" } ], - "id": 1162, + "id": 1108, "name": "VariableDeclarationStatement", - "src": "2290:43:5" + "src": "2476:43:4" }, { "children": [ @@ -6301,13 +6801,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1066, + "referencedDeclaration": 998, "type": "mapping(bytes32 => bool)", "value": "commitments" }, - "id": 1163, + "id": 1109, "name": "Identifier", - "src": "2339:11:5" + "src": "2525:11:4" }, { "attributes": { @@ -6315,18 +6815,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1144, + "referencedDeclaration": 1088, "type": "bytes32", "value": "_commitment" }, - "id": 1164, + "id": 1110, "name": "Identifier", - "src": "2351:11:5" + "src": "2537:11:4" } ], - "id": 1165, + "id": 1111, "name": "IndexAccess", - "src": "2339:24:5" + "src": "2525:24:4" }, { "attributes": { @@ -6341,19 +6841,19 @@ "type": "bool", "value": "true" }, - "id": 1166, + "id": 1112, "name": "Literal", - "src": "2366:4:5" + "src": "2552:4:4" } ], - "id": 1167, + "id": 1113, "name": "Assignment", - "src": "2339:31:5" + "src": "2525:31:4" } ], - "id": 1168, + "id": 1114, "name": "ExpressionStatement", - "src": "2339:31:5" + "src": "2525:31:4" }, { "children": [ @@ -6383,23 +6883,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1183, + "referencedDeclaration": 1135, "type": "function ()", "value": "_processDeposit" }, - "id": 1169, + "id": 1115, "name": "Identifier", - "src": "2376:15:5" + "src": "2562:15:4" } ], - "id": 1170, + "id": 1116, "name": "FunctionCall", - "src": "2376:17:5" + "src": "2562:17:4" } ], - "id": 1171, + "id": 1117, "name": "ExpressionStatement", - "src": "2376:17:5" + "src": "2562:17:4" }, { "children": [ @@ -6437,13 +6937,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1092, + "referencedDeclaration": 1024, "type": "function (bytes32,uint32,uint256)", "value": "Deposit" }, - "id": 1172, + "id": 1118, "name": "Identifier", - "src": "2405:7:5" + "src": "2591:7:4" }, { "attributes": { @@ -6451,13 +6951,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1144, + "referencedDeclaration": 1088, "type": "bytes32", "value": "_commitment" }, - "id": 1173, + "id": 1119, "name": "Identifier", - "src": "2413:11:5" + "src": "2599:11:4" }, { "attributes": { @@ -6465,13 +6965,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1158, + "referencedDeclaration": 1104, "type": "uint32", "value": "insertedIndex" }, - "id": 1174, + "id": 1120, "name": "Identifier", - "src": "2426:13:5" + "src": "2612:13:4" }, { "attributes": { @@ -6491,38 +6991,133 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1398, + "referencedDeclaration": 1355, "type": "block", "value": "block" }, - "id": 1175, + "id": 1121, "name": "Identifier", - "src": "2441:5:5" + "src": "2627:5:4" } ], - "id": 1176, + "id": 1122, "name": "MemberAccess", - "src": "2441:15:5" + "src": "2627:15:4" } ], - "id": 1177, + "id": 1123, "name": "FunctionCall", - "src": "2405:52:5" + "src": "2591:52:4" } ], - "id": 1178, + "id": 1124, "name": "EmitStatement", - "src": "2400:57:5" + "src": "2586:57:4" + }, + { + "children": [ + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "isStructConstructorCall": false, + "lValueRequested": false, + "names": [ + null + ], + "type": "tuple()", + "type_conversion": false + }, + "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + ], + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1046, + "type": "function (address,bytes memory)", + "value": "EncryptedNote" + }, + "id": 1125, + "name": "Identifier", + "src": "2654:13:4" + }, + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "member_name": "sender", + "referencedDeclaration": null, + "type": "address payable" + }, + "children": [ + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1365, + "type": "msg", + "value": "msg" + }, + "id": 1126, + "name": "Identifier", + "src": "2668:3:4" + } + ], + "id": 1127, + "name": "MemberAccess", + "src": "2668:10:4" + }, + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1090, + "type": "bytes calldata", + "value": "_encryptedNote" + }, + "id": 1128, + "name": "Identifier", + "src": "2680:14:4" + } + ], + "id": 1129, + "name": "FunctionCall", + "src": "2654:41:4" + } + ], + "id": 1130, + "name": "EmitStatement", + "src": "2649:46:4" } ], - "id": 1179, + "id": 1131, "name": "Block", - "src": "2206:256:5" + "src": "2392:308:4" } ], - "id": 1180, + "id": 1132, "name": "FunctionDefinition", - "src": "2138:324:5" + "src": "2293:407:4" }, { "attributes": { @@ -6535,7 +7130,7 @@ null ], "name": "_processDeposit", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" @@ -6548,9 +7143,9 @@ ] }, "children": [], - "id": 1181, + "id": 1133, "name": "ParameterList", - "src": "2549:2:5" + "src": "2787:2:4" }, { "attributes": { @@ -6559,14 +7154,14 @@ ] }, "children": [], - "id": 1182, + "id": 1134, "name": "ParameterList", - "src": "2560:0:5" + "src": "2798:0:4" } ], - "id": 1183, + "id": 1135, "name": "FunctionDefinition", - "src": "2525:36:5" + "src": "2763:36:4" }, { "attributes": { @@ -6575,7 +7170,7 @@ "isConstructor": false, "kind": "function", "name": "withdraw", - "scope": 1363, + "scope": 1320, "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -6587,7 +7182,7 @@ "attributes": { "constant": false, "name": "_proof", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "calldata", "type": "bytes", @@ -6600,20 +7195,20 @@ "name": "bytes", "type": "bytes" }, - "id": 1184, + "id": 1136, "name": "ElementaryTypeName", - "src": "2976:5:5" + "src": "3214:5:4" } ], - "id": 1185, + "id": 1137, "name": "VariableDeclaration", - "src": "2976:21:5" + "src": "3214:21:4" }, { "attributes": { "constant": false, "name": "_root", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -6626,20 +7221,20 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1186, + "id": 1138, "name": "ElementaryTypeName", - "src": "2999:7:5" + "src": "3237:7:4" } ], - "id": 1187, + "id": 1139, "name": "VariableDeclaration", - "src": "2999:13:5" + "src": "3237:13:4" }, { "attributes": { "constant": false, "name": "_nullifierHash", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -6652,20 +7247,20 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1188, + "id": 1140, "name": "ElementaryTypeName", - "src": "3014:7:5" + "src": "3252:7:4" } ], - "id": 1189, + "id": 1141, "name": "VariableDeclaration", - "src": "3014:22:5" + "src": "3252:22:4" }, { "attributes": { "constant": false, "name": "_recipient", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -6679,20 +7274,20 @@ "stateMutability": "payable", "type": "address payable" }, - "id": 1190, + "id": 1142, "name": "ElementaryTypeName", - "src": "3038:15:5" + "src": "3276:15:4" } ], - "id": 1191, + "id": 1143, "name": "VariableDeclaration", - "src": "3038:26:5" + "src": "3276:26:4" }, { "attributes": { "constant": false, "name": "_relayer", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -6706,20 +7301,20 @@ "stateMutability": "payable", "type": "address payable" }, - "id": 1192, + "id": 1144, "name": "ElementaryTypeName", - "src": "3066:15:5" + "src": "3304:15:4" } ], - "id": 1193, + "id": 1145, "name": "VariableDeclaration", - "src": "3066:24:5" + "src": "3304:24:4" }, { "attributes": { "constant": false, "name": "_fee", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -6732,20 +7327,20 @@ "name": "uint256", "type": "uint256" }, - "id": 1194, + "id": 1146, "name": "ElementaryTypeName", - "src": "3092:7:5" + "src": "3330:7:4" } ], - "id": 1195, + "id": 1147, "name": "VariableDeclaration", - "src": "3092:12:5" + "src": "3330:12:4" }, { "attributes": { "constant": false, "name": "_refund", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -6758,19 +7353,19 @@ "name": "uint256", "type": "uint256" }, - "id": 1196, + "id": 1148, "name": "ElementaryTypeName", - "src": "3106:7:5" + "src": "3344:7:4" } ], - "id": 1197, + "id": 1149, "name": "VariableDeclaration", - "src": "3106:15:5" + "src": "3344:15:4" } ], - "id": 1198, + "id": 1150, "name": "ParameterList", - "src": "2975:147:5" + "src": "3213:147:4" }, { "attributes": { @@ -6779,9 +7374,9 @@ ] }, "children": [], - "id": 1201, + "id": 1153, "name": "ParameterList", - "src": "3153:0:5" + "src": "3391:0:4" }, { "attributes": { @@ -6794,18 +7389,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1392, + "referencedDeclaration": 1349, "type": "modifier ()", "value": "nonReentrant" }, - "id": 1199, + "id": 1151, "name": "Identifier", - "src": "3140:12:5" + "src": "3378:12:4" } ], - "id": 1200, + "id": 1152, "name": "ModifierInvocation", - "src": "3140:12:5" + "src": "3378:12:4" }, { "children": [ @@ -6839,16 +7434,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1202, + "id": 1154, "name": "Identifier", - "src": "3159:7:5" + "src": "3397:7:4" }, { "attributes": { @@ -6871,13 +7466,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1195, + "referencedDeclaration": 1147, "type": "uint256", "value": "_fee" }, - "id": 1203, + "id": 1155, "name": "Identifier", - "src": "3167:4:5" + "src": "3405:4:4" }, { "attributes": { @@ -6885,18 +7480,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1058, + "referencedDeclaration": 990, "type": "uint256", "value": "denomination" }, - "id": 1204, + "id": 1156, "name": "Identifier", - "src": "3175:12:5" + "src": "3413:12:4" } ], - "id": 1205, + "id": 1157, "name": "BinaryOperation", - "src": "3167:20:5" + "src": "3405:20:4" }, { "attributes": { @@ -6911,19 +7506,19 @@ "type": "literal_string \"Fee exceeds transfer value\"", "value": "Fee exceeds transfer value" }, - "id": 1206, + "id": 1158, "name": "Literal", - "src": "3189:28:5" + "src": "3427:28:4" } ], - "id": 1207, + "id": 1159, "name": "FunctionCall", - "src": "3159:59:5" + "src": "3397:59:4" } ], - "id": 1208, + "id": 1160, "name": "ExpressionStatement", - "src": "3159:59:5" + "src": "3397:59:4" }, { "children": [ @@ -6955,16 +7550,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1209, + "id": 1161, "name": "Identifier", - "src": "3224:7:5" + "src": "3462:7:4" }, { "attributes": { @@ -6994,13 +7589,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1062, + "referencedDeclaration": 994, "type": "mapping(bytes32 => bool)", "value": "nullifierHashes" }, - "id": 1210, + "id": 1162, "name": "Identifier", - "src": "3233:15:5" + "src": "3471:15:4" }, { "attributes": { @@ -7008,23 +7603,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1189, + "referencedDeclaration": 1141, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1211, + "id": 1163, "name": "Identifier", - "src": "3249:14:5" + "src": "3487:14:4" } ], - "id": 1212, + "id": 1164, "name": "IndexAccess", - "src": "3233:31:5" + "src": "3471:31:4" } ], - "id": 1213, + "id": 1165, "name": "UnaryOperation", - "src": "3232:32:5" + "src": "3470:32:4" }, { "attributes": { @@ -7039,19 +7634,19 @@ "type": "literal_string \"The note has been already spent\"", "value": "The note has been already spent" }, - "id": 1214, + "id": 1166, "name": "Literal", - "src": "3266:33:5" + "src": "3504:33:4" } ], - "id": 1215, + "id": 1167, "name": "FunctionCall", - "src": "3224:76:5" + "src": "3462:76:4" } ], - "id": 1216, + "id": 1168, "name": "ExpressionStatement", - "src": "3224:76:5" + "src": "3462:76:4" }, { "children": [ @@ -7083,16 +7678,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1217, + "id": 1169, "name": "Identifier", - "src": "3306:7:5" + "src": "3544:7:4" }, { "attributes": { @@ -7120,13 +7715,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 827, + "referencedDeclaration": 759, "type": "function (bytes32) view returns (bool)", "value": "isKnownRoot" }, - "id": 1218, + "id": 1170, "name": "Identifier", - "src": "3314:11:5" + "src": "3552:11:4" }, { "attributes": { @@ -7134,18 +7729,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1187, + "referencedDeclaration": 1139, "type": "bytes32", "value": "_root" }, - "id": 1219, + "id": 1171, "name": "Identifier", - "src": "3326:5:5" + "src": "3564:5:4" } ], - "id": 1220, + "id": 1172, "name": "FunctionCall", - "src": "3314:18:5" + "src": "3552:18:4" }, { "attributes": { @@ -7160,19 +7755,19 @@ "type": "literal_string \"Cannot find your merkle root\"", "value": "Cannot find your merkle root" }, - "id": 1221, + "id": 1173, "name": "Literal", - "src": "3334:30:5" + "src": "3572:30:4" } ], - "id": 1222, + "id": 1174, "name": "FunctionCall", - "src": "3306:59:5" + "src": "3544:59:4" } ], - "id": 1223, + "id": 1175, "name": "ExpressionStatement", - "src": "3306:59:5" + "src": "3544:59:4" }, { "children": [ @@ -7204,16 +7799,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1224, + "id": 1176, "name": "Identifier", - "src": "3404:7:5" + "src": "3642:7:4" }, { "attributes": { @@ -7247,7 +7842,7 @@ "isPure": false, "lValueRequested": false, "member_name": "verifyProof", - "referencedDeclaration": 1040, + "referencedDeclaration": 972, "type": "function (bytes memory,uint256[6] memory) external returns (bool)" }, "children": [ @@ -7257,18 +7852,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1068, + "referencedDeclaration": 1000, "type": "contract IVerifier", "value": "verifier" }, - "id": 1225, + "id": 1177, "name": "Identifier", - "src": "3412:8:5" + "src": "3650:8:4" } ], - "id": 1226, + "id": 1178, "name": "MemberAccess", - "src": "3412:20:5" + "src": "3650:20:4" }, { "attributes": { @@ -7276,13 +7871,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1185, + "referencedDeclaration": 1137, "type": "bytes calldata", "value": "_proof" }, - "id": 1227, + "id": 1179, "name": "Identifier", - "src": "3433:6:5" + "src": "3671:6:4" }, { "attributes": { @@ -7325,9 +7920,9 @@ "type": "type(uint256)", "value": "uint256" }, - "id": 1228, + "id": 1180, "name": "ElementaryTypeNameExpression", - "src": "3442:7:5" + "src": "3680:7:4" }, { "attributes": { @@ -7335,18 +7930,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1187, + "referencedDeclaration": 1139, "type": "bytes32", "value": "_root" }, - "id": 1229, + "id": 1181, "name": "Identifier", - "src": "3450:5:5" + "src": "3688:5:4" } ], - "id": 1230, + "id": 1182, "name": "FunctionCall", - "src": "3442:14:5" + "src": "3680:14:4" }, { "attributes": { @@ -7378,9 +7973,9 @@ "type": "type(uint256)", "value": "uint256" }, - "id": 1231, + "id": 1183, "name": "ElementaryTypeNameExpression", - "src": "3458:7:5" + "src": "3696:7:4" }, { "attributes": { @@ -7388,18 +7983,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1189, + "referencedDeclaration": 1141, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1232, + "id": 1184, "name": "Identifier", - "src": "3466:14:5" + "src": "3704:14:4" } ], - "id": 1233, + "id": 1185, "name": "FunctionCall", - "src": "3458:23:5" + "src": "3696:23:4" }, { "attributes": { @@ -7431,9 +8026,9 @@ "type": "type(uint256)", "value": "uint256" }, - "id": 1234, + "id": 1186, "name": "ElementaryTypeNameExpression", - "src": "3483:7:5" + "src": "3721:7:4" }, { "attributes": { @@ -7441,18 +8036,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1191, + "referencedDeclaration": 1143, "type": "address payable", "value": "_recipient" }, - "id": 1235, + "id": 1187, "name": "Identifier", - "src": "3491:10:5" + "src": "3729:10:4" } ], - "id": 1236, + "id": 1188, "name": "FunctionCall", - "src": "3483:19:5" + "src": "3721:19:4" }, { "attributes": { @@ -7484,9 +8079,9 @@ "type": "type(uint256)", "value": "uint256" }, - "id": 1237, + "id": 1189, "name": "ElementaryTypeNameExpression", - "src": "3504:7:5" + "src": "3742:7:4" }, { "attributes": { @@ -7494,18 +8089,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1193, + "referencedDeclaration": 1145, "type": "address payable", "value": "_relayer" }, - "id": 1238, + "id": 1190, "name": "Identifier", - "src": "3512:8:5" + "src": "3750:8:4" } ], - "id": 1239, + "id": 1191, "name": "FunctionCall", - "src": "3504:17:5" + "src": "3742:17:4" }, { "attributes": { @@ -7513,13 +8108,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1195, + "referencedDeclaration": 1147, "type": "uint256", "value": "_fee" }, - "id": 1240, + "id": 1192, "name": "Identifier", - "src": "3523:4:5" + "src": "3761:4:4" }, { "attributes": { @@ -7527,23 +8122,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1197, + "referencedDeclaration": 1149, "type": "uint256", "value": "_refund" }, - "id": 1241, + "id": 1193, "name": "Identifier", - "src": "3529:7:5" + "src": "3767:7:4" } ], - "id": 1242, + "id": 1194, "name": "TupleExpression", - "src": "3441:96:5" + "src": "3679:96:4" } ], - "id": 1243, + "id": 1195, "name": "FunctionCall", - "src": "3412:126:5" + "src": "3650:126:4" }, { "attributes": { @@ -7558,19 +8153,19 @@ "type": "literal_string \"Invalid withdraw proof\"", "value": "Invalid withdraw proof" }, - "id": 1244, + "id": 1196, "name": "Literal", - "src": "3540:24:5" + "src": "3778:24:4" } ], - "id": 1245, + "id": 1197, "name": "FunctionCall", - "src": "3404:161:5" + "src": "3642:161:4" } ], - "id": 1246, + "id": 1198, "name": "ExpressionStatement", - "src": "3404:161:5" + "src": "3642:161:4" }, { "children": [ @@ -7601,13 +8196,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1062, + "referencedDeclaration": 994, "type": "mapping(bytes32 => bool)", "value": "nullifierHashes" }, - "id": 1247, + "id": 1199, "name": "Identifier", - "src": "3572:15:5" + "src": "3810:15:4" }, { "attributes": { @@ -7615,18 +8210,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1189, + "referencedDeclaration": 1141, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1248, + "id": 1200, "name": "Identifier", - "src": "3588:14:5" + "src": "3826:14:4" } ], - "id": 1249, + "id": 1201, "name": "IndexAccess", - "src": "3572:31:5" + "src": "3810:31:4" }, { "attributes": { @@ -7641,19 +8236,19 @@ "type": "bool", "value": "true" }, - "id": 1250, + "id": 1202, "name": "Literal", - "src": "3606:4:5" + "src": "3844:4:4" } ], - "id": 1251, + "id": 1203, "name": "Assignment", - "src": "3572:38:5" + "src": "3810:38:4" } ], - "id": 1252, + "id": 1204, "name": "ExpressionStatement", - "src": "3572:38:5" + "src": "3810:38:4" }, { "children": [ @@ -7695,13 +8290,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1279, + "referencedDeclaration": 1231, "type": "function (address payable,address payable,uint256,uint256)", "value": "_processWithdraw" }, - "id": 1253, + "id": 1205, "name": "Identifier", - "src": "3616:16:5" + "src": "3854:16:4" }, { "attributes": { @@ -7709,13 +8304,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1191, + "referencedDeclaration": 1143, "type": "address payable", "value": "_recipient" }, - "id": 1254, + "id": 1206, "name": "Identifier", - "src": "3633:10:5" + "src": "3871:10:4" }, { "attributes": { @@ -7723,13 +8318,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1193, + "referencedDeclaration": 1145, "type": "address payable", "value": "_relayer" }, - "id": 1255, + "id": 1207, "name": "Identifier", - "src": "3645:8:5" + "src": "3883:8:4" }, { "attributes": { @@ -7737,13 +8332,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1195, + "referencedDeclaration": 1147, "type": "uint256", "value": "_fee" }, - "id": 1256, + "id": 1208, "name": "Identifier", - "src": "3655:4:5" + "src": "3893:4:4" }, { "attributes": { @@ -7751,23 +8346,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1197, + "referencedDeclaration": 1149, "type": "uint256", "value": "_refund" }, - "id": 1257, + "id": 1209, "name": "Identifier", - "src": "3661:7:5" + "src": "3899:7:4" } ], - "id": 1258, + "id": 1210, "name": "FunctionCall", - "src": "3616:53:5" + "src": "3854:53:4" } ], - "id": 1259, + "id": 1211, "name": "ExpressionStatement", - "src": "3616:53:5" + "src": "3854:53:4" }, { "children": [ @@ -7809,13 +8404,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1102, + "referencedDeclaration": 1034, "type": "function (address,bytes32,address,uint256)", "value": "Withdrawal" }, - "id": 1260, + "id": 1212, "name": "Identifier", - "src": "3680:10:5" + "src": "3918:10:4" }, { "attributes": { @@ -7823,13 +8418,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1191, + "referencedDeclaration": 1143, "type": "address payable", "value": "_recipient" }, - "id": 1261, + "id": 1213, "name": "Identifier", - "src": "3691:10:5" + "src": "3929:10:4" }, { "attributes": { @@ -7837,13 +8432,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1189, + "referencedDeclaration": 1141, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1262, + "id": 1214, "name": "Identifier", - "src": "3703:14:5" + "src": "3941:14:4" }, { "attributes": { @@ -7851,13 +8446,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1193, + "referencedDeclaration": 1145, "type": "address payable", "value": "_relayer" }, - "id": 1263, + "id": 1215, "name": "Identifier", - "src": "3719:8:5" + "src": "3957:8:4" }, { "attributes": { @@ -7865,33 +8460,33 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1195, + "referencedDeclaration": 1147, "type": "uint256", "value": "_fee" }, - "id": 1264, + "id": 1216, "name": "Identifier", - "src": "3729:4:5" + "src": "3967:4:4" } ], - "id": 1265, + "id": 1217, "name": "FunctionCall", - "src": "3680:54:5" + "src": "3918:54:4" } ], - "id": 1266, + "id": 1218, "name": "EmitStatement", - "src": "3675:59:5" + "src": "3913:59:4" } ], - "id": 1267, + "id": 1219, "name": "Block", - "src": "3153:586:5" + "src": "3391:586:4" } ], - "id": 1268, + "id": 1220, "name": "FunctionDefinition", - "src": "2958:781:5" + "src": "3196:781:4" }, { "attributes": { @@ -7904,7 +8499,7 @@ null ], "name": "_processWithdraw", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" @@ -7916,7 +8511,7 @@ "attributes": { "constant": false, "name": "_recipient", - "scope": 1279, + "scope": 1231, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -7930,20 +8525,20 @@ "stateMutability": "payable", "type": "address payable" }, - "id": 1269, + "id": 1221, "name": "ElementaryTypeName", - "src": "3828:15:5" + "src": "4066:15:4" } ], - "id": 1270, + "id": 1222, "name": "VariableDeclaration", - "src": "3828:26:5" + "src": "4066:26:4" }, { "attributes": { "constant": false, "name": "_relayer", - "scope": 1279, + "scope": 1231, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -7957,20 +8552,20 @@ "stateMutability": "payable", "type": "address payable" }, - "id": 1271, + "id": 1223, "name": "ElementaryTypeName", - "src": "3856:15:5" + "src": "4094:15:4" } ], - "id": 1272, + "id": 1224, "name": "VariableDeclaration", - "src": "3856:24:5" + "src": "4094:24:4" }, { "attributes": { "constant": false, "name": "_relayer_fee", - "scope": 1279, + "scope": 1231, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -7983,20 +8578,20 @@ "name": "uint256", "type": "uint256" }, - "id": 1273, + "id": 1225, "name": "ElementaryTypeName", - "src": "3882:7:5" + "src": "4120:7:4" } ], - "id": 1274, + "id": 1226, "name": "VariableDeclaration", - "src": "3882:20:5" + "src": "4120:20:4" }, { "attributes": { "constant": false, "name": "_refund", - "scope": 1279, + "scope": 1231, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -8009,19 +8604,19 @@ "name": "uint256", "type": "uint256" }, - "id": 1275, + "id": 1227, "name": "ElementaryTypeName", - "src": "3904:7:5" + "src": "4142:7:4" } ], - "id": 1276, + "id": 1228, "name": "VariableDeclaration", - "src": "3904:15:5" + "src": "4142:15:4" } ], - "id": 1277, + "id": 1229, "name": "ParameterList", - "src": "3827:93:5" + "src": "4065:93:4" }, { "attributes": { @@ -8030,14 +8625,14 @@ ] }, "children": [], - "id": 1278, + "id": 1230, "name": "ParameterList", - "src": "3929:0:5" + "src": "4167:0:4" } ], - "id": 1279, + "id": 1231, "name": "FunctionDefinition", - "src": "3802:128:5" + "src": "4040:128:4" }, { "attributes": { @@ -8049,7 +8644,7 @@ null ], "name": "isSpent", - "scope": 1363, + "scope": 1320, "stateMutability": "view", "superFunction": null, "visibility": "public" @@ -8061,7 +8656,7 @@ "attributes": { "constant": false, "name": "_nullifierHash", - "scope": 1291, + "scope": 1243, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -8074,19 +8669,19 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1280, + "id": 1232, "name": "ElementaryTypeName", - "src": "3997:7:5" + "src": "4235:7:4" } ], - "id": 1281, + "id": 1233, "name": "VariableDeclaration", - "src": "3997:22:5" + "src": "4235:22:4" } ], - "id": 1282, + "id": 1234, "name": "ParameterList", - "src": "3996:24:5" + "src": "4234:24:4" }, { "children": [ @@ -8094,7 +8689,7 @@ "attributes": { "constant": false, "name": "", - "scope": 1291, + "scope": 1243, "stateVariable": false, "storageLocation": "default", "type": "bool", @@ -8107,25 +8702,25 @@ "name": "bool", "type": "bool" }, - "id": 1283, + "id": 1235, "name": "ElementaryTypeName", - "src": "4041:4:5" + "src": "4279:4:4" } ], - "id": 1284, + "id": 1236, "name": "VariableDeclaration", - "src": "4041:4:5" + "src": "4279:4:4" } ], - "id": 1285, + "id": 1237, "name": "ParameterList", - "src": "4040:6:5" + "src": "4278:6:4" }, { "children": [ { "attributes": { - "functionReturnParameters": 1285 + "functionReturnParameters": 1237 }, "children": [ { @@ -8144,13 +8739,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1062, + "referencedDeclaration": 994, "type": "mapping(bytes32 => bool)", "value": "nullifierHashes" }, - "id": 1286, + "id": 1238, "name": "Identifier", - "src": "4060:15:5" + "src": "4298:15:4" }, { "attributes": { @@ -8158,33 +8753,33 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1281, + "referencedDeclaration": 1233, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1287, + "id": 1239, "name": "Identifier", - "src": "4076:14:5" + "src": "4314:14:4" } ], - "id": 1288, + "id": 1240, "name": "IndexAccess", - "src": "4060:31:5" + "src": "4298:31:4" } ], - "id": 1289, + "id": 1241, "name": "Return", - "src": "4053:38:5" + "src": "4291:38:4" } ], - "id": 1290, + "id": 1242, "name": "Block", - "src": "4047:49:5" + "src": "4285:49:4" } ], - "id": 1291, + "id": 1243, "name": "FunctionDefinition", - "src": "3980:116:5" + "src": "4218:116:4" }, { "attributes": { @@ -8196,7 +8791,7 @@ null ], "name": "isSpentArray", - "scope": 1363, + "scope": 1320, "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -8208,7 +8803,7 @@ "attributes": { "constant": false, "name": "_nullifierHashes", - "scope": 1336, + "scope": 1288, "stateVariable": false, "storageLocation": "calldata", "type": "bytes32[]", @@ -8227,24 +8822,24 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1292, + "id": 1244, "name": "ElementaryTypeName", - "src": "4179:7:5" + "src": "4417:7:4" } ], - "id": 1293, + "id": 1245, "name": "ArrayTypeName", - "src": "4179:9:5" + "src": "4417:9:4" } ], - "id": 1294, + "id": 1246, "name": "VariableDeclaration", - "src": "4179:35:5" + "src": "4417:35:4" } ], - "id": 1295, + "id": 1247, "name": "ParameterList", - "src": "4178:37:5" + "src": "4416:37:4" }, { "children": [ @@ -8252,7 +8847,7 @@ "attributes": { "constant": false, "name": "spent", - "scope": 1336, + "scope": 1288, "stateVariable": false, "storageLocation": "memory", "type": "bool[]", @@ -8271,24 +8866,24 @@ "name": "bool", "type": "bool" }, - "id": 1296, + "id": 1248, "name": "ElementaryTypeName", - "src": "4238:4:5" + "src": "4476:4:4" } ], - "id": 1297, + "id": 1249, "name": "ArrayTypeName", - "src": "4238:6:5" + "src": "4476:6:4" } ], - "id": 1298, + "id": 1250, "name": "VariableDeclaration", - "src": "4238:19:5" + "src": "4476:19:4" } ], - "id": 1299, + "id": 1251, "name": "ParameterList", - "src": "4237:21:5" + "src": "4475:21:4" }, { "children": [ @@ -8311,13 +8906,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1298, + "referencedDeclaration": 1250, "type": "bool[] memory", "value": "spent" }, - "id": 1300, + "id": 1252, "name": "Identifier", - "src": "4265:5:5" + "src": "4503:5:4" }, { "attributes": { @@ -8360,19 +8955,19 @@ "name": "bool", "type": "bool" }, - "id": 1301, + "id": 1253, "name": "ElementaryTypeName", - "src": "4277:4:5" + "src": "4515:4:4" } ], - "id": 1302, + "id": 1254, "name": "ArrayTypeName", - "src": "4277:6:5" + "src": "4515:6:4" } ], - "id": 1303, + "id": 1255, "name": "NewExpression", - "src": "4273:10:5" + "src": "4511:10:4" }, { "attributes": { @@ -8392,40 +8987,40 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1294, + "referencedDeclaration": 1246, "type": "bytes32[] calldata", "value": "_nullifierHashes" }, - "id": 1304, + "id": 1256, "name": "Identifier", - "src": "4284:16:5" + "src": "4522:16:4" } ], - "id": 1305, + "id": 1257, "name": "MemberAccess", - "src": "4284:23:5" + "src": "4522:23:4" } ], - "id": 1306, + "id": 1258, "name": "FunctionCall", - "src": "4273:35:5" + "src": "4511:35:4" } ], - "id": 1307, + "id": 1259, "name": "Assignment", - "src": "4265:43:5" + "src": "4503:43:4" } ], - "id": 1308, + "id": 1260, "name": "ExpressionStatement", - "src": "4265:43:5" + "src": "4503:43:4" }, { "children": [ { "attributes": { "assignments": [ - 1310 + 1262 ] }, "children": [ @@ -8433,7 +9028,7 @@ "attributes": { "constant": false, "name": "i", - "scope": 1334, + "scope": 1286, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -8446,14 +9041,14 @@ "name": "uint", "type": "uint256" }, - "id": 1309, + "id": 1261, "name": "ElementaryTypeName", - "src": "4318:4:5" + "src": "4556:4:4" } ], - "id": 1310, + "id": 1262, "name": "VariableDeclaration", - "src": "4318:6:5" + "src": "4556:6:4" }, { "attributes": { @@ -8468,14 +9063,14 @@ "type": "int_const 0", "value": "0" }, - "id": 1311, + "id": 1263, "name": "Literal", - "src": "4327:1:5" + "src": "4565:1:4" } ], - "id": 1312, + "id": 1264, "name": "VariableDeclarationStatement", - "src": "4318:10:5" + "src": "4556:10:4" }, { "attributes": { @@ -8498,13 +9093,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1310, + "referencedDeclaration": 1262, "type": "uint256", "value": "i" }, - "id": 1313, + "id": 1265, "name": "Identifier", - "src": "4330:1:5" + "src": "4568:1:4" }, { "attributes": { @@ -8524,23 +9119,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1294, + "referencedDeclaration": 1246, "type": "bytes32[] calldata", "value": "_nullifierHashes" }, - "id": 1314, + "id": 1266, "name": "Identifier", - "src": "4334:16:5" + "src": "4572:16:4" } ], - "id": 1315, + "id": 1267, "name": "MemberAccess", - "src": "4334:23:5" + "src": "4572:23:4" } ], - "id": 1316, + "id": 1268, "name": "BinaryOperation", - "src": "4330:27:5" + "src": "4568:27:4" }, { "children": [ @@ -8562,23 +9157,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1310, + "referencedDeclaration": 1262, "type": "uint256", "value": "i" }, - "id": 1317, + "id": 1269, "name": "Identifier", - "src": "4359:1:5" + "src": "4597:1:4" } ], - "id": 1318, + "id": 1270, "name": "UnaryOperation", - "src": "4359:3:5" + "src": "4597:3:4" } ], - "id": 1319, + "id": 1271, "name": "ExpressionStatement", - "src": "4359:3:5" + "src": "4597:3:4" }, { "children": [ @@ -8613,13 +9208,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1291, + "referencedDeclaration": 1243, "type": "function (bytes32) view returns (bool)", "value": "isSpent" }, - "id": 1320, + "id": 1272, "name": "Identifier", - "src": "4376:7:5" + "src": "4614:7:4" }, { "attributes": { @@ -8637,13 +9232,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1294, + "referencedDeclaration": 1246, "type": "bytes32[] calldata", "value": "_nullifierHashes" }, - "id": 1321, + "id": 1273, "name": "Identifier", - "src": "4384:16:5" + "src": "4622:16:4" }, { "attributes": { @@ -8651,23 +9246,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1310, + "referencedDeclaration": 1262, "type": "uint256", "value": "i" }, - "id": 1322, + "id": 1274, "name": "Identifier", - "src": "4401:1:5" + "src": "4639:1:4" } ], - "id": 1323, + "id": 1275, "name": "IndexAccess", - "src": "4384:19:5" + "src": "4622:19:4" } ], - "id": 1324, + "id": 1276, "name": "FunctionCall", - "src": "4376:28:5" + "src": "4614:28:4" }, { "children": [ @@ -8700,13 +9295,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1298, + "referencedDeclaration": 1250, "type": "bool[] memory", "value": "spent" }, - "id": 1325, + "id": 1277, "name": "Identifier", - "src": "4416:5:5" + "src": "4654:5:4" }, { "attributes": { @@ -8714,18 +9309,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1310, + "referencedDeclaration": 1262, "type": "uint256", "value": "i" }, - "id": 1326, + "id": 1278, "name": "Identifier", - "src": "4422:1:5" + "src": "4660:1:4" } ], - "id": 1327, + "id": 1279, "name": "IndexAccess", - "src": "4416:8:5" + "src": "4654:8:4" }, { "attributes": { @@ -8740,49 +9335,49 @@ "type": "bool", "value": "true" }, - "id": 1328, + "id": 1280, "name": "Literal", - "src": "4427:4:5" + "src": "4665:4:4" } ], - "id": 1329, + "id": 1281, "name": "Assignment", - "src": "4416:15:5" + "src": "4654:15:4" } ], - "id": 1330, + "id": 1282, "name": "ExpressionStatement", - "src": "4416:15:5" + "src": "4654:15:4" } ], - "id": 1331, + "id": 1283, "name": "Block", - "src": "4406:34:5" + "src": "4644:34:4" } ], - "id": 1332, + "id": 1284, "name": "IfStatement", - "src": "4372:68:5" + "src": "4610:68:4" } ], - "id": 1333, + "id": 1285, "name": "Block", - "src": "4364:82:5" + "src": "4602:82:4" } ], - "id": 1334, + "id": 1286, "name": "ForStatement", - "src": "4314:132:5" + "src": "4552:132:4" } ], - "id": 1335, + "id": 1287, "name": "Block", - "src": "4259:191:5" + "src": "4497:191:4" } ], - "id": 1336, + "id": 1288, "name": "FunctionDefinition", - "src": "4157:293:5" + "src": "4395:293:4" }, { "attributes": { @@ -8791,7 +9386,7 @@ "isConstructor": false, "kind": "function", "name": "updateVerifier", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -8803,7 +9398,7 @@ "attributes": { "constant": false, "name": "_newVerifier", - "scope": 1350, + "scope": 1302, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -8817,19 +9412,19 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1337, + "id": 1289, "name": "ElementaryTypeName", - "src": "4704:7:5" + "src": "4942:7:4" } ], - "id": 1338, + "id": 1290, "name": "VariableDeclaration", - "src": "4704:20:5" + "src": "4942:20:4" } ], - "id": 1339, + "id": 1291, "name": "ParameterList", - "src": "4703:22:5" + "src": "4941:22:4" }, { "attributes": { @@ -8838,9 +9433,9 @@ ] }, "children": [], - "id": 1342, + "id": 1294, "name": "ParameterList", - "src": "4748:0:5" + "src": "4986:0:4" }, { "attributes": { @@ -8853,18 +9448,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1084, + "referencedDeclaration": 1016, "type": "modifier ()", "value": "onlyOperator" }, - "id": 1340, + "id": 1292, "name": "Identifier", - "src": "4735:12:5" + "src": "4973:12:4" } ], - "id": 1341, + "id": 1293, "name": "ModifierInvocation", - "src": "4735:12:5" + "src": "4973:12:4" }, { "children": [ @@ -8887,13 +9482,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1068, + "referencedDeclaration": 1000, "type": "contract IVerifier", "value": "verifier" }, - "id": 1343, + "id": 1295, "name": "Identifier", - "src": "4754:8:5" + "src": "4992:8:4" }, { "attributes": { @@ -8921,13 +9516,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1041, + "referencedDeclaration": 973, "type": "type(contract IVerifier)", "value": "IVerifier" }, - "id": 1344, + "id": 1296, "name": "Identifier", - "src": "4765:9:5" + "src": "5003:9:4" }, { "attributes": { @@ -8935,38 +9530,38 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1338, + "referencedDeclaration": 1290, "type": "address", "value": "_newVerifier" }, - "id": 1345, + "id": 1297, "name": "Identifier", - "src": "4775:12:5" + "src": "5013:12:4" } ], - "id": 1346, + "id": 1298, "name": "FunctionCall", - "src": "4765:23:5" + "src": "5003:23:4" } ], - "id": 1347, + "id": 1299, "name": "Assignment", - "src": "4754:34:5" + "src": "4992:34:4" } ], - "id": 1348, + "id": 1300, "name": "ExpressionStatement", - "src": "4754:34:5" + "src": "4992:34:4" } ], - "id": 1349, + "id": 1301, "name": "Block", - "src": "4748:45:5" + "src": "4986:45:4" } ], - "id": 1350, + "id": 1302, "name": "FunctionDefinition", - "src": "4680:113:5" + "src": "4918:113:4" }, { "attributes": { @@ -8975,7 +9570,7 @@ "isConstructor": false, "kind": "function", "name": "changeOperator", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -8987,7 +9582,7 @@ "attributes": { "constant": false, "name": "_newOperator", - "scope": 1362, + "scope": 1319, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -9001,19 +9596,19 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1351, + "id": 1303, "name": "ElementaryTypeName", - "src": "4867:7:5" + "src": "5105:7:4" } ], - "id": 1352, + "id": 1304, "name": "VariableDeclaration", - "src": "4867:20:5" + "src": "5105:20:4" } ], - "id": 1353, + "id": 1305, "name": "ParameterList", - "src": "4866:22:5" + "src": "5104:22:4" }, { "attributes": { @@ -9022,9 +9617,9 @@ ] }, "children": [], - "id": 1356, + "id": 1308, "name": "ParameterList", - "src": "4911:0:5" + "src": "5149:0:4" }, { "attributes": { @@ -9037,21 +9632,99 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1084, + "referencedDeclaration": 1016, "type": "modifier ()", "value": "onlyOperator" }, - "id": 1354, + "id": 1306, "name": "Identifier", - "src": "4898:12:5" + "src": "5136:12:4" } ], - "id": 1355, + "id": 1307, "name": "ModifierInvocation", - "src": "4898:12:5" + "src": "5136:12:4" }, { "children": [ + { + "children": [ + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "isStructConstructorCall": false, + "lValueRequested": false, + "names": [ + null + ], + "type": "tuple()", + "type_conversion": false + }, + "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1040, + "type": "function (address,address)", + "value": "OwnershipTransferred" + }, + "id": 1309, + "name": "Identifier", + "src": "5160:20:4" + }, + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1004, + "type": "address", + "value": "operator" + }, + "id": 1310, + "name": "Identifier", + "src": "5181:8:4" + }, + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1304, + "type": "address", + "value": "_newOperator" + }, + "id": 1311, + "name": "Identifier", + "src": "5191:12:4" + } + ], + "id": 1312, + "name": "FunctionCall", + "src": "5160:44:4" + } + ], + "id": 1313, + "name": "EmitStatement", + "src": "5155:49:4" + }, { "children": [ { @@ -9071,13 +9744,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1072, + "referencedDeclaration": 1004, "type": "address", "value": "operator" }, - "id": 1357, + "id": 1314, "name": "Identifier", - "src": "4917:8:5" + "src": "5210:8:4" }, { "attributes": { @@ -9085,43 +9758,43 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1352, + "referencedDeclaration": 1304, "type": "address", "value": "_newOperator" }, - "id": 1358, + "id": 1315, "name": "Identifier", - "src": "4928:12:5" + "src": "5221:12:4" } ], - "id": 1359, + "id": 1316, "name": "Assignment", - "src": "4917:23:5" + "src": "5210:23:4" } ], - "id": 1360, + "id": 1317, "name": "ExpressionStatement", - "src": "4917:23:5" + "src": "5210:23:4" } ], - "id": 1361, + "id": 1318, "name": "Block", - "src": "4911:34:5" + "src": "5149:89:4" } ], - "id": 1362, + "id": 1319, "name": "FunctionDefinition", - "src": "4843:102:5" + "src": "5081:157:4" } ], - "id": 1363, + "id": 1320, "name": "ContractDefinition", - "src": "383:4564:5" + "src": "383:4857:4" } ], - "id": 1364, + "id": 1321, "name": "SourceUnit", - "src": "0:4948:5" + "src": "0:5241:4" }, "compiler": { "name": "solc", @@ -9129,7 +9802,7 @@ }, "networks": {}, "schemaVersion": "3.3.4", - "updatedAt": "2021-04-12T00:15:10.062Z", + "updatedAt": "2021-04-18T15:21:30.808Z", "devdoc": { "methods": {} }, diff --git a/client/contracts/IVerifier.json b/client/contracts/IVerifier.json index ecdfbcd..e280f06 100644 --- a/client/contracts/IVerifier.json +++ b/client/contracts/IVerifier.json @@ -28,58 +28,58 @@ "type": "function" } ], - "metadata": "{\"compiler\":{\"version\":\"0.5.17+commit.d19bba13\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":false,\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_proof\",\"type\":\"bytes\"},{\"internalType\":\"uint256[6]\",\"name\":\"_input\",\"type\":\"uint256[6]\"}],\"name\":\"verifyProof\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":\"IVerifier\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol\":{\"keccak256\":\"0x671cc9268dd70c47d18795f7e37fc4df11763fcbcca026edcf163f4239036254\",\"urls\":[\"bzz-raw://9c36a207ed164b60a514eae89bfb15e5b4de4b346c4a89a7a1cb50a940bc699d\",\"dweb:/ipfs/QmbPEqFJAGMpYduLEFsbPazyBsYWcjRtpth8X26wCHALwk\"]},\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":{\"keccak256\":\"0x7269c9361452a555e6f29e924e70d4478a8a5bd86c7b33ea3731470a52c235b5\",\"urls\":[\"bzz-raw://eddd542888565cb84d4dac710511b0f02afbed2e0e1a7d25e0425e6d69b7712f\",\"dweb:/ipfs/Qma1KWoX8nZYK1d1PAfRiZH4prYqM347dMkWM6DjJzTqYY\"]},\"@openzeppelin/contracts/utils/ReentrancyGuard.sol\":{\"keccak256\":\"0xb63221b23818d622bfd83d18e0968307e4fcb7a35536bdceded76e1cf8349acd\",\"urls\":[\"bzz-raw://44e1e8c22362c4708a8c3362735f1465f5b05e2f7315e16c7010d694ce019d73\",\"dweb:/ipfs/QmWj9g8X1hxkXRre2kwkEjLBetjuzmSbWHD81bsSojnBkS\"]}},\"version\":1}", + "metadata": "{\"compiler\":{\"version\":\"0.5.17+commit.d19bba13\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":false,\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_proof\",\"type\":\"bytes\"},{\"internalType\":\"uint256[6]\",\"name\":\"_input\",\"type\":\"uint256[6]\"}],\"name\":\"verifyProof\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":\"IVerifier\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol\":{\"keccak256\":\"0x671cc9268dd70c47d18795f7e37fc4df11763fcbcca026edcf163f4239036254\",\"urls\":[\"bzz-raw://9c36a207ed164b60a514eae89bfb15e5b4de4b346c4a89a7a1cb50a940bc699d\",\"dweb:/ipfs/QmbPEqFJAGMpYduLEFsbPazyBsYWcjRtpth8X26wCHALwk\"]},\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":{\"keccak256\":\"0xf81220c0ba8ed77606f414c085676c1a46d09bc286ddf6aeffa22d4e1504fc0c\",\"urls\":[\"bzz-raw://962b946c3ed0b58fa24c9b6668443a58c49527b8d01593734fece90669e07955\",\"dweb:/ipfs/QmfFRroF2gQGXHPJ9t4HJz2SMkSzLcrKugmXiJ1H6V45iP\"]},\"@openzeppelin/contracts/utils/ReentrancyGuard.sol\":{\"keccak256\":\"0xb63221b23818d622bfd83d18e0968307e4fcb7a35536bdceded76e1cf8349acd\",\"urls\":[\"bzz-raw://44e1e8c22362c4708a8c3362735f1465f5b05e2f7315e16c7010d694ce019d73\",\"dweb:/ipfs/QmWj9g8X1hxkXRre2kwkEjLBetjuzmSbWHD81bsSojnBkS\"]}},\"version\":1}", "bytecode": "0x", "deployedBytecode": "0x", "sourceMap": "", "deployedSourceMap": "", - "source": "pragma solidity 0.5.17;\n\nimport \"./MerkleTreeWithHistory.sol\";\nimport \"@openzeppelin/contracts/utils/ReentrancyGuard.sol\";\n\ncontract IVerifier {\n function verifyProof(bytes memory _proof, uint256[6] memory _input) public returns(bool);\n}\n\ncontract IFeeManager {\n function feeTo() external view returns (address);\n function protocolFeeDivisor() external view returns (uint256);\n}\n\ncontract Tornado is MerkleTreeWithHistory, ReentrancyGuard {\n uint256 public denomination;\n mapping(bytes32 => bool) public nullifierHashes;\n // we store all commitments just to prevent accidental deposits with the same commitment\n mapping(bytes32 => bool) public commitments;\n IVerifier public verifier;\n IFeeManager public feeManager;\n\n // operator can update snark verification key\n // after the final trusted setup ceremony operator rights are supposed to be transferred to zero address\n address public operator;\n modifier onlyOperator {\n require(msg.sender == operator, \"Only operator can call this function.\");\n _;\n }\n\n event Deposit(bytes32 indexed commitment, uint32 leafIndex, uint256 timestamp);\n event Withdrawal(address to, bytes32 nullifierHash, address indexed relayer, uint256 fee);\n\n /**\n @dev The constructor\n @param _verifier the address of SNARK verifier for this contract\n @param _denomination transfer amount for each deposit\n @param _merkleTreeHeight the height of deposits' Merkle Tree\n @param _operator operator address (see operator comment above)\n */\n constructor(\n IVerifier _verifier,\n IFeeManager _feeManager,\n uint256 _denomination,\n uint32 _merkleTreeHeight,\n address _operator\n ) MerkleTreeWithHistory(_merkleTreeHeight) public {\n require(_denomination > 0, \"denomination should be greater than 0\");\n verifier = _verifier;\n feeManager = _feeManager;\n operator = _operator;\n denomination = _denomination;\n }\n\n /**\n @dev Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\n @param _commitment the note commitment, which is PedersenHash(nullifier + secret)\n */\n function deposit(bytes32 _commitment) external payable nonReentrant {\n require(!commitments[_commitment], \"The commitment has been submitted\");\n\n uint32 insertedIndex = _insert(_commitment);\n commitments[_commitment] = true;\n _processDeposit();\n\n emit Deposit(_commitment, insertedIndex, block.timestamp);\n }\n\n /** @dev this function is defined in a child contract */\n function _processDeposit() internal;\n\n /**\n @dev Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs\n `input` array consists of:\n - merkle root of all deposits in the contract\n - hash of unique deposit nullifier to prevent double spends\n - the recipient of funds\n - optional fee that goes to the transaction sender (usually a relay)\n */\n function withdraw(bytes calldata _proof, bytes32 _root, bytes32 _nullifierHash, address payable _recipient, address payable _relayer, uint256 _fee, uint256 _refund) external payable nonReentrant {\n require(_fee <= denomination, \"Fee exceeds transfer value\");\n require(!nullifierHashes[_nullifierHash], \"The note has been already spent\");\n require(isKnownRoot(_root), \"Cannot find your merkle root\"); // Make sure to use a recent one\n require(verifier.verifyProof(_proof, [uint256(_root), uint256(_nullifierHash), uint256(_recipient), uint256(_relayer), _fee, _refund]), \"Invalid withdraw proof\");\n\n nullifierHashes[_nullifierHash] = true;\n _processWithdraw(_recipient, _relayer, _fee, _refund);\n emit Withdrawal(_recipient, _nullifierHash, _relayer, _fee);\n }\n\n /** @dev this function is defined in a child contract */\n function _processWithdraw(address payable _recipient, address payable _relayer, uint256 _relayer_fee, uint256 _refund) internal;\n\n /** @dev whether a note is already spent */\n function isSpent(bytes32 _nullifierHash) public view returns(bool) {\n return nullifierHashes[_nullifierHash];\n }\n\n /** @dev whether an array of notes is already spent */\n function isSpentArray(bytes32[] calldata _nullifierHashes) external view returns(bool[] memory spent) {\n spent = new bool[](_nullifierHashes.length);\n for(uint i = 0; i < _nullifierHashes.length; i++) {\n if (isSpent(_nullifierHashes[i])) {\n spent[i] = true;\n }\n }\n }\n\n /**\n @dev allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held.\n After that operator rights are supposed to be transferred to zero address\n */\n function updateVerifier(address _newVerifier) external onlyOperator {\n verifier = IVerifier(_newVerifier);\n }\n\n /** @dev operator can change his address */\n function changeOperator(address _newOperator) external onlyOperator {\n operator = _newOperator;\n }\n}\n", + "source": "pragma solidity 0.5.17;\n\nimport \"./MerkleTreeWithHistory.sol\";\nimport \"@openzeppelin/contracts/utils/ReentrancyGuard.sol\";\n\ncontract IVerifier {\n function verifyProof(bytes memory _proof, uint256[6] memory _input) public returns(bool);\n}\n\ncontract IFeeManager {\n function feeTo() external view returns (address);\n function protocolFeeDivisor() external view returns (uint256);\n}\n\ncontract Tornado is MerkleTreeWithHistory, ReentrancyGuard {\n uint256 public denomination;\n mapping(bytes32 => bool) public nullifierHashes;\n // we store all commitments just to prevent accidental deposits with the same commitment\n mapping(bytes32 => bool) public commitments;\n IVerifier public verifier;\n IFeeManager public feeManager;\n\n // operator can update snark verification key\n // after the final trusted setup ceremony operator rights are supposed to be transferred to zero address\n address public operator;\n modifier onlyOperator {\n require(msg.sender == operator, \"Only operator can call this function.\");\n _;\n }\n\n event Deposit(bytes32 indexed commitment, uint32 leafIndex, uint256 timestamp);\n event Withdrawal(address to, bytes32 nullifierHash, address indexed relayer, uint256 fee);\n event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);\n event EncryptedNote(address indexed sender, bytes encryptedNote);\n\n /**\n @dev The constructor\n @param _verifier the address of SNARK verifier for this contract\n @param _denomination transfer amount for each deposit\n @param _merkleTreeHeight the height of deposits' Merkle Tree\n @param _operator operator address (see operator comment above)\n */\n constructor(\n IVerifier _verifier,\n IFeeManager _feeManager,\n uint256 _denomination,\n uint32 _merkleTreeHeight,\n address _operator\n ) MerkleTreeWithHistory(_merkleTreeHeight) public {\n require(_denomination > 0, \"denomination should be greater than 0\");\n verifier = _verifier;\n feeManager = _feeManager;\n operator = _operator;\n denomination = _denomination;\n }\n\n /**\n @dev Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\n @param _commitment the note commitment, which is PedersenHash(nullifier + secret)\n */\n function deposit(bytes32 _commitment, bytes calldata _encryptedNote) external payable nonReentrant {\n require(!commitments[_commitment], \"The commitment has been submitted\");\n\n uint32 insertedIndex = _insert(_commitment);\n commitments[_commitment] = true;\n _processDeposit();\n\n emit Deposit(_commitment, insertedIndex, block.timestamp);\n emit EncryptedNote(msg.sender, _encryptedNote);\n }\n\n /** @dev this function is defined in a child contract */\n function _processDeposit() internal;\n\n /**\n @dev Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs\n `input` array consists of:\n - merkle root of all deposits in the contract\n - hash of unique deposit nullifier to prevent double spends\n - the recipient of funds\n - optional fee that goes to the transaction sender (usually a relay)\n */\n function withdraw(bytes calldata _proof, bytes32 _root, bytes32 _nullifierHash, address payable _recipient, address payable _relayer, uint256 _fee, uint256 _refund) external payable nonReentrant {\n require(_fee <= denomination, \"Fee exceeds transfer value\");\n require(!nullifierHashes[_nullifierHash], \"The note has been already spent\");\n require(isKnownRoot(_root), \"Cannot find your merkle root\"); // Make sure to use a recent one\n require(verifier.verifyProof(_proof, [uint256(_root), uint256(_nullifierHash), uint256(_recipient), uint256(_relayer), _fee, _refund]), \"Invalid withdraw proof\");\n\n nullifierHashes[_nullifierHash] = true;\n _processWithdraw(_recipient, _relayer, _fee, _refund);\n emit Withdrawal(_recipient, _nullifierHash, _relayer, _fee);\n }\n\n /** @dev this function is defined in a child contract */\n function _processWithdraw(address payable _recipient, address payable _relayer, uint256 _relayer_fee, uint256 _refund) internal;\n\n /** @dev whether a note is already spent */\n function isSpent(bytes32 _nullifierHash) public view returns(bool) {\n return nullifierHashes[_nullifierHash];\n }\n\n /** @dev whether an array of notes is already spent */\n function isSpentArray(bytes32[] calldata _nullifierHashes) external view returns(bool[] memory spent) {\n spent = new bool[](_nullifierHashes.length);\n for(uint i = 0; i < _nullifierHashes.length; i++) {\n if (isSpent(_nullifierHashes[i])) {\n spent[i] = true;\n }\n }\n }\n\n /**\n @dev allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held.\n After that operator rights are supposed to be transferred to zero address\n */\n function updateVerifier(address _newVerifier) external onlyOperator {\n verifier = IVerifier(_newVerifier);\n }\n\n /** @dev operator can change his address */\n function changeOperator(address _newOperator) external onlyOperator {\n emit OwnershipTransferred(operator, _newOperator);\n operator = _newOperator;\n }\n}\n", "sourcePath": "/home/home/dotfiles/tornado-core/contracts/Tornado.sol", "ast": { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/Tornado.sol", "exportedSymbols": { "IFeeManager": [ - 1052 + 984 ], "IVerifier": [ - 1041 + 973 ], "Tornado": [ - 1363 + 1320 ] }, - "id": 1364, + "id": 1321, "nodeType": "SourceUnit", "nodes": [ { - "id": 1027, + "id": 959, "literals": [ "solidity", "0.5", ".17" ], "nodeType": "PragmaDirective", - "src": "0:23:5" + "src": "0:23:4" }, { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol", "file": "./MerkleTreeWithHistory.sol", - "id": 1028, + "id": 960, "nodeType": "ImportDirective", - "scope": 1364, - "sourceUnit": 839, - "src": "25:37:5", + "scope": 1321, + "sourceUnit": 771, + "src": "25:37:4", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", "file": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", - "id": 1029, + "id": 961, "nodeType": "ImportDirective", - "scope": 1364, - "sourceUnit": 1394, - "src": "63:59:5", + "scope": 1321, + "sourceUnit": 1351, + "src": "63:59:4", "symbolAliases": [], "unitAlias": "" }, @@ -89,9 +89,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1041, + "id": 973, "linearizedBaseContracts": [ - 1041 + 973 ], "name": "IVerifier", "nodeType": "ContractDefinition", @@ -99,23 +99,23 @@ { "body": null, "documentation": null, - "id": 1040, + "id": 972, "implemented": false, "kind": "function", "modifiers": [], "name": "verifyProof", "nodeType": "FunctionDefinition", "parameters": { - "id": 1036, + "id": 968, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1031, + "id": 963, "name": "_proof", "nodeType": "VariableDeclaration", - "scope": 1040, - "src": "168:19:5", + "scope": 972, + "src": "168:19:4", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -123,10 +123,10 @@ "typeString": "bytes" }, "typeName": { - "id": 1030, + "id": 962, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "168:5:5", + "src": "168:5:4", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -137,11 +137,11 @@ }, { "constant": false, - "id": 1035, + "id": 967, "name": "_input", "nodeType": "VariableDeclaration", - "scope": 1040, - "src": "189:24:5", + "scope": 972, + "src": "189:24:4", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -150,27 +150,27 @@ }, "typeName": { "baseType": { - "id": 1032, + "id": 964, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "189:7:5", + "src": "189:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1034, + "id": 966, "length": { "argumentTypes": null, "hexValue": "36", - "id": 1033, + "id": 965, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "197:1:5", + "src": "197:1:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_6_by_1", @@ -179,7 +179,7 @@ "value": "6" }, "nodeType": "ArrayTypeName", - "src": "189:10:5", + "src": "189:10:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$6_storage_ptr", "typeString": "uint256[6]" @@ -189,19 +189,19 @@ "visibility": "internal" } ], - "src": "167:47:5" + "src": "167:47:4" }, "returnParameters": { - "id": 1039, + "id": 971, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1038, + "id": 970, "name": "", "nodeType": "VariableDeclaration", - "scope": 1040, - "src": "230:4:5", + "scope": 972, + "src": "230:4:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -209,10 +209,10 @@ "typeString": "bool" }, "typeName": { - "id": 1037, + "id": 969, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "230:4:5", + "src": "230:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -222,17 +222,17 @@ "visibility": "internal" } ], - "src": "229:6:5" + "src": "229:6:4" }, - "scope": 1041, - "src": "147:89:5", + "scope": 973, + "src": "147:89:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 1364, - "src": "124:114:5" + "scope": 1321, + "src": "124:114:4" }, { "baseContracts": [], @@ -240,9 +240,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1052, + "id": 984, "linearizedBaseContracts": [ - 1052 + 984 ], "name": "IFeeManager", "nodeType": "ContractDefinition", @@ -250,29 +250,29 @@ { "body": null, "documentation": null, - "id": 1046, + "id": 978, "implemented": false, "kind": "function", "modifiers": [], "name": "feeTo", "nodeType": "FunctionDefinition", "parameters": { - "id": 1042, + "id": 974, "nodeType": "ParameterList", "parameters": [], - "src": "279:2:5" + "src": "279:2:4" }, "returnParameters": { - "id": 1045, + "id": 977, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1044, + "id": 976, "name": "", "nodeType": "VariableDeclaration", - "scope": 1046, - "src": "305:7:5", + "scope": 978, + "src": "305:7:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -280,10 +280,10 @@ "typeString": "address" }, "typeName": { - "id": 1043, + "id": 975, "name": "address", "nodeType": "ElementaryTypeName", - "src": "305:7:5", + "src": "305:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -294,10 +294,10 @@ "visibility": "internal" } ], - "src": "304:9:5" + "src": "304:9:4" }, - "scope": 1052, - "src": "265:49:5", + "scope": 984, + "src": "265:49:4", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -305,29 +305,29 @@ { "body": null, "documentation": null, - "id": 1051, + "id": 983, "implemented": false, "kind": "function", "modifiers": [], "name": "protocolFeeDivisor", "nodeType": "FunctionDefinition", "parameters": { - "id": 1047, + "id": 979, "nodeType": "ParameterList", "parameters": [], - "src": "344:2:5" + "src": "344:2:4" }, "returnParameters": { - "id": 1050, + "id": 982, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1049, + "id": 981, "name": "", "nodeType": "VariableDeclaration", - "scope": 1051, - "src": "370:7:5", + "scope": 983, + "src": "370:7:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -335,10 +335,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1048, + "id": 980, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "370:7:5", + "src": "370:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -348,17 +348,17 @@ "visibility": "internal" } ], - "src": "369:9:5" + "src": "369:9:4" }, - "scope": 1052, - "src": "317:62:5", + "scope": 984, + "src": "317:62:4", "stateMutability": "view", "superFunction": null, "visibility": "external" } ], - "scope": 1364, - "src": "240:141:5" + "scope": 1321, + "src": "240:141:4" }, { "baseContracts": [ @@ -366,62 +366,62 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 1053, + "id": 985, "name": "MerkleTreeWithHistory", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 838, - "src": "403:21:5", + "referencedDeclaration": 770, + "src": "403:21:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_MerkleTreeWithHistory_$838", + "typeIdentifier": "t_contract$_MerkleTreeWithHistory_$770", "typeString": "contract MerkleTreeWithHistory" } }, - "id": 1054, + "id": 986, "nodeType": "InheritanceSpecifier", - "src": "403:21:5" + "src": "403:21:4" }, { "arguments": null, "baseName": { "contractScope": null, - "id": 1055, + "id": 987, "name": "ReentrancyGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1393, - "src": "426:15:5", + "referencedDeclaration": 1350, + "src": "426:15:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_ReentrancyGuard_$1393", + "typeIdentifier": "t_contract$_ReentrancyGuard_$1350", "typeString": "contract ReentrancyGuard" } }, - "id": 1056, + "id": 988, "nodeType": "InheritanceSpecifier", - "src": "426:15:5" + "src": "426:15:4" } ], "contractDependencies": [ - 838, - 1393 + 770, + 1350 ], "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1363, + "id": 1320, "linearizedBaseContracts": [ - 1363, - 1393, - 838 + 1320, + 1350, + 770 ], "name": "Tornado", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 1058, + "id": 990, "name": "denomination", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "446:27:5", + "scope": 1320, + "src": "446:27:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -429,10 +429,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1057, + "id": 989, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "446:7:5", + "src": "446:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -443,11 +443,11 @@ }, { "constant": false, - "id": 1062, + "id": 994, "name": "nullifierHashes", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "477:47:5", + "scope": 1320, + "src": "477:47:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -455,28 +455,28 @@ "typeString": "mapping(bytes32 => bool)" }, "typeName": { - "id": 1061, + "id": 993, "keyType": { - "id": 1059, + "id": 991, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "485:7:5", + "src": "485:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "477:24:5", + "src": "477:24:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" }, "valueType": { - "id": 1060, + "id": 992, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "496:4:5", + "src": "496:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -488,11 +488,11 @@ }, { "constant": false, - "id": 1066, + "id": 998, "name": "commitments", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "619:43:5", + "scope": 1320, + "src": "619:43:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -500,28 +500,28 @@ "typeString": "mapping(bytes32 => bool)" }, "typeName": { - "id": 1065, + "id": 997, "keyType": { - "id": 1063, + "id": 995, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "627:7:5", + "src": "627:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "619:24:5", + "src": "619:24:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" }, "valueType": { - "id": 1064, + "id": 996, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "638:4:5", + "src": "638:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -533,26 +533,26 @@ }, { "constant": false, - "id": 1068, + "id": 1000, "name": "verifier", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "666:25:5", + "scope": 1320, + "src": "666:25:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" }, "typeName": { "contractScope": null, - "id": 1067, + "id": 999, "name": "IVerifier", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1041, - "src": "666:9:5", + "referencedDeclaration": 973, + "src": "666:9:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -561,26 +561,26 @@ }, { "constant": false, - "id": 1070, + "id": 1002, "name": "feeManager", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "695:29:5", + "scope": 1320, + "src": "695:29:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" }, "typeName": { "contractScope": null, - "id": 1069, + "id": 1001, "name": "IFeeManager", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1052, - "src": "695:11:5", + "referencedDeclaration": 984, + "src": "695:11:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -589,11 +589,11 @@ }, { "constant": false, - "id": 1072, + "id": 1004, "name": "operator", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "884:23:5", + "scope": 1320, + "src": "884:23:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -601,10 +601,10 @@ "typeString": "address" }, "typeName": { - "id": 1071, + "id": 1003, "name": "address", "nodeType": "ElementaryTypeName", - "src": "884:7:5", + "src": "884:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -616,9 +616,9 @@ }, { "body": { - "id": 1083, + "id": 1015, "nodeType": "Block", - "src": "933:90:5", + "src": "933:90:4", "statements": [ { "expression": { @@ -630,7 +630,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 1078, + "id": 1010, "isConstant": false, "isLValue": false, "isPure": false, @@ -639,18 +639,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1075, + "id": 1007, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1408, - "src": "947:3:5", + "referencedDeclaration": 1365, + "src": "947:3:4", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1076, + "id": 1008, "isConstant": false, "isLValue": false, "isPure": false, @@ -658,7 +658,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "947:10:5", + "src": "947:10:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -668,18 +668,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 1077, + "id": 1009, "name": "operator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1072, - "src": "961:8:5", + "referencedDeclaration": 1004, + "src": "961:8:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "947:22:5", + "src": "947:22:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -688,14 +688,14 @@ { "argumentTypes": null, "hexValue": "4f6e6c79206f70657261746f722063616e2063616c6c20746869732066756e6374696f6e2e", - "id": 1079, + "id": 1011, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "971:39:5", + "src": "971:39:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e8393660073679be7a6133571fe2ca8983a31a683c72e9055f401ac33a2efffc", @@ -715,21 +715,21 @@ "typeString": "literal_string \"Only operator can call this function.\"" } ], - "id": 1074, + "id": 1006, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "939:7:5", + "referencedDeclaration": 1369, + "src": "939:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1080, + "id": 1012, "isConstant": false, "isLValue": false, "isPure": false, @@ -737,54 +737,54 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "939:72:5", + "src": "939:72:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1081, + "id": 1013, "nodeType": "ExpressionStatement", - "src": "939:72:5" + "src": "939:72:4" }, { - "id": 1082, + "id": 1014, "nodeType": "PlaceholderStatement", - "src": "1017:1:5" + "src": "1017:1:4" } ] }, "documentation": null, - "id": 1084, + "id": 1016, "name": "onlyOperator", "nodeType": "ModifierDefinition", "parameters": { - "id": 1073, + "id": 1005, "nodeType": "ParameterList", "parameters": [], - "src": "933:0:5" + "src": "933:0:4" }, - "src": "911:112:5", + "src": "911:112:4", "visibility": "internal" }, { "anonymous": false, "documentation": null, - "id": 1092, + "id": 1024, "name": "Deposit", "nodeType": "EventDefinition", "parameters": { - "id": 1091, + "id": 1023, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1086, + "id": 1018, "indexed": true, "name": "commitment", "nodeType": "VariableDeclaration", - "scope": 1092, - "src": "1041:26:5", + "scope": 1024, + "src": "1041:26:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -792,10 +792,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1085, + "id": 1017, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1041:7:5", + "src": "1041:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -806,12 +806,12 @@ }, { "constant": false, - "id": 1088, + "id": 1020, "indexed": false, "name": "leafIndex", "nodeType": "VariableDeclaration", - "scope": 1092, - "src": "1069:16:5", + "scope": 1024, + "src": "1069:16:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -819,10 +819,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1087, + "id": 1019, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "1069:6:5", + "src": "1069:6:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -833,12 +833,12 @@ }, { "constant": false, - "id": 1090, + "id": 1022, "indexed": false, "name": "timestamp", "nodeType": "VariableDeclaration", - "scope": 1092, - "src": "1087:17:5", + "scope": 1024, + "src": "1087:17:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -846,10 +846,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1089, + "id": 1021, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1087:7:5", + "src": "1087:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -859,28 +859,28 @@ "visibility": "internal" } ], - "src": "1040:65:5" + "src": "1040:65:4" }, - "src": "1027:79:5" + "src": "1027:79:4" }, { "anonymous": false, "documentation": null, - "id": 1102, + "id": 1034, "name": "Withdrawal", "nodeType": "EventDefinition", "parameters": { - "id": 1101, + "id": 1033, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1094, + "id": 1026, "indexed": false, "name": "to", "nodeType": "VariableDeclaration", - "scope": 1102, - "src": "1126:10:5", + "scope": 1034, + "src": "1126:10:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -888,10 +888,10 @@ "typeString": "address" }, "typeName": { - "id": 1093, + "id": 1025, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1126:7:5", + "src": "1126:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -903,12 +903,12 @@ }, { "constant": false, - "id": 1096, + "id": 1028, "indexed": false, "name": "nullifierHash", "nodeType": "VariableDeclaration", - "scope": 1102, - "src": "1138:21:5", + "scope": 1034, + "src": "1138:21:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -916,10 +916,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1095, + "id": 1027, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1138:7:5", + "src": "1138:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -930,12 +930,12 @@ }, { "constant": false, - "id": 1098, + "id": 1030, "indexed": true, "name": "relayer", "nodeType": "VariableDeclaration", - "scope": 1102, - "src": "1161:23:5", + "scope": 1034, + "src": "1161:23:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -943,10 +943,10 @@ "typeString": "address" }, "typeName": { - "id": 1097, + "id": 1029, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1161:7:5", + "src": "1161:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -958,12 +958,12 @@ }, { "constant": false, - "id": 1100, + "id": 1032, "indexed": false, "name": "fee", "nodeType": "VariableDeclaration", - "scope": 1102, - "src": "1186:11:5", + "scope": 1034, + "src": "1186:11:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -971,10 +971,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1099, + "id": 1031, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1186:7:5", + "src": "1186:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -984,15 +984,156 @@ "visibility": "internal" } ], - "src": "1125:73:5" + "src": "1125:73:4" }, - "src": "1109:90:5" + "src": "1109:90:4" + }, + { + "anonymous": false, + "documentation": null, + "id": 1040, + "name": "OwnershipTransferred", + "nodeType": "EventDefinition", + "parameters": { + "id": 1039, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 1036, + "indexed": true, + "name": "previousOwner", + "nodeType": "VariableDeclaration", + "scope": 1040, + "src": "1229:29:4", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 1035, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1229:7:4", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 1038, + "indexed": true, + "name": "newOwner", + "nodeType": "VariableDeclaration", + "scope": 1040, + "src": "1260:24:4", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 1037, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1260:7:4", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "1228:57:4" + }, + "src": "1202:84:4" + }, + { + "anonymous": false, + "documentation": null, + "id": 1046, + "name": "EncryptedNote", + "nodeType": "EventDefinition", + "parameters": { + "id": 1045, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 1042, + "indexed": true, + "name": "sender", + "nodeType": "VariableDeclaration", + "scope": 1046, + "src": "1309:22:4", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 1041, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1309:7:4", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 1044, + "indexed": false, + "name": "encryptedNote", + "nodeType": "VariableDeclaration", + "scope": 1046, + "src": "1333:19:4", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_bytes_memory_ptr", + "typeString": "bytes" + }, + "typeName": { + "id": 1043, + "name": "bytes", + "nodeType": "ElementaryTypeName", + "src": "1333:5:4", + "typeDescriptions": { + "typeIdentifier": "t_bytes_storage_ptr", + "typeString": "bytes" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "1308:45:4" + }, + "src": "1289:65:4" }, { "body": { - "id": 1141, + "id": 1085, "nodeType": "Block", - "src": "1696:194:5", + "src": "1851:194:4", "statements": [ { "expression": { @@ -1004,19 +1145,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1121, + "id": 1065, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1119, + "id": 1063, "name": "_denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1108, - "src": "1710:13:5", + "referencedDeclaration": 1052, + "src": "1865:13:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1027,14 +1168,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1120, + "id": 1064, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1726:1:5", + "src": "1881:1:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -1042,7 +1183,7 @@ }, "value": "0" }, - "src": "1710:17:5", + "src": "1865:17:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1051,14 +1192,14 @@ { "argumentTypes": null, "hexValue": "64656e6f6d696e6174696f6e2073686f756c642062652067726561746572207468616e2030", - "id": 1122, + "id": 1066, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "1729:39:5", + "src": "1884:39:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_04818fb803bf7e7ff6c9059d97eae335b77b108931ead0a529924d35ccaf3fc8", @@ -1078,21 +1219,21 @@ "typeString": "literal_string \"denomination should be greater than 0\"" } ], - "id": 1118, + "id": 1062, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "1702:7:5", + "referencedDeclaration": 1369, + "src": "1857:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1123, + "id": 1067, "isConstant": false, "isLValue": false, "isPure": false, @@ -1100,34 +1241,34 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1702:67:5", + "src": "1857:67:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1124, + "id": 1068, "nodeType": "ExpressionStatement", - "src": "1702:67:5" + "src": "1857:67:4" }, { "expression": { "argumentTypes": null, - "id": 1127, + "id": 1071, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1125, + "id": 1069, "name": "verifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "1775:8:5", + "referencedDeclaration": 1000, + "src": "1930:8:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -1135,45 +1276,45 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1126, + "id": 1070, "name": "_verifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1104, - "src": "1786:9:5", + "referencedDeclaration": 1048, + "src": "1941:9:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "src": "1775:20:5", + "src": "1930:20:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "id": 1128, + "id": 1072, "nodeType": "ExpressionStatement", - "src": "1775:20:5" + "src": "1930:20:4" }, { "expression": { "argumentTypes": null, - "id": 1131, + "id": 1075, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1129, + "id": 1073, "name": "feeManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1070, - "src": "1801:10:5", + "referencedDeclaration": 1002, + "src": "1956:10:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -1181,43 +1322,43 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1130, + "id": 1074, "name": "_feeManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1106, - "src": "1814:11:5", + "referencedDeclaration": 1050, + "src": "1969:11:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, - "src": "1801:24:5", + "src": "1956:24:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, - "id": 1132, + "id": 1076, "nodeType": "ExpressionStatement", - "src": "1801:24:5" + "src": "1956:24:4" }, { "expression": { "argumentTypes": null, - "id": 1135, + "id": 1079, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1133, + "id": 1077, "name": "operator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1072, - "src": "1831:8:5", + "referencedDeclaration": 1004, + "src": "1986:8:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1227,43 +1368,43 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1134, + "id": 1078, "name": "_operator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1112, - "src": "1842:9:5", + "referencedDeclaration": 1056, + "src": "1997:9:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "1831:20:5", + "src": "1986:20:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1136, + "id": 1080, "nodeType": "ExpressionStatement", - "src": "1831:20:5" + "src": "1986:20:4" }, { "expression": { "argumentTypes": null, - "id": 1139, + "id": 1083, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1137, + "id": 1081, "name": "denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1058, - "src": "1857:12:5", + "referencedDeclaration": 990, + "src": "2012:12:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1273,31 +1414,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1138, + "id": 1082, "name": "_denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1108, - "src": "1872:13:5", + "referencedDeclaration": 1052, + "src": "2027:13:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1857:28:5", + "src": "2012:28:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1140, + "id": 1084, "nodeType": "ExpressionStatement", - "src": "1857:28:5" + "src": "2012:28:4" } ] }, "documentation": "@dev The constructor\n@param _verifier the address of SNARK verifier for this contract\n@param _denomination transfer amount for each deposit\n@param _merkleTreeHeight the height of deposits' Merkle Tree\n@param _operator operator address (see operator comment above)", - "id": 1142, + "id": 1086, "implemented": true, "kind": "constructor", "modifiers": [ @@ -1305,64 +1446,64 @@ "arguments": [ { "argumentTypes": null, - "id": 1115, + "id": 1059, "name": "_merkleTreeHeight", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1110, - "src": "1670:17:5", + "referencedDeclaration": 1054, + "src": "1825:17:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" } } ], - "id": 1116, + "id": 1060, "modifierName": { "argumentTypes": null, - "id": 1114, + "id": 1058, "name": "MerkleTreeWithHistory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 838, - "src": "1648:21:5", + "referencedDeclaration": 770, + "src": "1803:21:4", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_MerkleTreeWithHistory_$838_$", + "typeIdentifier": "t_type$_t_contract$_MerkleTreeWithHistory_$770_$", "typeString": "type(contract MerkleTreeWithHistory)" } }, "nodeType": "ModifierInvocation", - "src": "1648:40:5" + "src": "1803:40:4" } ], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 1113, + "id": 1057, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1104, + "id": 1048, "name": "_verifier", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1515:19:5", + "scope": 1086, + "src": "1670:19:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" }, "typeName": { "contractScope": null, - "id": 1103, + "id": 1047, "name": "IVerifier", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1041, - "src": "1515:9:5", + "referencedDeclaration": 973, + "src": "1670:9:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -1371,26 +1512,26 @@ }, { "constant": false, - "id": 1106, + "id": 1050, "name": "_feeManager", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1540:23:5", + "scope": 1086, + "src": "1695:23:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" }, "typeName": { "contractScope": null, - "id": 1105, + "id": 1049, "name": "IFeeManager", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1052, - "src": "1540:11:5", + "referencedDeclaration": 984, + "src": "1695:11:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -1399,11 +1540,11 @@ }, { "constant": false, - "id": 1108, + "id": 1052, "name": "_denomination", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1569:21:5", + "scope": 1086, + "src": "1724:21:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1411,10 +1552,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1107, + "id": 1051, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1569:7:5", + "src": "1724:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1425,11 +1566,11 @@ }, { "constant": false, - "id": 1110, + "id": 1054, "name": "_merkleTreeHeight", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1596:24:5", + "scope": 1086, + "src": "1751:24:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1437,10 +1578,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1109, + "id": 1053, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "1596:6:5", + "src": "1751:6:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -1451,11 +1592,11 @@ }, { "constant": false, - "id": 1112, + "id": 1056, "name": "_operator", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1626:17:5", + "scope": 1086, + "src": "1781:17:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1463,10 +1604,10 @@ "typeString": "address" }, "typeName": { - "id": 1111, + "id": 1055, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1626:7:5", + "src": "1781:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1477,25 +1618,25 @@ "visibility": "internal" } ], - "src": "1509:138:5" + "src": "1664:138:4" }, "returnParameters": { - "id": 1117, + "id": 1061, "nodeType": "ParameterList", "parameters": [], - "src": "1696:0:5" + "src": "1851:0:4" }, - "scope": 1363, - "src": "1498:392:5", + "scope": 1320, + "src": "1653:392:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1179, + "id": 1131, "nodeType": "Block", - "src": "2206:256:5", + "src": "2392:308:4", "statements": [ { "expression": { @@ -1503,7 +1644,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1153, + "id": 1099, "isConstant": false, "isLValue": false, "isPure": false, @@ -1511,31 +1652,31 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "2220:25:5", + "src": "2406:25:4", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1150, + "id": 1096, "name": "commitments", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1066, - "src": "2221:11:5", + "referencedDeclaration": 998, + "src": "2407:11:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1152, + "id": 1098, "indexExpression": { "argumentTypes": null, - "id": 1151, + "id": 1097, "name": "_commitment", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1144, - "src": "2233:11:5", + "referencedDeclaration": 1088, + "src": "2419:11:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1546,7 +1687,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2221:24:5", + "src": "2407:24:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1560,14 +1701,14 @@ { "argumentTypes": null, "hexValue": "54686520636f6d6d69746d656e7420686173206265656e207375626d6974746564", - "id": 1154, + "id": 1100, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2247:35:5", + "src": "2433:35:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_ae5f231636554c1cb3bf839359e4dfbb338ccb221c7c5dbdf2da91ddc6e2ee6b", @@ -1587,21 +1728,21 @@ "typeString": "literal_string \"The commitment has been submitted\"" } ], - "id": 1149, + "id": 1095, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "2212:7:5", + "referencedDeclaration": 1369, + "src": "2398:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1155, + "id": 1101, "isConstant": false, "isLValue": false, "isPure": false, @@ -1609,28 +1750,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2212:71:5", + "src": "2398:71:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1156, + "id": 1102, "nodeType": "ExpressionStatement", - "src": "2212:71:5" + "src": "2398:71:4" }, { "assignments": [ - 1158 + 1104 ], "declarations": [ { "constant": false, - "id": 1158, + "id": 1104, "name": "insertedIndex", "nodeType": "VariableDeclaration", - "scope": 1179, - "src": "2290:20:5", + "scope": 1131, + "src": "2476:20:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1638,10 +1779,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1157, + "id": 1103, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "2290:6:5", + "src": "2476:6:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -1651,18 +1792,18 @@ "visibility": "internal" } ], - "id": 1162, + "id": 1108, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1160, + "id": 1106, "name": "_commitment", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1144, - "src": "2321:11:5", + "referencedDeclaration": 1088, + "src": "2507:11:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1676,18 +1817,18 @@ "typeString": "bytes32" } ], - "id": 1159, + "id": 1105, "name": "_insert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 780, - "src": "2313:7:5", + "referencedDeclaration": 712, + "src": "2499:7:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$_t_uint32_$", "typeString": "function (bytes32) returns (uint32)" } }, - "id": 1161, + "id": 1107, "isConstant": false, "isLValue": false, "isPure": false, @@ -1695,19 +1836,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2313:20:5", + "src": "2499:20:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" } }, "nodeType": "VariableDeclarationStatement", - "src": "2290:43:5" + "src": "2476:43:4" }, { "expression": { "argumentTypes": null, - "id": 1167, + "id": 1113, "isConstant": false, "isLValue": false, "isPure": false, @@ -1716,26 +1857,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1163, + "id": 1109, "name": "commitments", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1066, - "src": "2339:11:5", + "referencedDeclaration": 998, + "src": "2525:11:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1165, + "id": 1111, "indexExpression": { "argumentTypes": null, - "id": 1164, + "id": 1110, "name": "_commitment", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1144, - "src": "2351:11:5", + "referencedDeclaration": 1088, + "src": "2537:11:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1746,7 +1887,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "2339:24:5", + "src": "2525:24:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1757,14 +1898,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1166, + "id": 1112, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "2366:4:5", + "src": "2552:4:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -1772,15 +1913,15 @@ }, "value": "true" }, - "src": "2339:31:5", + "src": "2525:31:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1168, + "id": 1114, "nodeType": "ExpressionStatement", - "src": "2339:31:5" + "src": "2525:31:4" }, { "expression": { @@ -1788,18 +1929,18 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 1169, + "id": 1115, "name": "_processDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1183, - "src": "2376:15:5", + "referencedDeclaration": 1135, + "src": "2562:15:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$", "typeString": "function ()" } }, - "id": 1170, + "id": 1116, "isConstant": false, "isLValue": false, "isPure": false, @@ -1807,15 +1948,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2376:17:5", + "src": "2562:17:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1171, + "id": 1117, "nodeType": "ExpressionStatement", - "src": "2376:17:5" + "src": "2562:17:4" }, { "eventCall": { @@ -1823,12 +1964,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1173, + "id": 1119, "name": "_commitment", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1144, - "src": "2413:11:5", + "referencedDeclaration": 1088, + "src": "2599:11:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1836,12 +1977,12 @@ }, { "argumentTypes": null, - "id": 1174, + "id": 1120, "name": "insertedIndex", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1158, - "src": "2426:13:5", + "referencedDeclaration": 1104, + "src": "2612:13:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -1851,18 +1992,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1175, + "id": 1121, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1398, - "src": "2441:5:5", + "referencedDeclaration": 1355, + "src": "2627:5:4", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1176, + "id": 1122, "isConstant": false, "isLValue": false, "isPure": false, @@ -1870,7 +2011,7 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2441:15:5", + "src": "2627:15:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1892,18 +2033,18 @@ "typeString": "uint256" } ], - "id": 1172, + "id": 1118, "name": "Deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1092, - "src": "2405:7:5", + "referencedDeclaration": 1024, + "src": "2591:7:4", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint32_$_t_uint256_$returns$__$", "typeString": "function (bytes32,uint32,uint256)" } }, - "id": 1177, + "id": 1123, "isConstant": false, "isLValue": false, "isPure": false, @@ -1911,56 +2052,143 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2405:52:5", + "src": "2591:52:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1178, + "id": 1124, "nodeType": "EmitStatement", - "src": "2400:57:5" + "src": "2586:57:4" + }, + { + "eventCall": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 1126, + "name": "msg", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1365, + "src": "2668:3:4", + "typeDescriptions": { + "typeIdentifier": "t_magic_message", + "typeString": "msg" + } + }, + "id": 1127, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sender", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "2668:10:4", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + }, + { + "argumentTypes": null, + "id": 1128, + "name": "_encryptedNote", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1090, + "src": "2680:14:4", + "typeDescriptions": { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + ], + "id": 1125, + "name": "EncryptedNote", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1046, + "src": "2654:13:4", + "typeDescriptions": { + "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$__$", + "typeString": "function (address,bytes memory)" + } + }, + "id": 1129, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2654:41:4", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 1130, + "nodeType": "EmitStatement", + "src": "2649:46:4" } ] }, "documentation": "@dev Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\n@param _commitment the note commitment, which is PedersenHash(nullifier + secret)", - "id": 1180, + "id": 1132, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 1147, + "id": 1093, "modifierName": { "argumentTypes": null, - "id": 1146, + "id": 1092, "name": "nonReentrant", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1392, - "src": "2193:12:5", + "referencedDeclaration": 1349, + "src": "2379:12:4", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "2193:12:5" + "src": "2379:12:4" } ], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 1145, + "id": 1091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1144, + "id": 1088, "name": "_commitment", "nodeType": "VariableDeclaration", - "scope": 1180, - "src": "2155:19:5", + "scope": 1132, + "src": "2310:19:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1968,10 +2196,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1143, + "id": 1087, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2155:7:5", + "src": "2310:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1979,18 +2207,44 @@ }, "value": null, "visibility": "internal" + }, + { + "constant": false, + "id": 1090, + "name": "_encryptedNote", + "nodeType": "VariableDeclaration", + "scope": 1132, + "src": "2331:29:4", + "stateVariable": false, + "storageLocation": "calldata", + "typeDescriptions": { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes" + }, + "typeName": { + "id": 1089, + "name": "bytes", + "nodeType": "ElementaryTypeName", + "src": "2331:5:4", + "typeDescriptions": { + "typeIdentifier": "t_bytes_storage_ptr", + "typeString": "bytes" + } + }, + "value": null, + "visibility": "internal" } ], - "src": "2154:21:5" + "src": "2309:52:4" }, "returnParameters": { - "id": 1148, + "id": 1094, "nodeType": "ParameterList", "parameters": [], - "src": "2206:0:5" + "src": "2392:0:4" }, - "scope": 1363, - "src": "2138:324:5", + "scope": 1320, + "src": "2293:407:4", "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -1998,35 +2252,35 @@ { "body": null, "documentation": "@dev this function is defined in a child contract ", - "id": 1183, + "id": 1135, "implemented": false, "kind": "function", "modifiers": [], "name": "_processDeposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 1181, + "id": 1133, "nodeType": "ParameterList", "parameters": [], - "src": "2549:2:5" + "src": "2787:2:4" }, "returnParameters": { - "id": 1182, + "id": 1134, "nodeType": "ParameterList", "parameters": [], - "src": "2560:0:5" + "src": "2798:0:4" }, - "scope": 1363, - "src": "2525:36:5", + "scope": 1320, + "src": "2763:36:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 1267, + "id": 1219, "nodeType": "Block", - "src": "3153:586:5", + "src": "3391:586:4", "statements": [ { "expression": { @@ -2038,19 +2292,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1205, + "id": 1157, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1203, + "id": 1155, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1195, - "src": "3167:4:5", + "referencedDeclaration": 1147, + "src": "3405:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2060,18 +2314,18 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 1204, + "id": 1156, "name": "denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1058, - "src": "3175:12:5", + "referencedDeclaration": 990, + "src": "3413:12:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3167:20:5", + "src": "3405:20:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2080,14 +2334,14 @@ { "argumentTypes": null, "hexValue": "4665652065786365656473207472616e736665722076616c7565", - "id": 1206, + "id": 1158, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3189:28:5", + "src": "3427:28:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_2ce218df547d416f80ea8a5deadaf9453d23523ffa5f2e880a48adfdb4053a9c", @@ -2107,21 +2361,21 @@ "typeString": "literal_string \"Fee exceeds transfer value\"" } ], - "id": 1202, + "id": 1154, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3159:7:5", + "referencedDeclaration": 1369, + "src": "3397:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1207, + "id": 1159, "isConstant": false, "isLValue": false, "isPure": false, @@ -2129,15 +2383,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3159:59:5", + "src": "3397:59:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1208, + "id": 1160, "nodeType": "ExpressionStatement", - "src": "3159:59:5" + "src": "3397:59:4" }, { "expression": { @@ -2145,7 +2399,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1213, + "id": 1165, "isConstant": false, "isLValue": false, "isPure": false, @@ -2153,31 +2407,31 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "3232:32:5", + "src": "3470:32:4", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1210, + "id": 1162, "name": "nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "3233:15:5", + "referencedDeclaration": 994, + "src": "3471:15:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1212, + "id": 1164, "indexExpression": { "argumentTypes": null, - "id": 1211, + "id": 1163, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "3249:14:5", + "referencedDeclaration": 1141, + "src": "3487:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2188,7 +2442,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3233:31:5", + "src": "3471:31:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2202,14 +2456,14 @@ { "argumentTypes": null, "hexValue": "546865206e6f746520686173206265656e20616c7265616479207370656e74", - "id": 1214, + "id": 1166, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3266:33:5", + "src": "3504:33:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_a1bef92d7a18b1c6975dc8de68df6140a52afea05a2c6c91da2b1562c617e896", @@ -2229,21 +2483,21 @@ "typeString": "literal_string \"The note has been already spent\"" } ], - "id": 1209, + "id": 1161, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3224:7:5", + "referencedDeclaration": 1369, + "src": "3462:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1215, + "id": 1167, "isConstant": false, "isLValue": false, "isPure": false, @@ -2251,15 +2505,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3224:76:5", + "src": "3462:76:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1216, + "id": 1168, "nodeType": "ExpressionStatement", - "src": "3224:76:5" + "src": "3462:76:4" }, { "expression": { @@ -2270,12 +2524,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1219, + "id": 1171, "name": "_root", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1187, - "src": "3326:5:5", + "referencedDeclaration": 1139, + "src": "3564:5:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2289,18 +2543,18 @@ "typeString": "bytes32" } ], - "id": 1218, + "id": 1170, "name": "isKnownRoot", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 827, - "src": "3314:11:5", + "referencedDeclaration": 759, + "src": "3552:11:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 1220, + "id": 1172, "isConstant": false, "isLValue": false, "isPure": false, @@ -2308,7 +2562,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3314:18:5", + "src": "3552:18:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2317,14 +2571,14 @@ { "argumentTypes": null, "hexValue": "43616e6e6f742066696e6420796f7572206d65726b6c6520726f6f74", - "id": 1221, + "id": 1173, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3334:30:5", + "src": "3572:30:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_2a69086763073955418d2fd7dfee3d2f1fbc5b21047a216b7855d3f313d8e204", @@ -2344,21 +2598,21 @@ "typeString": "literal_string \"Cannot find your merkle root\"" } ], - "id": 1217, + "id": 1169, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3306:7:5", + "referencedDeclaration": 1369, + "src": "3544:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1222, + "id": 1174, "isConstant": false, "isLValue": false, "isPure": false, @@ -2366,15 +2620,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3306:59:5", + "src": "3544:59:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1223, + "id": 1175, "nodeType": "ExpressionStatement", - "src": "3306:59:5" + "src": "3544:59:4" }, { "expression": { @@ -2385,12 +2639,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1227, + "id": 1179, "name": "_proof", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1185, - "src": "3433:6:5", + "referencedDeclaration": 1137, + "src": "3671:6:4", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", "typeString": "bytes calldata" @@ -2404,12 +2658,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1229, + "id": 1181, "name": "_root", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1187, - "src": "3450:5:5", + "referencedDeclaration": 1139, + "src": "3688:5:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2423,20 +2677,20 @@ "typeString": "bytes32" } ], - "id": 1228, + "id": 1180, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3442:7:5", + "src": "3680:7:4", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1230, + "id": 1182, "isConstant": false, "isLValue": false, "isPure": false, @@ -2444,7 +2698,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3442:14:5", + "src": "3680:14:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2455,12 +2709,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1232, + "id": 1184, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "3466:14:5", + "referencedDeclaration": 1141, + "src": "3704:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2474,20 +2728,20 @@ "typeString": "bytes32" } ], - "id": 1231, + "id": 1183, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3458:7:5", + "src": "3696:7:4", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1233, + "id": 1185, "isConstant": false, "isLValue": false, "isPure": false, @@ -2495,7 +2749,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3458:23:5", + "src": "3696:23:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2506,12 +2760,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1235, + "id": 1187, "name": "_recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1191, - "src": "3491:10:5", + "referencedDeclaration": 1143, + "src": "3729:10:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2525,20 +2779,20 @@ "typeString": "address payable" } ], - "id": 1234, + "id": 1186, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3483:7:5", + "src": "3721:7:4", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1236, + "id": 1188, "isConstant": false, "isLValue": false, "isPure": false, @@ -2546,7 +2800,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3483:19:5", + "src": "3721:19:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2557,12 +2811,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1238, + "id": 1190, "name": "_relayer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1193, - "src": "3512:8:5", + "referencedDeclaration": 1145, + "src": "3750:8:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2576,20 +2830,20 @@ "typeString": "address payable" } ], - "id": 1237, + "id": 1189, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3504:7:5", + "src": "3742:7:4", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1239, + "id": 1191, "isConstant": false, "isLValue": false, "isPure": false, @@ -2597,7 +2851,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3504:17:5", + "src": "3742:17:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2605,12 +2859,12 @@ }, { "argumentTypes": null, - "id": 1240, + "id": 1192, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1195, - "src": "3523:4:5", + "referencedDeclaration": 1147, + "src": "3761:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2618,26 +2872,26 @@ }, { "argumentTypes": null, - "id": 1241, + "id": 1193, "name": "_refund", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1197, - "src": "3529:7:5", + "referencedDeclaration": 1149, + "src": "3767:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } } ], - "id": 1242, + "id": 1194, "isConstant": false, "isInlineArray": true, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "3441:96:5", + "src": "3679:96:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$6_memory_ptr", "typeString": "uint256[6] memory" @@ -2657,32 +2911,32 @@ ], "expression": { "argumentTypes": null, - "id": 1225, + "id": 1177, "name": "verifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "3412:8:5", + "referencedDeclaration": 1000, + "src": "3650:8:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "id": 1226, + "id": 1178, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "verifyProof", "nodeType": "MemberAccess", - "referencedDeclaration": 1040, - "src": "3412:20:5", + "referencedDeclaration": 972, + "src": "3650:20:4", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes_memory_ptr_$_t_array$_t_uint256_$6_memory_ptr_$returns$_t_bool_$", "typeString": "function (bytes memory,uint256[6] memory) external returns (bool)" } }, - "id": 1243, + "id": 1195, "isConstant": false, "isLValue": false, "isPure": false, @@ -2690,7 +2944,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3412:126:5", + "src": "3650:126:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2699,14 +2953,14 @@ { "argumentTypes": null, "hexValue": "496e76616c69642077697468647261772070726f6f66", - "id": 1244, + "id": 1196, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3540:24:5", + "src": "3778:24:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_7021ea58137dba96e572e94936410b0b0e4cbc344e1ab2ee7f47660768b81ff4", @@ -2726,21 +2980,21 @@ "typeString": "literal_string \"Invalid withdraw proof\"" } ], - "id": 1224, + "id": 1176, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3404:7:5", + "referencedDeclaration": 1369, + "src": "3642:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1245, + "id": 1197, "isConstant": false, "isLValue": false, "isPure": false, @@ -2748,20 +3002,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3404:161:5", + "src": "3642:161:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1246, + "id": 1198, "nodeType": "ExpressionStatement", - "src": "3404:161:5" + "src": "3642:161:4" }, { "expression": { "argumentTypes": null, - "id": 1251, + "id": 1203, "isConstant": false, "isLValue": false, "isPure": false, @@ -2770,26 +3024,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1247, + "id": 1199, "name": "nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "3572:15:5", + "referencedDeclaration": 994, + "src": "3810:15:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1249, + "id": 1201, "indexExpression": { "argumentTypes": null, - "id": 1248, + "id": 1200, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "3588:14:5", + "referencedDeclaration": 1141, + "src": "3826:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2800,7 +3054,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "3572:31:5", + "src": "3810:31:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2811,14 +3065,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1250, + "id": 1202, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "3606:4:5", + "src": "3844:4:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -2826,15 +3080,15 @@ }, "value": "true" }, - "src": "3572:38:5", + "src": "3810:38:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1252, + "id": 1204, "nodeType": "ExpressionStatement", - "src": "3572:38:5" + "src": "3810:38:4" }, { "expression": { @@ -2842,12 +3096,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1254, + "id": 1206, "name": "_recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1191, - "src": "3633:10:5", + "referencedDeclaration": 1143, + "src": "3871:10:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2855,12 +3109,12 @@ }, { "argumentTypes": null, - "id": 1255, + "id": 1207, "name": "_relayer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1193, - "src": "3645:8:5", + "referencedDeclaration": 1145, + "src": "3883:8:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2868,12 +3122,12 @@ }, { "argumentTypes": null, - "id": 1256, + "id": 1208, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1195, - "src": "3655:4:5", + "referencedDeclaration": 1147, + "src": "3893:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2881,12 +3135,12 @@ }, { "argumentTypes": null, - "id": 1257, + "id": 1209, "name": "_refund", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1197, - "src": "3661:7:5", + "referencedDeclaration": 1149, + "src": "3899:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2912,18 +3166,18 @@ "typeString": "uint256" } ], - "id": 1253, + "id": 1205, "name": "_processWithdraw", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1279, - "src": "3616:16:5", + "referencedDeclaration": 1231, + "src": "3854:16:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_payable_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (address payable,address payable,uint256,uint256)" } }, - "id": 1258, + "id": 1210, "isConstant": false, "isLValue": false, "isPure": false, @@ -2931,15 +3185,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3616:53:5", + "src": "3854:53:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1259, + "id": 1211, "nodeType": "ExpressionStatement", - "src": "3616:53:5" + "src": "3854:53:4" }, { "eventCall": { @@ -2947,12 +3201,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1261, + "id": 1213, "name": "_recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1191, - "src": "3691:10:5", + "referencedDeclaration": 1143, + "src": "3929:10:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2960,12 +3214,12 @@ }, { "argumentTypes": null, - "id": 1262, + "id": 1214, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "3703:14:5", + "referencedDeclaration": 1141, + "src": "3941:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2973,12 +3227,12 @@ }, { "argumentTypes": null, - "id": 1263, + "id": 1215, "name": "_relayer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1193, - "src": "3719:8:5", + "referencedDeclaration": 1145, + "src": "3957:8:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -2986,12 +3240,12 @@ }, { "argumentTypes": null, - "id": 1264, + "id": 1216, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1195, - "src": "3729:4:5", + "referencedDeclaration": 1147, + "src": "3967:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3017,18 +3271,18 @@ "typeString": "uint256" } ], - "id": 1260, + "id": 1212, "name": "Withdrawal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1102, - "src": "3680:10:5", + "referencedDeclaration": 1034, + "src": "3918:10:4", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_bytes32_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,bytes32,address,uint256)" } }, - "id": 1265, + "id": 1217, "isConstant": false, "isLValue": false, "isPure": false, @@ -3036,56 +3290,56 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3680:54:5", + "src": "3918:54:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1266, + "id": 1218, "nodeType": "EmitStatement", - "src": "3675:59:5" + "src": "3913:59:4" } ] }, "documentation": "@dev Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs\n`input` array consists of:\n- merkle root of all deposits in the contract\n- hash of unique deposit nullifier to prevent double spends\n- the recipient of funds\n- optional fee that goes to the transaction sender (usually a relay)", - "id": 1268, + "id": 1220, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 1200, + "id": 1152, "modifierName": { "argumentTypes": null, - "id": 1199, + "id": 1151, "name": "nonReentrant", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1392, - "src": "3140:12:5", + "referencedDeclaration": 1349, + "src": "3378:12:4", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "3140:12:5" + "src": "3378:12:4" } ], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1198, + "id": 1150, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1185, + "id": 1137, "name": "_proof", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "2976:21:5", + "scope": 1220, + "src": "3214:21:4", "stateVariable": false, "storageLocation": "calldata", "typeDescriptions": { @@ -3093,10 +3347,10 @@ "typeString": "bytes" }, "typeName": { - "id": 1184, + "id": 1136, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "2976:5:5", + "src": "3214:5:4", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -3107,11 +3361,11 @@ }, { "constant": false, - "id": 1187, + "id": 1139, "name": "_root", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "2999:13:5", + "scope": 1220, + "src": "3237:13:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3119,10 +3373,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1186, + "id": 1138, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2999:7:5", + "src": "3237:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3133,11 +3387,11 @@ }, { "constant": false, - "id": 1189, + "id": 1141, "name": "_nullifierHash", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3014:22:5", + "scope": 1220, + "src": "3252:22:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3145,10 +3399,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1188, + "id": 1140, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "3014:7:5", + "src": "3252:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3159,11 +3413,11 @@ }, { "constant": false, - "id": 1191, + "id": 1143, "name": "_recipient", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3038:26:5", + "scope": 1220, + "src": "3276:26:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3171,10 +3425,10 @@ "typeString": "address payable" }, "typeName": { - "id": 1190, + "id": 1142, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3038:15:5", + "src": "3276:15:4", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3186,11 +3440,11 @@ }, { "constant": false, - "id": 1193, + "id": 1145, "name": "_relayer", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3066:24:5", + "scope": 1220, + "src": "3304:24:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3198,10 +3452,10 @@ "typeString": "address payable" }, "typeName": { - "id": 1192, + "id": 1144, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3066:15:5", + "src": "3304:15:4", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3213,11 +3467,11 @@ }, { "constant": false, - "id": 1195, + "id": 1147, "name": "_fee", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3092:12:5", + "scope": 1220, + "src": "3330:12:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3225,10 +3479,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1194, + "id": 1146, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3092:7:5", + "src": "3330:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3239,11 +3493,11 @@ }, { "constant": false, - "id": 1197, + "id": 1149, "name": "_refund", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3106:15:5", + "scope": 1220, + "src": "3344:15:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3251,10 +3505,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1196, + "id": 1148, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3106:7:5", + "src": "3344:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3264,16 +3518,16 @@ "visibility": "internal" } ], - "src": "2975:147:5" + "src": "3213:147:4" }, "returnParameters": { - "id": 1201, + "id": 1153, "nodeType": "ParameterList", "parameters": [], - "src": "3153:0:5" + "src": "3391:0:4" }, - "scope": 1363, - "src": "2958:781:5", + "scope": 1320, + "src": "3196:781:4", "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -3281,23 +3535,23 @@ { "body": null, "documentation": "@dev this function is defined in a child contract ", - "id": 1279, + "id": 1231, "implemented": false, "kind": "function", "modifiers": [], "name": "_processWithdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1277, + "id": 1229, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1270, + "id": 1222, "name": "_recipient", "nodeType": "VariableDeclaration", - "scope": 1279, - "src": "3828:26:5", + "scope": 1231, + "src": "4066:26:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3305,10 +3559,10 @@ "typeString": "address payable" }, "typeName": { - "id": 1269, + "id": 1221, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3828:15:5", + "src": "4066:15:4", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3320,11 +3574,11 @@ }, { "constant": false, - "id": 1272, + "id": 1224, "name": "_relayer", "nodeType": "VariableDeclaration", - "scope": 1279, - "src": "3856:24:5", + "scope": 1231, + "src": "4094:24:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3332,10 +3586,10 @@ "typeString": "address payable" }, "typeName": { - "id": 1271, + "id": 1223, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3856:15:5", + "src": "4094:15:4", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3347,11 +3601,11 @@ }, { "constant": false, - "id": 1274, + "id": 1226, "name": "_relayer_fee", "nodeType": "VariableDeclaration", - "scope": 1279, - "src": "3882:20:5", + "scope": 1231, + "src": "4120:20:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3359,10 +3613,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1273, + "id": 1225, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3882:7:5", + "src": "4120:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3373,11 +3627,11 @@ }, { "constant": false, - "id": 1276, + "id": 1228, "name": "_refund", "nodeType": "VariableDeclaration", - "scope": 1279, - "src": "3904:15:5", + "scope": 1231, + "src": "4142:15:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3385,10 +3639,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1275, + "id": 1227, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3904:7:5", + "src": "4142:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3398,51 +3652,51 @@ "visibility": "internal" } ], - "src": "3827:93:5" + "src": "4065:93:4" }, "returnParameters": { - "id": 1278, + "id": 1230, "nodeType": "ParameterList", "parameters": [], - "src": "3929:0:5" + "src": "4167:0:4" }, - "scope": 1363, - "src": "3802:128:5", + "scope": 1320, + "src": "4040:128:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 1290, + "id": 1242, "nodeType": "Block", - "src": "4047:49:5", + "src": "4285:49:4", "statements": [ { "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1286, + "id": 1238, "name": "nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "4060:15:5", + "referencedDeclaration": 994, + "src": "4298:15:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1288, + "id": 1240, "indexExpression": { "argumentTypes": null, - "id": 1287, + "id": 1239, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1281, - "src": "4076:14:5", + "referencedDeclaration": 1233, + "src": "4314:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3453,37 +3707,37 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4060:31:5", + "src": "4298:31:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1285, - "id": 1289, + "functionReturnParameters": 1237, + "id": 1241, "nodeType": "Return", - "src": "4053:38:5" + "src": "4291:38:4" } ] }, "documentation": "@dev whether a note is already spent ", - "id": 1291, + "id": 1243, "implemented": true, "kind": "function", "modifiers": [], "name": "isSpent", "nodeType": "FunctionDefinition", "parameters": { - "id": 1282, + "id": 1234, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1281, + "id": 1233, "name": "_nullifierHash", "nodeType": "VariableDeclaration", - "scope": 1291, - "src": "3997:22:5", + "scope": 1243, + "src": "4235:22:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3491,10 +3745,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1280, + "id": 1232, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "3997:7:5", + "src": "4235:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3504,19 +3758,19 @@ "visibility": "internal" } ], - "src": "3996:24:5" + "src": "4234:24:4" }, "returnParameters": { - "id": 1285, + "id": 1237, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1284, + "id": 1236, "name": "", "nodeType": "VariableDeclaration", - "scope": 1291, - "src": "4041:4:5", + "scope": 1243, + "src": "4279:4:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3524,10 +3778,10 @@ "typeString": "bool" }, "typeName": { - "id": 1283, + "id": 1235, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "4041:4:5", + "src": "4279:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3537,36 +3791,36 @@ "visibility": "internal" } ], - "src": "4040:6:5" + "src": "4278:6:4" }, - "scope": 1363, - "src": "3980:116:5", + "scope": 1320, + "src": "4218:116:4", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1335, + "id": 1287, "nodeType": "Block", - "src": "4259:191:5", + "src": "4497:191:4", "statements": [ { "expression": { "argumentTypes": null, - "id": 1307, + "id": 1259, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1300, + "id": 1252, "name": "spent", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1298, - "src": "4265:5:5", + "referencedDeclaration": 1250, + "src": "4503:5:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr", "typeString": "bool[] memory" @@ -3581,18 +3835,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1304, + "id": 1256, "name": "_nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1294, - "src": "4284:16:5", + "referencedDeclaration": 1246, + "src": "4522:16:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" } }, - "id": 1305, + "id": 1257, "isConstant": false, "isLValue": false, "isPure": false, @@ -3600,7 +3854,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4284:23:5", + "src": "4522:23:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3614,39 +3868,39 @@ "typeString": "uint256" } ], - "id": 1303, + "id": 1255, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "NewExpression", - "src": "4273:10:5", + "src": "4511:10:4", "typeDescriptions": { "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_bool_$dyn_memory_$", "typeString": "function (uint256) pure returns (bool[] memory)" }, "typeName": { "baseType": { - "id": 1301, + "id": 1253, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "4277:4:5", + "src": "4515:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1302, + "id": 1254, "length": null, "nodeType": "ArrayTypeName", - "src": "4277:6:5", + "src": "4515:6:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr", "typeString": "bool[]" } } }, - "id": 1306, + "id": 1258, "isConstant": false, "isLValue": false, "isPure": false, @@ -3654,27 +3908,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4273:35:5", + "src": "4511:35:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_memory", "typeString": "bool[] memory" } }, - "src": "4265:43:5", + "src": "4503:43:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr", "typeString": "bool[] memory" } }, - "id": 1308, + "id": 1260, "nodeType": "ExpressionStatement", - "src": "4265:43:5" + "src": "4503:43:4" }, { "body": { - "id": 1333, + "id": 1285, "nodeType": "Block", - "src": "4364:82:5", + "src": "4602:82:4", "statements": [ { "condition": { @@ -3684,26 +3938,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1321, + "id": 1273, "name": "_nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1294, - "src": "4384:16:5", + "referencedDeclaration": 1246, + "src": "4622:16:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" } }, - "id": 1323, + "id": 1275, "indexExpression": { "argumentTypes": null, - "id": 1322, + "id": 1274, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1310, - "src": "4401:1:5", + "referencedDeclaration": 1262, + "src": "4639:1:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3714,7 +3968,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4384:19:5", + "src": "4622:19:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3728,18 +3982,18 @@ "typeString": "bytes32" } ], - "id": 1320, + "id": 1272, "name": "isSpent", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1291, - "src": "4376:7:5", + "referencedDeclaration": 1243, + "src": "4614:7:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 1324, + "id": 1276, "isConstant": false, "isLValue": false, "isPure": false, @@ -3747,25 +4001,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4376:28:5", + "src": "4614:28:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1332, + "id": 1284, "nodeType": "IfStatement", - "src": "4372:68:5", + "src": "4610:68:4", "trueBody": { - "id": 1331, + "id": 1283, "nodeType": "Block", - "src": "4406:34:5", + "src": "4644:34:4", "statements": [ { "expression": { "argumentTypes": null, - "id": 1329, + "id": 1281, "isConstant": false, "isLValue": false, "isPure": false, @@ -3774,26 +4028,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1325, + "id": 1277, "name": "spent", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1298, - "src": "4416:5:5", + "referencedDeclaration": 1250, + "src": "4654:5:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr", "typeString": "bool[] memory" } }, - "id": 1327, + "id": 1279, "indexExpression": { "argumentTypes": null, - "id": 1326, + "id": 1278, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1310, - "src": "4422:1:5", + "referencedDeclaration": 1262, + "src": "4660:1:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3804,7 +4058,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "4416:8:5", + "src": "4654:8:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3815,14 +4069,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1328, + "id": 1280, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "4427:4:5", + "src": "4665:4:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -3830,15 +4084,15 @@ }, "value": "true" }, - "src": "4416:15:5", + "src": "4654:15:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1330, + "id": 1282, "nodeType": "ExpressionStatement", - "src": "4416:15:5" + "src": "4654:15:4" } ] } @@ -3851,19 +4105,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1316, + "id": 1268, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1313, + "id": 1265, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1310, - "src": "4330:1:5", + "referencedDeclaration": 1262, + "src": "4568:1:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3875,18 +4129,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1314, + "id": 1266, "name": "_nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1294, - "src": "4334:16:5", + "referencedDeclaration": 1246, + "src": "4572:16:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" } }, - "id": 1315, + "id": 1267, "isConstant": false, "isLValue": false, "isPure": false, @@ -3894,31 +4148,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4334:23:5", + "src": "4572:23:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4330:27:5", + "src": "4568:27:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1334, + "id": 1286, "initializationExpression": { "assignments": [ - 1310 + 1262 ], "declarations": [ { "constant": false, - "id": 1310, + "id": 1262, "name": "i", "nodeType": "VariableDeclaration", - "scope": 1334, - "src": "4318:6:5", + "scope": 1286, + "src": "4556:6:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3926,10 +4180,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1309, + "id": 1261, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4318:4:5", + "src": "4556:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3939,18 +4193,18 @@ "visibility": "internal" } ], - "id": 1312, + "id": 1264, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 1311, + "id": 1263, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4327:1:5", + "src": "4565:1:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -3959,12 +4213,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "4318:10:5" + "src": "4556:10:4" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 1318, + "id": 1270, "isConstant": false, "isLValue": false, "isPure": false, @@ -3972,15 +4226,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "4359:3:5", + "src": "4597:3:4", "subExpression": { "argumentTypes": null, - "id": 1317, + "id": 1269, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1310, - "src": "4359:1:5", + "referencedDeclaration": 1262, + "src": "4597:1:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3991,33 +4245,33 @@ "typeString": "uint256" } }, - "id": 1319, + "id": 1271, "nodeType": "ExpressionStatement", - "src": "4359:3:5" + "src": "4597:3:4" }, "nodeType": "ForStatement", - "src": "4314:132:5" + "src": "4552:132:4" } ] }, "documentation": "@dev whether an array of notes is already spent ", - "id": 1336, + "id": 1288, "implemented": true, "kind": "function", "modifiers": [], "name": "isSpentArray", "nodeType": "FunctionDefinition", "parameters": { - "id": 1295, + "id": 1247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1294, + "id": 1246, "name": "_nullifierHashes", "nodeType": "VariableDeclaration", - "scope": 1336, - "src": "4179:35:5", + "scope": 1288, + "src": "4417:35:4", "stateVariable": false, "storageLocation": "calldata", "typeDescriptions": { @@ -4026,19 +4280,19 @@ }, "typeName": { "baseType": { - "id": 1292, + "id": 1244, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4179:7:5", + "src": "4417:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1293, + "id": 1245, "length": null, "nodeType": "ArrayTypeName", - "src": "4179:9:5", + "src": "4417:9:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -4048,19 +4302,19 @@ "visibility": "internal" } ], - "src": "4178:37:5" + "src": "4416:37:4" }, "returnParameters": { - "id": 1299, + "id": 1251, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1298, + "id": 1250, "name": "spent", "nodeType": "VariableDeclaration", - "scope": 1336, - "src": "4238:19:5", + "scope": 1288, + "src": "4476:19:4", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -4069,19 +4323,19 @@ }, "typeName": { "baseType": { - "id": 1296, + "id": 1248, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "4238:4:5", + "src": "4476:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1297, + "id": 1249, "length": null, "nodeType": "ArrayTypeName", - "src": "4238:6:5", + "src": "4476:6:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr", "typeString": "bool[]" @@ -4091,38 +4345,38 @@ "visibility": "internal" } ], - "src": "4237:21:5" + "src": "4475:21:4" }, - "scope": 1363, - "src": "4157:293:5", + "scope": 1320, + "src": "4395:293:4", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1349, + "id": 1301, "nodeType": "Block", - "src": "4748:45:5", + "src": "4986:45:4", "statements": [ { "expression": { "argumentTypes": null, - "id": 1347, + "id": 1299, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1343, + "id": 1295, "name": "verifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "4754:8:5", + "referencedDeclaration": 1000, + "src": "4992:8:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -4133,12 +4387,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1345, + "id": 1297, "name": "_newVerifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1338, - "src": "4775:12:5", + "referencedDeclaration": 1290, + "src": "5013:12:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4152,18 +4406,18 @@ "typeString": "address" } ], - "id": 1344, + "id": 1296, "name": "IVerifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1041, - "src": "4765:9:5", + "referencedDeclaration": 973, + "src": "5003:9:4", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IVerifier_$1041_$", + "typeIdentifier": "t_type$_t_contract$_IVerifier_$973_$", "typeString": "type(contract IVerifier)" } }, - "id": 1346, + "id": 1298, "isConstant": false, "isLValue": false, "isPure": false, @@ -4171,62 +4425,62 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4765:23:5", + "src": "5003:23:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "src": "4754:34:5", + "src": "4992:34:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "id": 1348, + "id": 1300, "nodeType": "ExpressionStatement", - "src": "4754:34:5" + "src": "4992:34:4" } ] }, "documentation": "@dev allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held.\nAfter that operator rights are supposed to be transferred to zero address", - "id": 1350, + "id": 1302, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 1341, + "id": 1293, "modifierName": { "argumentTypes": null, - "id": 1340, + "id": 1292, "name": "onlyOperator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1084, - "src": "4735:12:5", + "referencedDeclaration": 1016, + "src": "4973:12:4", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "4735:12:5" + "src": "4973:12:4" } ], "name": "updateVerifier", "nodeType": "FunctionDefinition", "parameters": { - "id": 1339, + "id": 1291, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1338, + "id": 1290, "name": "_newVerifier", "nodeType": "VariableDeclaration", - "scope": 1350, - "src": "4704:20:5", + "scope": 1302, + "src": "4942:20:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4234,10 +4488,10 @@ "typeString": "address" }, "typeName": { - "id": 1337, + "id": 1289, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4704:7:5", + "src": "4942:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4248,42 +4502,113 @@ "visibility": "internal" } ], - "src": "4703:22:5" + "src": "4941:22:4" }, "returnParameters": { - "id": 1342, + "id": 1294, "nodeType": "ParameterList", "parameters": [], - "src": "4748:0:5" + "src": "4986:0:4" }, - "scope": 1363, - "src": "4680:113:5", + "scope": 1320, + "src": "4918:113:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1361, + "id": 1318, "nodeType": "Block", - "src": "4911:34:5", + "src": "5149:89:4", "statements": [ + { + "eventCall": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 1310, + "name": "operator", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1004, + "src": "5181:8:4", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 1311, + "name": "_newOperator", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1304, + "src": "5191:12:4", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 1309, + "name": "OwnershipTransferred", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1040, + "src": "5160:20:4", + "typeDescriptions": { + "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$", + "typeString": "function (address,address)" + } + }, + "id": 1312, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5160:44:4", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 1313, + "nodeType": "EmitStatement", + "src": "5155:49:4" + }, { "expression": { "argumentTypes": null, - "id": 1359, + "id": 1316, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1357, + "id": 1314, "name": "operator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1072, - "src": "4917:8:5", + "referencedDeclaration": 1004, + "src": "5210:8:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4293,67 +4618,67 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1358, + "id": 1315, "name": "_newOperator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1352, - "src": "4928:12:5", + "referencedDeclaration": 1304, + "src": "5221:12:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "4917:23:5", + "src": "5210:23:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1360, + "id": 1317, "nodeType": "ExpressionStatement", - "src": "4917:23:5" + "src": "5210:23:4" } ] }, "documentation": "@dev operator can change his address ", - "id": 1362, + "id": 1319, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 1355, + "id": 1307, "modifierName": { "argumentTypes": null, - "id": 1354, + "id": 1306, "name": "onlyOperator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1084, - "src": "4898:12:5", + "referencedDeclaration": 1016, + "src": "5136:12:4", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "4898:12:5" + "src": "5136:12:4" } ], "name": "changeOperator", "nodeType": "FunctionDefinition", "parameters": { - "id": 1353, + "id": 1305, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1352, + "id": 1304, "name": "_newOperator", "nodeType": "VariableDeclaration", - "scope": 1362, - "src": "4867:20:5", + "scope": 1319, + "src": "5105:20:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4361,10 +4686,10 @@ "typeString": "address" }, "typeName": { - "id": 1351, + "id": 1303, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4867:7:5", + "src": "5105:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4375,39 +4700,39 @@ "visibility": "internal" } ], - "src": "4866:22:5" + "src": "5104:22:4" }, "returnParameters": { - "id": 1356, + "id": 1308, "nodeType": "ParameterList", "parameters": [], - "src": "4911:0:5" + "src": "5149:0:4" }, - "scope": 1363, - "src": "4843:102:5", + "scope": 1320, + "src": "5081:157:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 1364, - "src": "383:4564:5" + "scope": 1321, + "src": "383:4857:4" } ], - "src": "0:4948:5" + "src": "0:5241:4" }, "legacyAST": { "attributes": { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/Tornado.sol", "exportedSymbols": { "IFeeManager": [ - 1052 + 984 ], "IVerifier": [ - 1041 + 973 ], "Tornado": [ - 1363 + 1320 ] } }, @@ -4420,39 +4745,39 @@ ".17" ] }, - "id": 1027, + "id": 959, "name": "PragmaDirective", - "src": "0:23:5" + "src": "0:23:4" }, { "attributes": { - "SourceUnit": 839, + "SourceUnit": 771, "absolutePath": "/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol", "file": "./MerkleTreeWithHistory.sol", - "scope": 1364, + "scope": 1321, "symbolAliases": [ null ], "unitAlias": "" }, - "id": 1028, + "id": 960, "name": "ImportDirective", - "src": "25:37:5" + "src": "25:37:4" }, { "attributes": { - "SourceUnit": 1394, + "SourceUnit": 1351, "absolutePath": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", "file": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", - "scope": 1364, + "scope": 1321, "symbolAliases": [ null ], "unitAlias": "" }, - "id": 1029, + "id": 961, "name": "ImportDirective", - "src": "63:59:5" + "src": "63:59:4" }, { "attributes": { @@ -4466,10 +4791,10 @@ "documentation": null, "fullyImplemented": false, "linearizedBaseContracts": [ - 1041 + 973 ], "name": "IVerifier", - "scope": 1364 + "scope": 1321 }, "children": [ { @@ -4483,7 +4808,7 @@ null ], "name": "verifyProof", - "scope": 1041, + "scope": 973, "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -4495,7 +4820,7 @@ "attributes": { "constant": false, "name": "_proof", - "scope": 1040, + "scope": 972, "stateVariable": false, "storageLocation": "memory", "type": "bytes", @@ -4508,20 +4833,20 @@ "name": "bytes", "type": "bytes" }, - "id": 1030, + "id": 962, "name": "ElementaryTypeName", - "src": "168:5:5" + "src": "168:5:4" } ], - "id": 1031, + "id": 963, "name": "VariableDeclaration", - "src": "168:19:5" + "src": "168:19:4" }, { "attributes": { "constant": false, "name": "_input", - "scope": 1040, + "scope": 972, "stateVariable": false, "storageLocation": "memory", "type": "uint256[6]", @@ -4539,9 +4864,9 @@ "name": "uint256", "type": "uint256" }, - "id": 1032, + "id": 964, "name": "ElementaryTypeName", - "src": "189:7:5" + "src": "189:7:4" }, { "attributes": { @@ -4556,24 +4881,24 @@ "type": "int_const 6", "value": "6" }, - "id": 1033, + "id": 965, "name": "Literal", - "src": "197:1:5" + "src": "197:1:4" } ], - "id": 1034, + "id": 966, "name": "ArrayTypeName", - "src": "189:10:5" + "src": "189:10:4" } ], - "id": 1035, + "id": 967, "name": "VariableDeclaration", - "src": "189:24:5" + "src": "189:24:4" } ], - "id": 1036, + "id": 968, "name": "ParameterList", - "src": "167:47:5" + "src": "167:47:4" }, { "children": [ @@ -4581,7 +4906,7 @@ "attributes": { "constant": false, "name": "", - "scope": 1040, + "scope": 972, "stateVariable": false, "storageLocation": "default", "type": "bool", @@ -4594,29 +4919,29 @@ "name": "bool", "type": "bool" }, - "id": 1037, + "id": 969, "name": "ElementaryTypeName", - "src": "230:4:5" + "src": "230:4:4" } ], - "id": 1038, + "id": 970, "name": "VariableDeclaration", - "src": "230:4:5" + "src": "230:4:4" } ], - "id": 1039, + "id": 971, "name": "ParameterList", - "src": "229:6:5" + "src": "229:6:4" } ], - "id": 1040, + "id": 972, "name": "FunctionDefinition", - "src": "147:89:5" + "src": "147:89:4" } ], - "id": 1041, + "id": 973, "name": "ContractDefinition", - "src": "124:114:5" + "src": "124:114:4" }, { "attributes": { @@ -4630,10 +4955,10 @@ "documentation": null, "fullyImplemented": false, "linearizedBaseContracts": [ - 1052 + 984 ], "name": "IFeeManager", - "scope": 1364 + "scope": 1321 }, "children": [ { @@ -4647,7 +4972,7 @@ null ], "name": "feeTo", - "scope": 1052, + "scope": 984, "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -4660,9 +4985,9 @@ ] }, "children": [], - "id": 1042, + "id": 974, "name": "ParameterList", - "src": "279:2:5" + "src": "279:2:4" }, { "children": [ @@ -4670,7 +4995,7 @@ "attributes": { "constant": false, "name": "", - "scope": 1046, + "scope": 978, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -4684,24 +5009,24 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1043, + "id": 975, "name": "ElementaryTypeName", - "src": "305:7:5" + "src": "305:7:4" } ], - "id": 1044, + "id": 976, "name": "VariableDeclaration", - "src": "305:7:5" + "src": "305:7:4" } ], - "id": 1045, + "id": 977, "name": "ParameterList", - "src": "304:9:5" + "src": "304:9:4" } ], - "id": 1046, + "id": 978, "name": "FunctionDefinition", - "src": "265:49:5" + "src": "265:49:4" }, { "attributes": { @@ -4714,7 +5039,7 @@ null ], "name": "protocolFeeDivisor", - "scope": 1052, + "scope": 984, "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -4727,9 +5052,9 @@ ] }, "children": [], - "id": 1047, + "id": 979, "name": "ParameterList", - "src": "344:2:5" + "src": "344:2:4" }, { "children": [ @@ -4737,7 +5062,7 @@ "attributes": { "constant": false, "name": "", - "scope": 1051, + "scope": 983, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -4750,46 +5075,46 @@ "name": "uint256", "type": "uint256" }, - "id": 1048, + "id": 980, "name": "ElementaryTypeName", - "src": "370:7:5" + "src": "370:7:4" } ], - "id": 1049, + "id": 981, "name": "VariableDeclaration", - "src": "370:7:5" + "src": "370:7:4" } ], - "id": 1050, + "id": 982, "name": "ParameterList", - "src": "369:9:5" + "src": "369:9:4" } ], - "id": 1051, + "id": 983, "name": "FunctionDefinition", - "src": "317:62:5" + "src": "317:62:4" } ], - "id": 1052, + "id": 984, "name": "ContractDefinition", - "src": "240:141:5" + "src": "240:141:4" }, { "attributes": { "contractDependencies": [ - 838, - 1393 + 770, + 1350 ], "contractKind": "contract", "documentation": null, "fullyImplemented": false, "linearizedBaseContracts": [ - 1363, - 1393, - 838 + 1320, + 1350, + 770 ], "name": "Tornado", - "scope": 1364 + "scope": 1321 }, "children": [ { @@ -4801,17 +5126,17 @@ "attributes": { "contractScope": null, "name": "MerkleTreeWithHistory", - "referencedDeclaration": 838, + "referencedDeclaration": 770, "type": "contract MerkleTreeWithHistory" }, - "id": 1053, + "id": 985, "name": "UserDefinedTypeName", - "src": "403:21:5" + "src": "403:21:4" } ], - "id": 1054, + "id": 986, "name": "InheritanceSpecifier", - "src": "403:21:5" + "src": "403:21:4" }, { "attributes": { @@ -4822,23 +5147,23 @@ "attributes": { "contractScope": null, "name": "ReentrancyGuard", - "referencedDeclaration": 1393, + "referencedDeclaration": 1350, "type": "contract ReentrancyGuard" }, - "id": 1055, + "id": 987, "name": "UserDefinedTypeName", - "src": "426:15:5" + "src": "426:15:4" } ], - "id": 1056, + "id": 988, "name": "InheritanceSpecifier", - "src": "426:15:5" + "src": "426:15:4" }, { "attributes": { "constant": false, "name": "denomination", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "uint256", @@ -4851,20 +5176,20 @@ "name": "uint256", "type": "uint256" }, - "id": 1057, + "id": 989, "name": "ElementaryTypeName", - "src": "446:7:5" + "src": "446:7:4" } ], - "id": 1058, + "id": 990, "name": "VariableDeclaration", - "src": "446:27:5" + "src": "446:27:4" }, { "attributes": { "constant": false, "name": "nullifierHashes", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "mapping(bytes32 => bool)", @@ -4882,34 +5207,34 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1059, + "id": 991, "name": "ElementaryTypeName", - "src": "485:7:5" + "src": "485:7:4" }, { "attributes": { "name": "bool", "type": "bool" }, - "id": 1060, + "id": 992, "name": "ElementaryTypeName", - "src": "496:4:5" + "src": "496:4:4" } ], - "id": 1061, + "id": 993, "name": "Mapping", - "src": "477:24:5" + "src": "477:24:4" } ], - "id": 1062, + "id": 994, "name": "VariableDeclaration", - "src": "477:47:5" + "src": "477:47:4" }, { "attributes": { "constant": false, "name": "commitments", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "mapping(bytes32 => bool)", @@ -4927,34 +5252,34 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1063, + "id": 995, "name": "ElementaryTypeName", - "src": "627:7:5" + "src": "627:7:4" }, { "attributes": { "name": "bool", "type": "bool" }, - "id": 1064, + "id": 996, "name": "ElementaryTypeName", - "src": "638:4:5" + "src": "638:4:4" } ], - "id": 1065, + "id": 997, "name": "Mapping", - "src": "619:24:5" + "src": "619:24:4" } ], - "id": 1066, + "id": 998, "name": "VariableDeclaration", - "src": "619:43:5" + "src": "619:43:4" }, { "attributes": { "constant": false, "name": "verifier", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "contract IVerifier", @@ -4966,23 +5291,23 @@ "attributes": { "contractScope": null, "name": "IVerifier", - "referencedDeclaration": 1041, + "referencedDeclaration": 973, "type": "contract IVerifier" }, - "id": 1067, + "id": 999, "name": "UserDefinedTypeName", - "src": "666:9:5" + "src": "666:9:4" } ], - "id": 1068, + "id": 1000, "name": "VariableDeclaration", - "src": "666:25:5" + "src": "666:25:4" }, { "attributes": { "constant": false, "name": "feeManager", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "contract IFeeManager", @@ -4994,23 +5319,23 @@ "attributes": { "contractScope": null, "name": "IFeeManager", - "referencedDeclaration": 1052, + "referencedDeclaration": 984, "type": "contract IFeeManager" }, - "id": 1069, + "id": 1001, "name": "UserDefinedTypeName", - "src": "695:11:5" + "src": "695:11:4" } ], - "id": 1070, + "id": 1002, "name": "VariableDeclaration", - "src": "695:29:5" + "src": "695:29:4" }, { "attributes": { "constant": false, "name": "operator", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "address", @@ -5024,14 +5349,14 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1071, + "id": 1003, "name": "ElementaryTypeName", - "src": "884:7:5" + "src": "884:7:4" } ], - "id": 1072, + "id": 1004, "name": "VariableDeclaration", - "src": "884:23:5" + "src": "884:23:4" }, { "attributes": { @@ -5047,9 +5372,9 @@ ] }, "children": [], - "id": 1073, + "id": 1005, "name": "ParameterList", - "src": "933:0:5" + "src": "933:0:4" }, { "children": [ @@ -5083,16 +5408,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1074, + "id": 1006, "name": "Identifier", - "src": "939:7:5" + "src": "939:7:4" }, { "attributes": { @@ -5127,18 +5452,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1408, + "referencedDeclaration": 1365, "type": "msg", "value": "msg" }, - "id": 1075, + "id": 1007, "name": "Identifier", - "src": "947:3:5" + "src": "947:3:4" } ], - "id": 1076, + "id": 1008, "name": "MemberAccess", - "src": "947:10:5" + "src": "947:10:4" }, { "attributes": { @@ -5146,18 +5471,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1072, + "referencedDeclaration": 1004, "type": "address", "value": "operator" }, - "id": 1077, + "id": 1009, "name": "Identifier", - "src": "961:8:5" + "src": "961:8:4" } ], - "id": 1078, + "id": 1010, "name": "BinaryOperation", - "src": "947:22:5" + "src": "947:22:4" }, { "attributes": { @@ -5172,34 +5497,34 @@ "type": "literal_string \"Only operator can call this function.\"", "value": "Only operator can call this function." }, - "id": 1079, + "id": 1011, "name": "Literal", - "src": "971:39:5" + "src": "971:39:4" } ], - "id": 1080, + "id": 1012, "name": "FunctionCall", - "src": "939:72:5" + "src": "939:72:4" } ], - "id": 1081, + "id": 1013, "name": "ExpressionStatement", - "src": "939:72:5" + "src": "939:72:4" }, { - "id": 1082, + "id": 1014, "name": "PlaceholderStatement", - "src": "1017:1:5" + "src": "1017:1:4" } ], - "id": 1083, + "id": 1015, "name": "Block", - "src": "933:90:5" + "src": "933:90:4" } ], - "id": 1084, + "id": 1016, "name": "ModifierDefinition", - "src": "911:112:5" + "src": "911:112:4" }, { "attributes": { @@ -5215,7 +5540,7 @@ "constant": false, "indexed": true, "name": "commitment", - "scope": 1092, + "scope": 1024, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -5228,21 +5553,21 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1085, + "id": 1017, "name": "ElementaryTypeName", - "src": "1041:7:5" + "src": "1041:7:4" } ], - "id": 1086, + "id": 1018, "name": "VariableDeclaration", - "src": "1041:26:5" + "src": "1041:26:4" }, { "attributes": { "constant": false, "indexed": false, "name": "leafIndex", - "scope": 1092, + "scope": 1024, "stateVariable": false, "storageLocation": "default", "type": "uint32", @@ -5255,21 +5580,21 @@ "name": "uint32", "type": "uint32" }, - "id": 1087, + "id": 1019, "name": "ElementaryTypeName", - "src": "1069:6:5" + "src": "1069:6:4" } ], - "id": 1088, + "id": 1020, "name": "VariableDeclaration", - "src": "1069:16:5" + "src": "1069:16:4" }, { "attributes": { "constant": false, "indexed": false, "name": "timestamp", - "scope": 1092, + "scope": 1024, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -5282,24 +5607,24 @@ "name": "uint256", "type": "uint256" }, - "id": 1089, + "id": 1021, "name": "ElementaryTypeName", - "src": "1087:7:5" + "src": "1087:7:4" } ], - "id": 1090, + "id": 1022, "name": "VariableDeclaration", - "src": "1087:17:5" + "src": "1087:17:4" } ], - "id": 1091, + "id": 1023, "name": "ParameterList", - "src": "1040:65:5" + "src": "1040:65:4" } ], - "id": 1092, + "id": 1024, "name": "EventDefinition", - "src": "1027:79:5" + "src": "1027:79:4" }, { "attributes": { @@ -5315,7 +5640,7 @@ "constant": false, "indexed": false, "name": "to", - "scope": 1102, + "scope": 1034, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -5329,21 +5654,21 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1093, + "id": 1025, "name": "ElementaryTypeName", - "src": "1126:7:5" + "src": "1126:7:4" } ], - "id": 1094, + "id": 1026, "name": "VariableDeclaration", - "src": "1126:10:5" + "src": "1126:10:4" }, { "attributes": { "constant": false, "indexed": false, "name": "nullifierHash", - "scope": 1102, + "scope": 1034, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -5356,21 +5681,21 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1095, + "id": 1027, "name": "ElementaryTypeName", - "src": "1138:7:5" + "src": "1138:7:4" } ], - "id": 1096, + "id": 1028, "name": "VariableDeclaration", - "src": "1138:21:5" + "src": "1138:21:4" }, { "attributes": { "constant": false, "indexed": true, "name": "relayer", - "scope": 1102, + "scope": 1034, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -5384,21 +5709,21 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1097, + "id": 1029, "name": "ElementaryTypeName", - "src": "1161:7:5" + "src": "1161:7:4" } ], - "id": 1098, + "id": 1030, "name": "VariableDeclaration", - "src": "1161:23:5" + "src": "1161:23:4" }, { "attributes": { "constant": false, "indexed": false, "name": "fee", - "scope": 1102, + "scope": 1034, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -5411,24 +5736,173 @@ "name": "uint256", "type": "uint256" }, - "id": 1099, + "id": 1031, "name": "ElementaryTypeName", - "src": "1186:7:5" + "src": "1186:7:4" } ], - "id": 1100, + "id": 1032, "name": "VariableDeclaration", - "src": "1186:11:5" + "src": "1186:11:4" } ], - "id": 1101, + "id": 1033, "name": "ParameterList", - "src": "1125:73:5" + "src": "1125:73:4" } ], - "id": 1102, + "id": 1034, "name": "EventDefinition", - "src": "1109:90:5" + "src": "1109:90:4" + }, + { + "attributes": { + "anonymous": false, + "documentation": null, + "name": "OwnershipTransferred" + }, + "children": [ + { + "children": [ + { + "attributes": { + "constant": false, + "indexed": true, + "name": "previousOwner", + "scope": 1040, + "stateVariable": false, + "storageLocation": "default", + "type": "address", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "address", + "stateMutability": "nonpayable", + "type": "address" + }, + "id": 1035, + "name": "ElementaryTypeName", + "src": "1229:7:4" + } + ], + "id": 1036, + "name": "VariableDeclaration", + "src": "1229:29:4" + }, + { + "attributes": { + "constant": false, + "indexed": true, + "name": "newOwner", + "scope": 1040, + "stateVariable": false, + "storageLocation": "default", + "type": "address", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "address", + "stateMutability": "nonpayable", + "type": "address" + }, + "id": 1037, + "name": "ElementaryTypeName", + "src": "1260:7:4" + } + ], + "id": 1038, + "name": "VariableDeclaration", + "src": "1260:24:4" + } + ], + "id": 1039, + "name": "ParameterList", + "src": "1228:57:4" + } + ], + "id": 1040, + "name": "EventDefinition", + "src": "1202:84:4" + }, + { + "attributes": { + "anonymous": false, + "documentation": null, + "name": "EncryptedNote" + }, + "children": [ + { + "children": [ + { + "attributes": { + "constant": false, + "indexed": true, + "name": "sender", + "scope": 1046, + "stateVariable": false, + "storageLocation": "default", + "type": "address", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "address", + "stateMutability": "nonpayable", + "type": "address" + }, + "id": 1041, + "name": "ElementaryTypeName", + "src": "1309:7:4" + } + ], + "id": 1042, + "name": "VariableDeclaration", + "src": "1309:22:4" + }, + { + "attributes": { + "constant": false, + "indexed": false, + "name": "encryptedNote", + "scope": 1046, + "stateVariable": false, + "storageLocation": "default", + "type": "bytes", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "bytes", + "type": "bytes" + }, + "id": 1043, + "name": "ElementaryTypeName", + "src": "1333:5:4" + } + ], + "id": 1044, + "name": "VariableDeclaration", + "src": "1333:19:4" + } + ], + "id": 1045, + "name": "ParameterList", + "src": "1308:45:4" + } + ], + "id": 1046, + "name": "EventDefinition", + "src": "1289:65:4" }, { "attributes": { @@ -5437,7 +5911,7 @@ "isConstructor": true, "kind": "constructor", "name": "", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -5449,7 +5923,7 @@ "attributes": { "constant": false, "name": "_verifier", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "contract IVerifier", @@ -5461,23 +5935,23 @@ "attributes": { "contractScope": null, "name": "IVerifier", - "referencedDeclaration": 1041, + "referencedDeclaration": 973, "type": "contract IVerifier" }, - "id": 1103, + "id": 1047, "name": "UserDefinedTypeName", - "src": "1515:9:5" + "src": "1670:9:4" } ], - "id": 1104, + "id": 1048, "name": "VariableDeclaration", - "src": "1515:19:5" + "src": "1670:19:4" }, { "attributes": { "constant": false, "name": "_feeManager", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "contract IFeeManager", @@ -5489,23 +5963,23 @@ "attributes": { "contractScope": null, "name": "IFeeManager", - "referencedDeclaration": 1052, + "referencedDeclaration": 984, "type": "contract IFeeManager" }, - "id": 1105, + "id": 1049, "name": "UserDefinedTypeName", - "src": "1540:11:5" + "src": "1695:11:4" } ], - "id": 1106, + "id": 1050, "name": "VariableDeclaration", - "src": "1540:23:5" + "src": "1695:23:4" }, { "attributes": { "constant": false, "name": "_denomination", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -5518,20 +5992,20 @@ "name": "uint256", "type": "uint256" }, - "id": 1107, + "id": 1051, "name": "ElementaryTypeName", - "src": "1569:7:5" + "src": "1724:7:4" } ], - "id": 1108, + "id": 1052, "name": "VariableDeclaration", - "src": "1569:21:5" + "src": "1724:21:4" }, { "attributes": { "constant": false, "name": "_merkleTreeHeight", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "uint32", @@ -5544,20 +6018,20 @@ "name": "uint32", "type": "uint32" }, - "id": 1109, + "id": 1053, "name": "ElementaryTypeName", - "src": "1596:6:5" + "src": "1751:6:4" } ], - "id": 1110, + "id": 1054, "name": "VariableDeclaration", - "src": "1596:24:5" + "src": "1751:24:4" }, { "attributes": { "constant": false, "name": "_operator", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -5571,19 +6045,19 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1111, + "id": 1055, "name": "ElementaryTypeName", - "src": "1626:7:5" + "src": "1781:7:4" } ], - "id": 1112, + "id": 1056, "name": "VariableDeclaration", - "src": "1626:17:5" + "src": "1781:17:4" } ], - "id": 1113, + "id": 1057, "name": "ParameterList", - "src": "1509:138:5" + "src": "1664:138:4" }, { "attributes": { @@ -5592,9 +6066,9 @@ ] }, "children": [], - "id": 1117, + "id": 1061, "name": "ParameterList", - "src": "1696:0:5" + "src": "1851:0:4" }, { "children": [ @@ -5604,13 +6078,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 838, + "referencedDeclaration": 770, "type": "type(contract MerkleTreeWithHistory)", "value": "MerkleTreeWithHistory" }, - "id": 1114, + "id": 1058, "name": "Identifier", - "src": "1648:21:5" + "src": "1803:21:4" }, { "attributes": { @@ -5618,18 +6092,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1110, + "referencedDeclaration": 1054, "type": "uint32", "value": "_merkleTreeHeight" }, - "id": 1115, + "id": 1059, "name": "Identifier", - "src": "1670:17:5" + "src": "1825:17:4" } ], - "id": 1116, + "id": 1060, "name": "ModifierInvocation", - "src": "1648:40:5" + "src": "1803:40:4" }, { "children": [ @@ -5663,16 +6137,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1118, + "id": 1062, "name": "Identifier", - "src": "1702:7:5" + "src": "1857:7:4" }, { "attributes": { @@ -5695,13 +6169,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1108, + "referencedDeclaration": 1052, "type": "uint256", "value": "_denomination" }, - "id": 1119, + "id": 1063, "name": "Identifier", - "src": "1710:13:5" + "src": "1865:13:4" }, { "attributes": { @@ -5716,14 +6190,14 @@ "type": "int_const 0", "value": "0" }, - "id": 1120, + "id": 1064, "name": "Literal", - "src": "1726:1:5" + "src": "1881:1:4" } ], - "id": 1121, + "id": 1065, "name": "BinaryOperation", - "src": "1710:17:5" + "src": "1865:17:4" }, { "attributes": { @@ -5738,19 +6212,19 @@ "type": "literal_string \"denomination should be greater than 0\"", "value": "denomination should be greater than 0" }, - "id": 1122, + "id": 1066, "name": "Literal", - "src": "1729:39:5" + "src": "1884:39:4" } ], - "id": 1123, + "id": 1067, "name": "FunctionCall", - "src": "1702:67:5" + "src": "1857:67:4" } ], - "id": 1124, + "id": 1068, "name": "ExpressionStatement", - "src": "1702:67:5" + "src": "1857:67:4" }, { "children": [ @@ -5771,13 +6245,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1068, + "referencedDeclaration": 1000, "type": "contract IVerifier", "value": "verifier" }, - "id": 1125, + "id": 1069, "name": "Identifier", - "src": "1775:8:5" + "src": "1930:8:4" }, { "attributes": { @@ -5785,23 +6259,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1104, + "referencedDeclaration": 1048, "type": "contract IVerifier", "value": "_verifier" }, - "id": 1126, + "id": 1070, "name": "Identifier", - "src": "1786:9:5" + "src": "1941:9:4" } ], - "id": 1127, + "id": 1071, "name": "Assignment", - "src": "1775:20:5" + "src": "1930:20:4" } ], - "id": 1128, + "id": 1072, "name": "ExpressionStatement", - "src": "1775:20:5" + "src": "1930:20:4" }, { "children": [ @@ -5822,13 +6296,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1070, + "referencedDeclaration": 1002, "type": "contract IFeeManager", "value": "feeManager" }, - "id": 1129, + "id": 1073, "name": "Identifier", - "src": "1801:10:5" + "src": "1956:10:4" }, { "attributes": { @@ -5836,23 +6310,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1106, + "referencedDeclaration": 1050, "type": "contract IFeeManager", "value": "_feeManager" }, - "id": 1130, + "id": 1074, "name": "Identifier", - "src": "1814:11:5" + "src": "1969:11:4" } ], - "id": 1131, + "id": 1075, "name": "Assignment", - "src": "1801:24:5" + "src": "1956:24:4" } ], - "id": 1132, + "id": 1076, "name": "ExpressionStatement", - "src": "1801:24:5" + "src": "1956:24:4" }, { "children": [ @@ -5873,13 +6347,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1072, + "referencedDeclaration": 1004, "type": "address", "value": "operator" }, - "id": 1133, + "id": 1077, "name": "Identifier", - "src": "1831:8:5" + "src": "1986:8:4" }, { "attributes": { @@ -5887,23 +6361,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1112, + "referencedDeclaration": 1056, "type": "address", "value": "_operator" }, - "id": 1134, + "id": 1078, "name": "Identifier", - "src": "1842:9:5" + "src": "1997:9:4" } ], - "id": 1135, + "id": 1079, "name": "Assignment", - "src": "1831:20:5" + "src": "1986:20:4" } ], - "id": 1136, + "id": 1080, "name": "ExpressionStatement", - "src": "1831:20:5" + "src": "1986:20:4" }, { "children": [ @@ -5924,13 +6398,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1058, + "referencedDeclaration": 990, "type": "uint256", "value": "denomination" }, - "id": 1137, + "id": 1081, "name": "Identifier", - "src": "1857:12:5" + "src": "2012:12:4" }, { "attributes": { @@ -5938,33 +6412,33 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1108, + "referencedDeclaration": 1052, "type": "uint256", "value": "_denomination" }, - "id": 1138, + "id": 1082, "name": "Identifier", - "src": "1872:13:5" + "src": "2027:13:4" } ], - "id": 1139, + "id": 1083, "name": "Assignment", - "src": "1857:28:5" + "src": "2012:28:4" } ], - "id": 1140, + "id": 1084, "name": "ExpressionStatement", - "src": "1857:28:5" + "src": "2012:28:4" } ], - "id": 1141, + "id": 1085, "name": "Block", - "src": "1696:194:5" + "src": "1851:194:4" } ], - "id": 1142, + "id": 1086, "name": "FunctionDefinition", - "src": "1498:392:5" + "src": "1653:392:4" }, { "attributes": { @@ -5973,7 +6447,7 @@ "isConstructor": false, "kind": "function", "name": "deposit", - "scope": 1363, + "scope": 1320, "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -5985,7 +6459,7 @@ "attributes": { "constant": false, "name": "_commitment", - "scope": 1180, + "scope": 1132, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -5998,19 +6472,45 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1143, + "id": 1087, "name": "ElementaryTypeName", - "src": "2155:7:5" + "src": "2310:7:4" } ], - "id": 1144, + "id": 1088, "name": "VariableDeclaration", - "src": "2155:19:5" + "src": "2310:19:4" + }, + { + "attributes": { + "constant": false, + "name": "_encryptedNote", + "scope": 1132, + "stateVariable": false, + "storageLocation": "calldata", + "type": "bytes", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "bytes", + "type": "bytes" + }, + "id": 1089, + "name": "ElementaryTypeName", + "src": "2331:5:4" + } + ], + "id": 1090, + "name": "VariableDeclaration", + "src": "2331:29:4" } ], - "id": 1145, + "id": 1091, "name": "ParameterList", - "src": "2154:21:5" + "src": "2309:52:4" }, { "attributes": { @@ -6019,9 +6519,9 @@ ] }, "children": [], - "id": 1148, + "id": 1094, "name": "ParameterList", - "src": "2206:0:5" + "src": "2392:0:4" }, { "attributes": { @@ -6034,18 +6534,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1392, + "referencedDeclaration": 1349, "type": "modifier ()", "value": "nonReentrant" }, - "id": 1146, + "id": 1092, "name": "Identifier", - "src": "2193:12:5" + "src": "2379:12:4" } ], - "id": 1147, + "id": 1093, "name": "ModifierInvocation", - "src": "2193:12:5" + "src": "2379:12:4" }, { "children": [ @@ -6079,16 +6579,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1149, + "id": 1095, "name": "Identifier", - "src": "2212:7:5" + "src": "2398:7:4" }, { "attributes": { @@ -6118,13 +6618,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1066, + "referencedDeclaration": 998, "type": "mapping(bytes32 => bool)", "value": "commitments" }, - "id": 1150, + "id": 1096, "name": "Identifier", - "src": "2221:11:5" + "src": "2407:11:4" }, { "attributes": { @@ -6132,23 +6632,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1144, + "referencedDeclaration": 1088, "type": "bytes32", "value": "_commitment" }, - "id": 1151, + "id": 1097, "name": "Identifier", - "src": "2233:11:5" + "src": "2419:11:4" } ], - "id": 1152, + "id": 1098, "name": "IndexAccess", - "src": "2221:24:5" + "src": "2407:24:4" } ], - "id": 1153, + "id": 1099, "name": "UnaryOperation", - "src": "2220:25:5" + "src": "2406:25:4" }, { "attributes": { @@ -6163,24 +6663,24 @@ "type": "literal_string \"The commitment has been submitted\"", "value": "The commitment has been submitted" }, - "id": 1154, + "id": 1100, "name": "Literal", - "src": "2247:35:5" + "src": "2433:35:4" } ], - "id": 1155, + "id": 1101, "name": "FunctionCall", - "src": "2212:71:5" + "src": "2398:71:4" } ], - "id": 1156, + "id": 1102, "name": "ExpressionStatement", - "src": "2212:71:5" + "src": "2398:71:4" }, { "attributes": { "assignments": [ - 1158 + 1104 ] }, "children": [ @@ -6188,7 +6688,7 @@ "attributes": { "constant": false, "name": "insertedIndex", - "scope": 1179, + "scope": 1131, "stateVariable": false, "storageLocation": "default", "type": "uint32", @@ -6201,14 +6701,14 @@ "name": "uint32", "type": "uint32" }, - "id": 1157, + "id": 1103, "name": "ElementaryTypeName", - "src": "2290:6:5" + "src": "2476:6:4" } ], - "id": 1158, + "id": 1104, "name": "VariableDeclaration", - "src": "2290:20:5" + "src": "2476:20:4" }, { "attributes": { @@ -6236,13 +6736,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 780, + "referencedDeclaration": 712, "type": "function (bytes32) returns (uint32)", "value": "_insert" }, - "id": 1159, + "id": 1105, "name": "Identifier", - "src": "2313:7:5" + "src": "2499:7:4" }, { "attributes": { @@ -6250,23 +6750,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1144, + "referencedDeclaration": 1088, "type": "bytes32", "value": "_commitment" }, - "id": 1160, + "id": 1106, "name": "Identifier", - "src": "2321:11:5" + "src": "2507:11:4" } ], - "id": 1161, + "id": 1107, "name": "FunctionCall", - "src": "2313:20:5" + "src": "2499:20:4" } ], - "id": 1162, + "id": 1108, "name": "VariableDeclarationStatement", - "src": "2290:43:5" + "src": "2476:43:4" }, { "children": [ @@ -6297,13 +6797,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1066, + "referencedDeclaration": 998, "type": "mapping(bytes32 => bool)", "value": "commitments" }, - "id": 1163, + "id": 1109, "name": "Identifier", - "src": "2339:11:5" + "src": "2525:11:4" }, { "attributes": { @@ -6311,18 +6811,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1144, + "referencedDeclaration": 1088, "type": "bytes32", "value": "_commitment" }, - "id": 1164, + "id": 1110, "name": "Identifier", - "src": "2351:11:5" + "src": "2537:11:4" } ], - "id": 1165, + "id": 1111, "name": "IndexAccess", - "src": "2339:24:5" + "src": "2525:24:4" }, { "attributes": { @@ -6337,19 +6837,19 @@ "type": "bool", "value": "true" }, - "id": 1166, + "id": 1112, "name": "Literal", - "src": "2366:4:5" + "src": "2552:4:4" } ], - "id": 1167, + "id": 1113, "name": "Assignment", - "src": "2339:31:5" + "src": "2525:31:4" } ], - "id": 1168, + "id": 1114, "name": "ExpressionStatement", - "src": "2339:31:5" + "src": "2525:31:4" }, { "children": [ @@ -6379,23 +6879,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1183, + "referencedDeclaration": 1135, "type": "function ()", "value": "_processDeposit" }, - "id": 1169, + "id": 1115, "name": "Identifier", - "src": "2376:15:5" + "src": "2562:15:4" } ], - "id": 1170, + "id": 1116, "name": "FunctionCall", - "src": "2376:17:5" + "src": "2562:17:4" } ], - "id": 1171, + "id": 1117, "name": "ExpressionStatement", - "src": "2376:17:5" + "src": "2562:17:4" }, { "children": [ @@ -6433,13 +6933,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1092, + "referencedDeclaration": 1024, "type": "function (bytes32,uint32,uint256)", "value": "Deposit" }, - "id": 1172, + "id": 1118, "name": "Identifier", - "src": "2405:7:5" + "src": "2591:7:4" }, { "attributes": { @@ -6447,13 +6947,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1144, + "referencedDeclaration": 1088, "type": "bytes32", "value": "_commitment" }, - "id": 1173, + "id": 1119, "name": "Identifier", - "src": "2413:11:5" + "src": "2599:11:4" }, { "attributes": { @@ -6461,13 +6961,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1158, + "referencedDeclaration": 1104, "type": "uint32", "value": "insertedIndex" }, - "id": 1174, + "id": 1120, "name": "Identifier", - "src": "2426:13:5" + "src": "2612:13:4" }, { "attributes": { @@ -6487,38 +6987,133 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1398, + "referencedDeclaration": 1355, "type": "block", "value": "block" }, - "id": 1175, + "id": 1121, "name": "Identifier", - "src": "2441:5:5" + "src": "2627:5:4" } ], - "id": 1176, + "id": 1122, "name": "MemberAccess", - "src": "2441:15:5" + "src": "2627:15:4" } ], - "id": 1177, + "id": 1123, "name": "FunctionCall", - "src": "2405:52:5" + "src": "2591:52:4" } ], - "id": 1178, + "id": 1124, "name": "EmitStatement", - "src": "2400:57:5" + "src": "2586:57:4" + }, + { + "children": [ + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "isStructConstructorCall": false, + "lValueRequested": false, + "names": [ + null + ], + "type": "tuple()", + "type_conversion": false + }, + "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + ], + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1046, + "type": "function (address,bytes memory)", + "value": "EncryptedNote" + }, + "id": 1125, + "name": "Identifier", + "src": "2654:13:4" + }, + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "member_name": "sender", + "referencedDeclaration": null, + "type": "address payable" + }, + "children": [ + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1365, + "type": "msg", + "value": "msg" + }, + "id": 1126, + "name": "Identifier", + "src": "2668:3:4" + } + ], + "id": 1127, + "name": "MemberAccess", + "src": "2668:10:4" + }, + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1090, + "type": "bytes calldata", + "value": "_encryptedNote" + }, + "id": 1128, + "name": "Identifier", + "src": "2680:14:4" + } + ], + "id": 1129, + "name": "FunctionCall", + "src": "2654:41:4" + } + ], + "id": 1130, + "name": "EmitStatement", + "src": "2649:46:4" } ], - "id": 1179, + "id": 1131, "name": "Block", - "src": "2206:256:5" + "src": "2392:308:4" } ], - "id": 1180, + "id": 1132, "name": "FunctionDefinition", - "src": "2138:324:5" + "src": "2293:407:4" }, { "attributes": { @@ -6531,7 +7126,7 @@ null ], "name": "_processDeposit", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" @@ -6544,9 +7139,9 @@ ] }, "children": [], - "id": 1181, + "id": 1133, "name": "ParameterList", - "src": "2549:2:5" + "src": "2787:2:4" }, { "attributes": { @@ -6555,14 +7150,14 @@ ] }, "children": [], - "id": 1182, + "id": 1134, "name": "ParameterList", - "src": "2560:0:5" + "src": "2798:0:4" } ], - "id": 1183, + "id": 1135, "name": "FunctionDefinition", - "src": "2525:36:5" + "src": "2763:36:4" }, { "attributes": { @@ -6571,7 +7166,7 @@ "isConstructor": false, "kind": "function", "name": "withdraw", - "scope": 1363, + "scope": 1320, "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -6583,7 +7178,7 @@ "attributes": { "constant": false, "name": "_proof", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "calldata", "type": "bytes", @@ -6596,20 +7191,20 @@ "name": "bytes", "type": "bytes" }, - "id": 1184, + "id": 1136, "name": "ElementaryTypeName", - "src": "2976:5:5" + "src": "3214:5:4" } ], - "id": 1185, + "id": 1137, "name": "VariableDeclaration", - "src": "2976:21:5" + "src": "3214:21:4" }, { "attributes": { "constant": false, "name": "_root", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -6622,20 +7217,20 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1186, + "id": 1138, "name": "ElementaryTypeName", - "src": "2999:7:5" + "src": "3237:7:4" } ], - "id": 1187, + "id": 1139, "name": "VariableDeclaration", - "src": "2999:13:5" + "src": "3237:13:4" }, { "attributes": { "constant": false, "name": "_nullifierHash", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -6648,20 +7243,20 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1188, + "id": 1140, "name": "ElementaryTypeName", - "src": "3014:7:5" + "src": "3252:7:4" } ], - "id": 1189, + "id": 1141, "name": "VariableDeclaration", - "src": "3014:22:5" + "src": "3252:22:4" }, { "attributes": { "constant": false, "name": "_recipient", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -6675,20 +7270,20 @@ "stateMutability": "payable", "type": "address payable" }, - "id": 1190, + "id": 1142, "name": "ElementaryTypeName", - "src": "3038:15:5" + "src": "3276:15:4" } ], - "id": 1191, + "id": 1143, "name": "VariableDeclaration", - "src": "3038:26:5" + "src": "3276:26:4" }, { "attributes": { "constant": false, "name": "_relayer", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -6702,20 +7297,20 @@ "stateMutability": "payable", "type": "address payable" }, - "id": 1192, + "id": 1144, "name": "ElementaryTypeName", - "src": "3066:15:5" + "src": "3304:15:4" } ], - "id": 1193, + "id": 1145, "name": "VariableDeclaration", - "src": "3066:24:5" + "src": "3304:24:4" }, { "attributes": { "constant": false, "name": "_fee", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -6728,20 +7323,20 @@ "name": "uint256", "type": "uint256" }, - "id": 1194, + "id": 1146, "name": "ElementaryTypeName", - "src": "3092:7:5" + "src": "3330:7:4" } ], - "id": 1195, + "id": 1147, "name": "VariableDeclaration", - "src": "3092:12:5" + "src": "3330:12:4" }, { "attributes": { "constant": false, "name": "_refund", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -6754,19 +7349,19 @@ "name": "uint256", "type": "uint256" }, - "id": 1196, + "id": 1148, "name": "ElementaryTypeName", - "src": "3106:7:5" + "src": "3344:7:4" } ], - "id": 1197, + "id": 1149, "name": "VariableDeclaration", - "src": "3106:15:5" + "src": "3344:15:4" } ], - "id": 1198, + "id": 1150, "name": "ParameterList", - "src": "2975:147:5" + "src": "3213:147:4" }, { "attributes": { @@ -6775,9 +7370,9 @@ ] }, "children": [], - "id": 1201, + "id": 1153, "name": "ParameterList", - "src": "3153:0:5" + "src": "3391:0:4" }, { "attributes": { @@ -6790,18 +7385,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1392, + "referencedDeclaration": 1349, "type": "modifier ()", "value": "nonReentrant" }, - "id": 1199, + "id": 1151, "name": "Identifier", - "src": "3140:12:5" + "src": "3378:12:4" } ], - "id": 1200, + "id": 1152, "name": "ModifierInvocation", - "src": "3140:12:5" + "src": "3378:12:4" }, { "children": [ @@ -6835,16 +7430,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1202, + "id": 1154, "name": "Identifier", - "src": "3159:7:5" + "src": "3397:7:4" }, { "attributes": { @@ -6867,13 +7462,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1195, + "referencedDeclaration": 1147, "type": "uint256", "value": "_fee" }, - "id": 1203, + "id": 1155, "name": "Identifier", - "src": "3167:4:5" + "src": "3405:4:4" }, { "attributes": { @@ -6881,18 +7476,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1058, + "referencedDeclaration": 990, "type": "uint256", "value": "denomination" }, - "id": 1204, + "id": 1156, "name": "Identifier", - "src": "3175:12:5" + "src": "3413:12:4" } ], - "id": 1205, + "id": 1157, "name": "BinaryOperation", - "src": "3167:20:5" + "src": "3405:20:4" }, { "attributes": { @@ -6907,19 +7502,19 @@ "type": "literal_string \"Fee exceeds transfer value\"", "value": "Fee exceeds transfer value" }, - "id": 1206, + "id": 1158, "name": "Literal", - "src": "3189:28:5" + "src": "3427:28:4" } ], - "id": 1207, + "id": 1159, "name": "FunctionCall", - "src": "3159:59:5" + "src": "3397:59:4" } ], - "id": 1208, + "id": 1160, "name": "ExpressionStatement", - "src": "3159:59:5" + "src": "3397:59:4" }, { "children": [ @@ -6951,16 +7546,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1209, + "id": 1161, "name": "Identifier", - "src": "3224:7:5" + "src": "3462:7:4" }, { "attributes": { @@ -6990,13 +7585,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1062, + "referencedDeclaration": 994, "type": "mapping(bytes32 => bool)", "value": "nullifierHashes" }, - "id": 1210, + "id": 1162, "name": "Identifier", - "src": "3233:15:5" + "src": "3471:15:4" }, { "attributes": { @@ -7004,23 +7599,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1189, + "referencedDeclaration": 1141, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1211, + "id": 1163, "name": "Identifier", - "src": "3249:14:5" + "src": "3487:14:4" } ], - "id": 1212, + "id": 1164, "name": "IndexAccess", - "src": "3233:31:5" + "src": "3471:31:4" } ], - "id": 1213, + "id": 1165, "name": "UnaryOperation", - "src": "3232:32:5" + "src": "3470:32:4" }, { "attributes": { @@ -7035,19 +7630,19 @@ "type": "literal_string \"The note has been already spent\"", "value": "The note has been already spent" }, - "id": 1214, + "id": 1166, "name": "Literal", - "src": "3266:33:5" + "src": "3504:33:4" } ], - "id": 1215, + "id": 1167, "name": "FunctionCall", - "src": "3224:76:5" + "src": "3462:76:4" } ], - "id": 1216, + "id": 1168, "name": "ExpressionStatement", - "src": "3224:76:5" + "src": "3462:76:4" }, { "children": [ @@ -7079,16 +7674,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1217, + "id": 1169, "name": "Identifier", - "src": "3306:7:5" + "src": "3544:7:4" }, { "attributes": { @@ -7116,13 +7711,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 827, + "referencedDeclaration": 759, "type": "function (bytes32) view returns (bool)", "value": "isKnownRoot" }, - "id": 1218, + "id": 1170, "name": "Identifier", - "src": "3314:11:5" + "src": "3552:11:4" }, { "attributes": { @@ -7130,18 +7725,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1187, + "referencedDeclaration": 1139, "type": "bytes32", "value": "_root" }, - "id": 1219, + "id": 1171, "name": "Identifier", - "src": "3326:5:5" + "src": "3564:5:4" } ], - "id": 1220, + "id": 1172, "name": "FunctionCall", - "src": "3314:18:5" + "src": "3552:18:4" }, { "attributes": { @@ -7156,19 +7751,19 @@ "type": "literal_string \"Cannot find your merkle root\"", "value": "Cannot find your merkle root" }, - "id": 1221, + "id": 1173, "name": "Literal", - "src": "3334:30:5" + "src": "3572:30:4" } ], - "id": 1222, + "id": 1174, "name": "FunctionCall", - "src": "3306:59:5" + "src": "3544:59:4" } ], - "id": 1223, + "id": 1175, "name": "ExpressionStatement", - "src": "3306:59:5" + "src": "3544:59:4" }, { "children": [ @@ -7200,16 +7795,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1224, + "id": 1176, "name": "Identifier", - "src": "3404:7:5" + "src": "3642:7:4" }, { "attributes": { @@ -7243,7 +7838,7 @@ "isPure": false, "lValueRequested": false, "member_name": "verifyProof", - "referencedDeclaration": 1040, + "referencedDeclaration": 972, "type": "function (bytes memory,uint256[6] memory) external returns (bool)" }, "children": [ @@ -7253,18 +7848,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1068, + "referencedDeclaration": 1000, "type": "contract IVerifier", "value": "verifier" }, - "id": 1225, + "id": 1177, "name": "Identifier", - "src": "3412:8:5" + "src": "3650:8:4" } ], - "id": 1226, + "id": 1178, "name": "MemberAccess", - "src": "3412:20:5" + "src": "3650:20:4" }, { "attributes": { @@ -7272,13 +7867,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1185, + "referencedDeclaration": 1137, "type": "bytes calldata", "value": "_proof" }, - "id": 1227, + "id": 1179, "name": "Identifier", - "src": "3433:6:5" + "src": "3671:6:4" }, { "attributes": { @@ -7321,9 +7916,9 @@ "type": "type(uint256)", "value": "uint256" }, - "id": 1228, + "id": 1180, "name": "ElementaryTypeNameExpression", - "src": "3442:7:5" + "src": "3680:7:4" }, { "attributes": { @@ -7331,18 +7926,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1187, + "referencedDeclaration": 1139, "type": "bytes32", "value": "_root" }, - "id": 1229, + "id": 1181, "name": "Identifier", - "src": "3450:5:5" + "src": "3688:5:4" } ], - "id": 1230, + "id": 1182, "name": "FunctionCall", - "src": "3442:14:5" + "src": "3680:14:4" }, { "attributes": { @@ -7374,9 +7969,9 @@ "type": "type(uint256)", "value": "uint256" }, - "id": 1231, + "id": 1183, "name": "ElementaryTypeNameExpression", - "src": "3458:7:5" + "src": "3696:7:4" }, { "attributes": { @@ -7384,18 +7979,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1189, + "referencedDeclaration": 1141, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1232, + "id": 1184, "name": "Identifier", - "src": "3466:14:5" + "src": "3704:14:4" } ], - "id": 1233, + "id": 1185, "name": "FunctionCall", - "src": "3458:23:5" + "src": "3696:23:4" }, { "attributes": { @@ -7427,9 +8022,9 @@ "type": "type(uint256)", "value": "uint256" }, - "id": 1234, + "id": 1186, "name": "ElementaryTypeNameExpression", - "src": "3483:7:5" + "src": "3721:7:4" }, { "attributes": { @@ -7437,18 +8032,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1191, + "referencedDeclaration": 1143, "type": "address payable", "value": "_recipient" }, - "id": 1235, + "id": 1187, "name": "Identifier", - "src": "3491:10:5" + "src": "3729:10:4" } ], - "id": 1236, + "id": 1188, "name": "FunctionCall", - "src": "3483:19:5" + "src": "3721:19:4" }, { "attributes": { @@ -7480,9 +8075,9 @@ "type": "type(uint256)", "value": "uint256" }, - "id": 1237, + "id": 1189, "name": "ElementaryTypeNameExpression", - "src": "3504:7:5" + "src": "3742:7:4" }, { "attributes": { @@ -7490,18 +8085,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1193, + "referencedDeclaration": 1145, "type": "address payable", "value": "_relayer" }, - "id": 1238, + "id": 1190, "name": "Identifier", - "src": "3512:8:5" + "src": "3750:8:4" } ], - "id": 1239, + "id": 1191, "name": "FunctionCall", - "src": "3504:17:5" + "src": "3742:17:4" }, { "attributes": { @@ -7509,13 +8104,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1195, + "referencedDeclaration": 1147, "type": "uint256", "value": "_fee" }, - "id": 1240, + "id": 1192, "name": "Identifier", - "src": "3523:4:5" + "src": "3761:4:4" }, { "attributes": { @@ -7523,23 +8118,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1197, + "referencedDeclaration": 1149, "type": "uint256", "value": "_refund" }, - "id": 1241, + "id": 1193, "name": "Identifier", - "src": "3529:7:5" + "src": "3767:7:4" } ], - "id": 1242, + "id": 1194, "name": "TupleExpression", - "src": "3441:96:5" + "src": "3679:96:4" } ], - "id": 1243, + "id": 1195, "name": "FunctionCall", - "src": "3412:126:5" + "src": "3650:126:4" }, { "attributes": { @@ -7554,19 +8149,19 @@ "type": "literal_string \"Invalid withdraw proof\"", "value": "Invalid withdraw proof" }, - "id": 1244, + "id": 1196, "name": "Literal", - "src": "3540:24:5" + "src": "3778:24:4" } ], - "id": 1245, + "id": 1197, "name": "FunctionCall", - "src": "3404:161:5" + "src": "3642:161:4" } ], - "id": 1246, + "id": 1198, "name": "ExpressionStatement", - "src": "3404:161:5" + "src": "3642:161:4" }, { "children": [ @@ -7597,13 +8192,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1062, + "referencedDeclaration": 994, "type": "mapping(bytes32 => bool)", "value": "nullifierHashes" }, - "id": 1247, + "id": 1199, "name": "Identifier", - "src": "3572:15:5" + "src": "3810:15:4" }, { "attributes": { @@ -7611,18 +8206,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1189, + "referencedDeclaration": 1141, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1248, + "id": 1200, "name": "Identifier", - "src": "3588:14:5" + "src": "3826:14:4" } ], - "id": 1249, + "id": 1201, "name": "IndexAccess", - "src": "3572:31:5" + "src": "3810:31:4" }, { "attributes": { @@ -7637,19 +8232,19 @@ "type": "bool", "value": "true" }, - "id": 1250, + "id": 1202, "name": "Literal", - "src": "3606:4:5" + "src": "3844:4:4" } ], - "id": 1251, + "id": 1203, "name": "Assignment", - "src": "3572:38:5" + "src": "3810:38:4" } ], - "id": 1252, + "id": 1204, "name": "ExpressionStatement", - "src": "3572:38:5" + "src": "3810:38:4" }, { "children": [ @@ -7691,13 +8286,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1279, + "referencedDeclaration": 1231, "type": "function (address payable,address payable,uint256,uint256)", "value": "_processWithdraw" }, - "id": 1253, + "id": 1205, "name": "Identifier", - "src": "3616:16:5" + "src": "3854:16:4" }, { "attributes": { @@ -7705,13 +8300,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1191, + "referencedDeclaration": 1143, "type": "address payable", "value": "_recipient" }, - "id": 1254, + "id": 1206, "name": "Identifier", - "src": "3633:10:5" + "src": "3871:10:4" }, { "attributes": { @@ -7719,13 +8314,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1193, + "referencedDeclaration": 1145, "type": "address payable", "value": "_relayer" }, - "id": 1255, + "id": 1207, "name": "Identifier", - "src": "3645:8:5" + "src": "3883:8:4" }, { "attributes": { @@ -7733,13 +8328,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1195, + "referencedDeclaration": 1147, "type": "uint256", "value": "_fee" }, - "id": 1256, + "id": 1208, "name": "Identifier", - "src": "3655:4:5" + "src": "3893:4:4" }, { "attributes": { @@ -7747,23 +8342,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1197, + "referencedDeclaration": 1149, "type": "uint256", "value": "_refund" }, - "id": 1257, + "id": 1209, "name": "Identifier", - "src": "3661:7:5" + "src": "3899:7:4" } ], - "id": 1258, + "id": 1210, "name": "FunctionCall", - "src": "3616:53:5" + "src": "3854:53:4" } ], - "id": 1259, + "id": 1211, "name": "ExpressionStatement", - "src": "3616:53:5" + "src": "3854:53:4" }, { "children": [ @@ -7805,13 +8400,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1102, + "referencedDeclaration": 1034, "type": "function (address,bytes32,address,uint256)", "value": "Withdrawal" }, - "id": 1260, + "id": 1212, "name": "Identifier", - "src": "3680:10:5" + "src": "3918:10:4" }, { "attributes": { @@ -7819,13 +8414,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1191, + "referencedDeclaration": 1143, "type": "address payable", "value": "_recipient" }, - "id": 1261, + "id": 1213, "name": "Identifier", - "src": "3691:10:5" + "src": "3929:10:4" }, { "attributes": { @@ -7833,13 +8428,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1189, + "referencedDeclaration": 1141, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1262, + "id": 1214, "name": "Identifier", - "src": "3703:14:5" + "src": "3941:14:4" }, { "attributes": { @@ -7847,13 +8442,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1193, + "referencedDeclaration": 1145, "type": "address payable", "value": "_relayer" }, - "id": 1263, + "id": 1215, "name": "Identifier", - "src": "3719:8:5" + "src": "3957:8:4" }, { "attributes": { @@ -7861,33 +8456,33 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1195, + "referencedDeclaration": 1147, "type": "uint256", "value": "_fee" }, - "id": 1264, + "id": 1216, "name": "Identifier", - "src": "3729:4:5" + "src": "3967:4:4" } ], - "id": 1265, + "id": 1217, "name": "FunctionCall", - "src": "3680:54:5" + "src": "3918:54:4" } ], - "id": 1266, + "id": 1218, "name": "EmitStatement", - "src": "3675:59:5" + "src": "3913:59:4" } ], - "id": 1267, + "id": 1219, "name": "Block", - "src": "3153:586:5" + "src": "3391:586:4" } ], - "id": 1268, + "id": 1220, "name": "FunctionDefinition", - "src": "2958:781:5" + "src": "3196:781:4" }, { "attributes": { @@ -7900,7 +8495,7 @@ null ], "name": "_processWithdraw", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" @@ -7912,7 +8507,7 @@ "attributes": { "constant": false, "name": "_recipient", - "scope": 1279, + "scope": 1231, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -7926,20 +8521,20 @@ "stateMutability": "payable", "type": "address payable" }, - "id": 1269, + "id": 1221, "name": "ElementaryTypeName", - "src": "3828:15:5" + "src": "4066:15:4" } ], - "id": 1270, + "id": 1222, "name": "VariableDeclaration", - "src": "3828:26:5" + "src": "4066:26:4" }, { "attributes": { "constant": false, "name": "_relayer", - "scope": 1279, + "scope": 1231, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -7953,20 +8548,20 @@ "stateMutability": "payable", "type": "address payable" }, - "id": 1271, + "id": 1223, "name": "ElementaryTypeName", - "src": "3856:15:5" + "src": "4094:15:4" } ], - "id": 1272, + "id": 1224, "name": "VariableDeclaration", - "src": "3856:24:5" + "src": "4094:24:4" }, { "attributes": { "constant": false, "name": "_relayer_fee", - "scope": 1279, + "scope": 1231, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -7979,20 +8574,20 @@ "name": "uint256", "type": "uint256" }, - "id": 1273, + "id": 1225, "name": "ElementaryTypeName", - "src": "3882:7:5" + "src": "4120:7:4" } ], - "id": 1274, + "id": 1226, "name": "VariableDeclaration", - "src": "3882:20:5" + "src": "4120:20:4" }, { "attributes": { "constant": false, "name": "_refund", - "scope": 1279, + "scope": 1231, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -8005,19 +8600,19 @@ "name": "uint256", "type": "uint256" }, - "id": 1275, + "id": 1227, "name": "ElementaryTypeName", - "src": "3904:7:5" + "src": "4142:7:4" } ], - "id": 1276, + "id": 1228, "name": "VariableDeclaration", - "src": "3904:15:5" + "src": "4142:15:4" } ], - "id": 1277, + "id": 1229, "name": "ParameterList", - "src": "3827:93:5" + "src": "4065:93:4" }, { "attributes": { @@ -8026,14 +8621,14 @@ ] }, "children": [], - "id": 1278, + "id": 1230, "name": "ParameterList", - "src": "3929:0:5" + "src": "4167:0:4" } ], - "id": 1279, + "id": 1231, "name": "FunctionDefinition", - "src": "3802:128:5" + "src": "4040:128:4" }, { "attributes": { @@ -8045,7 +8640,7 @@ null ], "name": "isSpent", - "scope": 1363, + "scope": 1320, "stateMutability": "view", "superFunction": null, "visibility": "public" @@ -8057,7 +8652,7 @@ "attributes": { "constant": false, "name": "_nullifierHash", - "scope": 1291, + "scope": 1243, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -8070,19 +8665,19 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1280, + "id": 1232, "name": "ElementaryTypeName", - "src": "3997:7:5" + "src": "4235:7:4" } ], - "id": 1281, + "id": 1233, "name": "VariableDeclaration", - "src": "3997:22:5" + "src": "4235:22:4" } ], - "id": 1282, + "id": 1234, "name": "ParameterList", - "src": "3996:24:5" + "src": "4234:24:4" }, { "children": [ @@ -8090,7 +8685,7 @@ "attributes": { "constant": false, "name": "", - "scope": 1291, + "scope": 1243, "stateVariable": false, "storageLocation": "default", "type": "bool", @@ -8103,25 +8698,25 @@ "name": "bool", "type": "bool" }, - "id": 1283, + "id": 1235, "name": "ElementaryTypeName", - "src": "4041:4:5" + "src": "4279:4:4" } ], - "id": 1284, + "id": 1236, "name": "VariableDeclaration", - "src": "4041:4:5" + "src": "4279:4:4" } ], - "id": 1285, + "id": 1237, "name": "ParameterList", - "src": "4040:6:5" + "src": "4278:6:4" }, { "children": [ { "attributes": { - "functionReturnParameters": 1285 + "functionReturnParameters": 1237 }, "children": [ { @@ -8140,13 +8735,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1062, + "referencedDeclaration": 994, "type": "mapping(bytes32 => bool)", "value": "nullifierHashes" }, - "id": 1286, + "id": 1238, "name": "Identifier", - "src": "4060:15:5" + "src": "4298:15:4" }, { "attributes": { @@ -8154,33 +8749,33 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1281, + "referencedDeclaration": 1233, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1287, + "id": 1239, "name": "Identifier", - "src": "4076:14:5" + "src": "4314:14:4" } ], - "id": 1288, + "id": 1240, "name": "IndexAccess", - "src": "4060:31:5" + "src": "4298:31:4" } ], - "id": 1289, + "id": 1241, "name": "Return", - "src": "4053:38:5" + "src": "4291:38:4" } ], - "id": 1290, + "id": 1242, "name": "Block", - "src": "4047:49:5" + "src": "4285:49:4" } ], - "id": 1291, + "id": 1243, "name": "FunctionDefinition", - "src": "3980:116:5" + "src": "4218:116:4" }, { "attributes": { @@ -8192,7 +8787,7 @@ null ], "name": "isSpentArray", - "scope": 1363, + "scope": 1320, "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -8204,7 +8799,7 @@ "attributes": { "constant": false, "name": "_nullifierHashes", - "scope": 1336, + "scope": 1288, "stateVariable": false, "storageLocation": "calldata", "type": "bytes32[]", @@ -8223,24 +8818,24 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1292, + "id": 1244, "name": "ElementaryTypeName", - "src": "4179:7:5" + "src": "4417:7:4" } ], - "id": 1293, + "id": 1245, "name": "ArrayTypeName", - "src": "4179:9:5" + "src": "4417:9:4" } ], - "id": 1294, + "id": 1246, "name": "VariableDeclaration", - "src": "4179:35:5" + "src": "4417:35:4" } ], - "id": 1295, + "id": 1247, "name": "ParameterList", - "src": "4178:37:5" + "src": "4416:37:4" }, { "children": [ @@ -8248,7 +8843,7 @@ "attributes": { "constant": false, "name": "spent", - "scope": 1336, + "scope": 1288, "stateVariable": false, "storageLocation": "memory", "type": "bool[]", @@ -8267,24 +8862,24 @@ "name": "bool", "type": "bool" }, - "id": 1296, + "id": 1248, "name": "ElementaryTypeName", - "src": "4238:4:5" + "src": "4476:4:4" } ], - "id": 1297, + "id": 1249, "name": "ArrayTypeName", - "src": "4238:6:5" + "src": "4476:6:4" } ], - "id": 1298, + "id": 1250, "name": "VariableDeclaration", - "src": "4238:19:5" + "src": "4476:19:4" } ], - "id": 1299, + "id": 1251, "name": "ParameterList", - "src": "4237:21:5" + "src": "4475:21:4" }, { "children": [ @@ -8307,13 +8902,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1298, + "referencedDeclaration": 1250, "type": "bool[] memory", "value": "spent" }, - "id": 1300, + "id": 1252, "name": "Identifier", - "src": "4265:5:5" + "src": "4503:5:4" }, { "attributes": { @@ -8356,19 +8951,19 @@ "name": "bool", "type": "bool" }, - "id": 1301, + "id": 1253, "name": "ElementaryTypeName", - "src": "4277:4:5" + "src": "4515:4:4" } ], - "id": 1302, + "id": 1254, "name": "ArrayTypeName", - "src": "4277:6:5" + "src": "4515:6:4" } ], - "id": 1303, + "id": 1255, "name": "NewExpression", - "src": "4273:10:5" + "src": "4511:10:4" }, { "attributes": { @@ -8388,40 +8983,40 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1294, + "referencedDeclaration": 1246, "type": "bytes32[] calldata", "value": "_nullifierHashes" }, - "id": 1304, + "id": 1256, "name": "Identifier", - "src": "4284:16:5" + "src": "4522:16:4" } ], - "id": 1305, + "id": 1257, "name": "MemberAccess", - "src": "4284:23:5" + "src": "4522:23:4" } ], - "id": 1306, + "id": 1258, "name": "FunctionCall", - "src": "4273:35:5" + "src": "4511:35:4" } ], - "id": 1307, + "id": 1259, "name": "Assignment", - "src": "4265:43:5" + "src": "4503:43:4" } ], - "id": 1308, + "id": 1260, "name": "ExpressionStatement", - "src": "4265:43:5" + "src": "4503:43:4" }, { "children": [ { "attributes": { "assignments": [ - 1310 + 1262 ] }, "children": [ @@ -8429,7 +9024,7 @@ "attributes": { "constant": false, "name": "i", - "scope": 1334, + "scope": 1286, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -8442,14 +9037,14 @@ "name": "uint", "type": "uint256" }, - "id": 1309, + "id": 1261, "name": "ElementaryTypeName", - "src": "4318:4:5" + "src": "4556:4:4" } ], - "id": 1310, + "id": 1262, "name": "VariableDeclaration", - "src": "4318:6:5" + "src": "4556:6:4" }, { "attributes": { @@ -8464,14 +9059,14 @@ "type": "int_const 0", "value": "0" }, - "id": 1311, + "id": 1263, "name": "Literal", - "src": "4327:1:5" + "src": "4565:1:4" } ], - "id": 1312, + "id": 1264, "name": "VariableDeclarationStatement", - "src": "4318:10:5" + "src": "4556:10:4" }, { "attributes": { @@ -8494,13 +9089,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1310, + "referencedDeclaration": 1262, "type": "uint256", "value": "i" }, - "id": 1313, + "id": 1265, "name": "Identifier", - "src": "4330:1:5" + "src": "4568:1:4" }, { "attributes": { @@ -8520,23 +9115,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1294, + "referencedDeclaration": 1246, "type": "bytes32[] calldata", "value": "_nullifierHashes" }, - "id": 1314, + "id": 1266, "name": "Identifier", - "src": "4334:16:5" + "src": "4572:16:4" } ], - "id": 1315, + "id": 1267, "name": "MemberAccess", - "src": "4334:23:5" + "src": "4572:23:4" } ], - "id": 1316, + "id": 1268, "name": "BinaryOperation", - "src": "4330:27:5" + "src": "4568:27:4" }, { "children": [ @@ -8558,23 +9153,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1310, + "referencedDeclaration": 1262, "type": "uint256", "value": "i" }, - "id": 1317, + "id": 1269, "name": "Identifier", - "src": "4359:1:5" + "src": "4597:1:4" } ], - "id": 1318, + "id": 1270, "name": "UnaryOperation", - "src": "4359:3:5" + "src": "4597:3:4" } ], - "id": 1319, + "id": 1271, "name": "ExpressionStatement", - "src": "4359:3:5" + "src": "4597:3:4" }, { "children": [ @@ -8609,13 +9204,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1291, + "referencedDeclaration": 1243, "type": "function (bytes32) view returns (bool)", "value": "isSpent" }, - "id": 1320, + "id": 1272, "name": "Identifier", - "src": "4376:7:5" + "src": "4614:7:4" }, { "attributes": { @@ -8633,13 +9228,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1294, + "referencedDeclaration": 1246, "type": "bytes32[] calldata", "value": "_nullifierHashes" }, - "id": 1321, + "id": 1273, "name": "Identifier", - "src": "4384:16:5" + "src": "4622:16:4" }, { "attributes": { @@ -8647,23 +9242,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1310, + "referencedDeclaration": 1262, "type": "uint256", "value": "i" }, - "id": 1322, + "id": 1274, "name": "Identifier", - "src": "4401:1:5" + "src": "4639:1:4" } ], - "id": 1323, + "id": 1275, "name": "IndexAccess", - "src": "4384:19:5" + "src": "4622:19:4" } ], - "id": 1324, + "id": 1276, "name": "FunctionCall", - "src": "4376:28:5" + "src": "4614:28:4" }, { "children": [ @@ -8696,13 +9291,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1298, + "referencedDeclaration": 1250, "type": "bool[] memory", "value": "spent" }, - "id": 1325, + "id": 1277, "name": "Identifier", - "src": "4416:5:5" + "src": "4654:5:4" }, { "attributes": { @@ -8710,18 +9305,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1310, + "referencedDeclaration": 1262, "type": "uint256", "value": "i" }, - "id": 1326, + "id": 1278, "name": "Identifier", - "src": "4422:1:5" + "src": "4660:1:4" } ], - "id": 1327, + "id": 1279, "name": "IndexAccess", - "src": "4416:8:5" + "src": "4654:8:4" }, { "attributes": { @@ -8736,49 +9331,49 @@ "type": "bool", "value": "true" }, - "id": 1328, + "id": 1280, "name": "Literal", - "src": "4427:4:5" + "src": "4665:4:4" } ], - "id": 1329, + "id": 1281, "name": "Assignment", - "src": "4416:15:5" + "src": "4654:15:4" } ], - "id": 1330, + "id": 1282, "name": "ExpressionStatement", - "src": "4416:15:5" + "src": "4654:15:4" } ], - "id": 1331, + "id": 1283, "name": "Block", - "src": "4406:34:5" + "src": "4644:34:4" } ], - "id": 1332, + "id": 1284, "name": "IfStatement", - "src": "4372:68:5" + "src": "4610:68:4" } ], - "id": 1333, + "id": 1285, "name": "Block", - "src": "4364:82:5" + "src": "4602:82:4" } ], - "id": 1334, + "id": 1286, "name": "ForStatement", - "src": "4314:132:5" + "src": "4552:132:4" } ], - "id": 1335, + "id": 1287, "name": "Block", - "src": "4259:191:5" + "src": "4497:191:4" } ], - "id": 1336, + "id": 1288, "name": "FunctionDefinition", - "src": "4157:293:5" + "src": "4395:293:4" }, { "attributes": { @@ -8787,7 +9382,7 @@ "isConstructor": false, "kind": "function", "name": "updateVerifier", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -8799,7 +9394,7 @@ "attributes": { "constant": false, "name": "_newVerifier", - "scope": 1350, + "scope": 1302, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -8813,19 +9408,19 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1337, + "id": 1289, "name": "ElementaryTypeName", - "src": "4704:7:5" + "src": "4942:7:4" } ], - "id": 1338, + "id": 1290, "name": "VariableDeclaration", - "src": "4704:20:5" + "src": "4942:20:4" } ], - "id": 1339, + "id": 1291, "name": "ParameterList", - "src": "4703:22:5" + "src": "4941:22:4" }, { "attributes": { @@ -8834,9 +9429,9 @@ ] }, "children": [], - "id": 1342, + "id": 1294, "name": "ParameterList", - "src": "4748:0:5" + "src": "4986:0:4" }, { "attributes": { @@ -8849,18 +9444,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1084, + "referencedDeclaration": 1016, "type": "modifier ()", "value": "onlyOperator" }, - "id": 1340, + "id": 1292, "name": "Identifier", - "src": "4735:12:5" + "src": "4973:12:4" } ], - "id": 1341, + "id": 1293, "name": "ModifierInvocation", - "src": "4735:12:5" + "src": "4973:12:4" }, { "children": [ @@ -8883,13 +9478,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1068, + "referencedDeclaration": 1000, "type": "contract IVerifier", "value": "verifier" }, - "id": 1343, + "id": 1295, "name": "Identifier", - "src": "4754:8:5" + "src": "4992:8:4" }, { "attributes": { @@ -8917,13 +9512,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1041, + "referencedDeclaration": 973, "type": "type(contract IVerifier)", "value": "IVerifier" }, - "id": 1344, + "id": 1296, "name": "Identifier", - "src": "4765:9:5" + "src": "5003:9:4" }, { "attributes": { @@ -8931,38 +9526,38 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1338, + "referencedDeclaration": 1290, "type": "address", "value": "_newVerifier" }, - "id": 1345, + "id": 1297, "name": "Identifier", - "src": "4775:12:5" + "src": "5013:12:4" } ], - "id": 1346, + "id": 1298, "name": "FunctionCall", - "src": "4765:23:5" + "src": "5003:23:4" } ], - "id": 1347, + "id": 1299, "name": "Assignment", - "src": "4754:34:5" + "src": "4992:34:4" } ], - "id": 1348, + "id": 1300, "name": "ExpressionStatement", - "src": "4754:34:5" + "src": "4992:34:4" } ], - "id": 1349, + "id": 1301, "name": "Block", - "src": "4748:45:5" + "src": "4986:45:4" } ], - "id": 1350, + "id": 1302, "name": "FunctionDefinition", - "src": "4680:113:5" + "src": "4918:113:4" }, { "attributes": { @@ -8971,7 +9566,7 @@ "isConstructor": false, "kind": "function", "name": "changeOperator", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -8983,7 +9578,7 @@ "attributes": { "constant": false, "name": "_newOperator", - "scope": 1362, + "scope": 1319, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -8997,19 +9592,19 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1351, + "id": 1303, "name": "ElementaryTypeName", - "src": "4867:7:5" + "src": "5105:7:4" } ], - "id": 1352, + "id": 1304, "name": "VariableDeclaration", - "src": "4867:20:5" + "src": "5105:20:4" } ], - "id": 1353, + "id": 1305, "name": "ParameterList", - "src": "4866:22:5" + "src": "5104:22:4" }, { "attributes": { @@ -9018,9 +9613,9 @@ ] }, "children": [], - "id": 1356, + "id": 1308, "name": "ParameterList", - "src": "4911:0:5" + "src": "5149:0:4" }, { "attributes": { @@ -9033,21 +9628,99 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1084, + "referencedDeclaration": 1016, "type": "modifier ()", "value": "onlyOperator" }, - "id": 1354, + "id": 1306, "name": "Identifier", - "src": "4898:12:5" + "src": "5136:12:4" } ], - "id": 1355, + "id": 1307, "name": "ModifierInvocation", - "src": "4898:12:5" + "src": "5136:12:4" }, { "children": [ + { + "children": [ + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "isStructConstructorCall": false, + "lValueRequested": false, + "names": [ + null + ], + "type": "tuple()", + "type_conversion": false + }, + "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1040, + "type": "function (address,address)", + "value": "OwnershipTransferred" + }, + "id": 1309, + "name": "Identifier", + "src": "5160:20:4" + }, + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1004, + "type": "address", + "value": "operator" + }, + "id": 1310, + "name": "Identifier", + "src": "5181:8:4" + }, + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1304, + "type": "address", + "value": "_newOperator" + }, + "id": 1311, + "name": "Identifier", + "src": "5191:12:4" + } + ], + "id": 1312, + "name": "FunctionCall", + "src": "5160:44:4" + } + ], + "id": 1313, + "name": "EmitStatement", + "src": "5155:49:4" + }, { "children": [ { @@ -9067,13 +9740,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1072, + "referencedDeclaration": 1004, "type": "address", "value": "operator" }, - "id": 1357, + "id": 1314, "name": "Identifier", - "src": "4917:8:5" + "src": "5210:8:4" }, { "attributes": { @@ -9081,43 +9754,43 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1352, + "referencedDeclaration": 1304, "type": "address", "value": "_newOperator" }, - "id": 1358, + "id": 1315, "name": "Identifier", - "src": "4928:12:5" + "src": "5221:12:4" } ], - "id": 1359, + "id": 1316, "name": "Assignment", - "src": "4917:23:5" + "src": "5210:23:4" } ], - "id": 1360, + "id": 1317, "name": "ExpressionStatement", - "src": "4917:23:5" + "src": "5210:23:4" } ], - "id": 1361, + "id": 1318, "name": "Block", - "src": "4911:34:5" + "src": "5149:89:4" } ], - "id": 1362, + "id": 1319, "name": "FunctionDefinition", - "src": "4843:102:5" + "src": "5081:157:4" } ], - "id": 1363, + "id": 1320, "name": "ContractDefinition", - "src": "383:4564:5" + "src": "383:4857:4" } ], - "id": 1364, + "id": 1321, "name": "SourceUnit", - "src": "0:4948:5" + "src": "0:5241:4" }, "compiler": { "name": "solc", @@ -9125,7 +9798,7 @@ }, "networks": {}, "schemaVersion": "3.3.4", - "updatedAt": "2021-04-12T00:15:10.066Z", + "updatedAt": "2021-04-18T15:21:30.815Z", "devdoc": { "methods": {} }, diff --git a/client/contracts/Tornado.json b/client/contracts/Tornado.json index b90d77a..a2acd22 100644 --- a/client/contracts/Tornado.json +++ b/client/contracts/Tornado.json @@ -58,6 +58,44 @@ "name": "Deposit", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sender", + "type": "address" + }, + { + "indexed": false, + "internalType": "bytes", + "name": "encryptedNote", + "type": "bytes" + } + ], + "name": "EncryptedNote", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "previousOwner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "newOwner", + "type": "address" + } + ], + "name": "OwnershipTransferred", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -413,6 +451,11 @@ "internalType": "bytes32", "name": "_commitment", "type": "bytes32" + }, + { + "internalType": "bytes", + "name": "_encryptedNote", + "type": "bytes" } ], "name": "deposit", @@ -539,58 +582,58 @@ "type": "function" } ], - "metadata": "{\"compiler\":{\"version\":\"0.5.17+commit.d19bba13\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"contract IVerifier\",\"name\":\"_verifier\",\"type\":\"address\"},{\"internalType\":\"contract IFeeManager\",\"name\":\"_feeManager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_denomination\",\"type\":\"uint256\"},{\"internalType\":\"uint32\",\"name\":\"_merkleTreeHeight\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"_operator\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"commitment\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"leafIndex\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"}],\"name\":\"Deposit\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"nullifierHash\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"relayer\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"fee\",\"type\":\"uint256\"}],\"name\":\"Withdrawal\",\"type\":\"event\"},{\"constant\":true,\"inputs\":[],\"name\":\"FIELD_SIZE\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"ROOT_HISTORY_SIZE\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"ZERO_VALUE\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newOperator\",\"type\":\"address\"}],\"name\":\"changeOperator\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"commitments\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"currentRootIndex\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"denomination\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_commitment\",\"type\":\"bytes32\"}],\"name\":\"deposit\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"feeManager\",\"outputs\":[{\"internalType\":\"contract IFeeManager\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"filledSubtrees\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"getLastRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_left\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"_right\",\"type\":\"bytes32\"}],\"name\":\"hashLeftRight\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"pure\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_root\",\"type\":\"bytes32\"}],\"name\":\"isKnownRoot\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_nullifierHash\",\"type\":\"bytes32\"}],\"name\":\"isSpent\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32[]\",\"name\":\"_nullifierHashes\",\"type\":\"bytes32[]\"}],\"name\":\"isSpentArray\",\"outputs\":[{\"internalType\":\"bool[]\",\"name\":\"spent\",\"type\":\"bool[]\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"levels\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"nextIndex\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"nullifierHashes\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"operator\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"roots\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newVerifier\",\"type\":\"address\"}],\"name\":\"updateVerifier\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"verifier\",\"outputs\":[{\"internalType\":\"contract IVerifier\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_proof\",\"type\":\"bytes\"},{\"internalType\":\"bytes32\",\"name\":\"_root\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"_nullifierHash\",\"type\":\"bytes32\"},{\"internalType\":\"address payable\",\"name\":\"_recipient\",\"type\":\"address\"},{\"internalType\":\"address payable\",\"name\":\"_relayer\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_refund\",\"type\":\"uint256\"}],\"name\":\"withdraw\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"zeros\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{\"changeOperator(address)\":{\"details\":\"operator can change his address \"},\"constructor\":{\"details\":\"The constructor\",\"params\":{\"_denomination\":\"transfer amount for each deposit\",\"_merkleTreeHeight\":\"the height of deposits' Merkle Tree\",\"_operator\":\"operator address (see operator comment above)\",\"_verifier\":\"the address of SNARK verifier for this contract\"}},\"deposit(bytes32)\":{\"details\":\"Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\",\"params\":{\"_commitment\":\"the note commitment, which is PedersenHash(nullifier + secret)\"}},\"getLastRoot()\":{\"details\":\"Returns the last root\"},\"hashLeftRight(bytes32,bytes32)\":{\"details\":\"Hash 2 tree leaves, returns MiMC(_left, _right)\"},\"isKnownRoot(bytes32)\":{\"details\":\"Whether the root is present in the root history\"},\"isSpent(bytes32)\":{\"details\":\"whether a note is already spent \"},\"isSpentArray(bytes32[])\":{\"details\":\"whether an array of notes is already spent \"},\"updateVerifier(address)\":{\"details\":\"allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held. After that operator rights are supposed to be transferred to zero address\"},\"withdraw(bytes,bytes32,bytes32,address,address,uint256,uint256)\":{\"details\":\"Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs `input` array consists of: - merkle root of all deposits in the contract - hash of unique deposit nullifier to prevent double spends - the recipient of funds - optional fee that goes to the transaction sender (usually a relay)\"}}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":\"Tornado\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol\":{\"keccak256\":\"0x671cc9268dd70c47d18795f7e37fc4df11763fcbcca026edcf163f4239036254\",\"urls\":[\"bzz-raw://9c36a207ed164b60a514eae89bfb15e5b4de4b346c4a89a7a1cb50a940bc699d\",\"dweb:/ipfs/QmbPEqFJAGMpYduLEFsbPazyBsYWcjRtpth8X26wCHALwk\"]},\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":{\"keccak256\":\"0x7269c9361452a555e6f29e924e70d4478a8a5bd86c7b33ea3731470a52c235b5\",\"urls\":[\"bzz-raw://eddd542888565cb84d4dac710511b0f02afbed2e0e1a7d25e0425e6d69b7712f\",\"dweb:/ipfs/Qma1KWoX8nZYK1d1PAfRiZH4prYqM347dMkWM6DjJzTqYY\"]},\"@openzeppelin/contracts/utils/ReentrancyGuard.sol\":{\"keccak256\":\"0xb63221b23818d622bfd83d18e0968307e4fcb7a35536bdceded76e1cf8349acd\",\"urls\":[\"bzz-raw://44e1e8c22362c4708a8c3362735f1465f5b05e2f7315e16c7010d694ce019d73\",\"dweb:/ipfs/QmWj9g8X1hxkXRre2kwkEjLBetjuzmSbWHD81bsSojnBkS\"]}},\"version\":1}", + "metadata": "{\"compiler\":{\"version\":\"0.5.17+commit.d19bba13\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"contract IVerifier\",\"name\":\"_verifier\",\"type\":\"address\"},{\"internalType\":\"contract IFeeManager\",\"name\":\"_feeManager\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_denomination\",\"type\":\"uint256\"},{\"internalType\":\"uint32\",\"name\":\"_merkleTreeHeight\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"_operator\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"commitment\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"leafIndex\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"}],\"name\":\"Deposit\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"encryptedNote\",\"type\":\"bytes\"}],\"name\":\"EncryptedNote\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"previousOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"nullifierHash\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"relayer\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"fee\",\"type\":\"uint256\"}],\"name\":\"Withdrawal\",\"type\":\"event\"},{\"constant\":true,\"inputs\":[],\"name\":\"FIELD_SIZE\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"ROOT_HISTORY_SIZE\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"ZERO_VALUE\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newOperator\",\"type\":\"address\"}],\"name\":\"changeOperator\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"commitments\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"currentRootIndex\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"denomination\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_commitment\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"_encryptedNote\",\"type\":\"bytes\"}],\"name\":\"deposit\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"feeManager\",\"outputs\":[{\"internalType\":\"contract IFeeManager\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"filledSubtrees\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"getLastRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_left\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"_right\",\"type\":\"bytes32\"}],\"name\":\"hashLeftRight\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"pure\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_root\",\"type\":\"bytes32\"}],\"name\":\"isKnownRoot\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_nullifierHash\",\"type\":\"bytes32\"}],\"name\":\"isSpent\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32[]\",\"name\":\"_nullifierHashes\",\"type\":\"bytes32[]\"}],\"name\":\"isSpentArray\",\"outputs\":[{\"internalType\":\"bool[]\",\"name\":\"spent\",\"type\":\"bool[]\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"levels\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"nextIndex\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"\",\"type\":\"uint32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"nullifierHashes\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"operator\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"roots\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newVerifier\",\"type\":\"address\"}],\"name\":\"updateVerifier\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"verifier\",\"outputs\":[{\"internalType\":\"contract IVerifier\",\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_proof\",\"type\":\"bytes\"},{\"internalType\":\"bytes32\",\"name\":\"_root\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"_nullifierHash\",\"type\":\"bytes32\"},{\"internalType\":\"address payable\",\"name\":\"_recipient\",\"type\":\"address\"},{\"internalType\":\"address payable\",\"name\":\"_relayer\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_refund\",\"type\":\"uint256\"}],\"name\":\"withdraw\",\"outputs\":[],\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"zeros\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"methods\":{\"changeOperator(address)\":{\"details\":\"operator can change his address \"},\"constructor\":{\"details\":\"The constructor\",\"params\":{\"_denomination\":\"transfer amount for each deposit\",\"_merkleTreeHeight\":\"the height of deposits' Merkle Tree\",\"_operator\":\"operator address (see operator comment above)\",\"_verifier\":\"the address of SNARK verifier for this contract\"}},\"deposit(bytes32,bytes)\":{\"details\":\"Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\",\"params\":{\"_commitment\":\"the note commitment, which is PedersenHash(nullifier + secret)\"}},\"getLastRoot()\":{\"details\":\"Returns the last root\"},\"hashLeftRight(bytes32,bytes32)\":{\"details\":\"Hash 2 tree leaves, returns MiMC(_left, _right)\"},\"isKnownRoot(bytes32)\":{\"details\":\"Whether the root is present in the root history\"},\"isSpent(bytes32)\":{\"details\":\"whether a note is already spent \"},\"isSpentArray(bytes32[])\":{\"details\":\"whether an array of notes is already spent \"},\"updateVerifier(address)\":{\"details\":\"allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held. After that operator rights are supposed to be transferred to zero address\"},\"withdraw(bytes,bytes32,bytes32,address,address,uint256,uint256)\":{\"details\":\"Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs `input` array consists of: - merkle root of all deposits in the contract - hash of unique deposit nullifier to prevent double spends - the recipient of funds - optional fee that goes to the transaction sender (usually a relay)\"}}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":\"Tornado\"},\"evmVersion\":\"istanbul\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol\":{\"keccak256\":\"0x671cc9268dd70c47d18795f7e37fc4df11763fcbcca026edcf163f4239036254\",\"urls\":[\"bzz-raw://9c36a207ed164b60a514eae89bfb15e5b4de4b346c4a89a7a1cb50a940bc699d\",\"dweb:/ipfs/QmbPEqFJAGMpYduLEFsbPazyBsYWcjRtpth8X26wCHALwk\"]},\"/home/home/dotfiles/tornado-core/contracts/Tornado.sol\":{\"keccak256\":\"0xf81220c0ba8ed77606f414c085676c1a46d09bc286ddf6aeffa22d4e1504fc0c\",\"urls\":[\"bzz-raw://962b946c3ed0b58fa24c9b6668443a58c49527b8d01593734fece90669e07955\",\"dweb:/ipfs/QmfFRroF2gQGXHPJ9t4HJz2SMkSzLcrKugmXiJ1H6V45iP\"]},\"@openzeppelin/contracts/utils/ReentrancyGuard.sol\":{\"keccak256\":\"0xb63221b23818d622bfd83d18e0968307e4fcb7a35536bdceded76e1cf8349acd\",\"urls\":[\"bzz-raw://44e1e8c22362c4708a8c3362735f1465f5b05e2f7315e16c7010d694ce019d73\",\"dweb:/ipfs/QmWj9g8X1hxkXRre2kwkEjLBetjuzmSbWHD81bsSojnBkS\"]}},\"version\":1}", "bytecode": "0x", "deployedBytecode": "0x", "sourceMap": "", "deployedSourceMap": "", - "source": "pragma solidity 0.5.17;\n\nimport \"./MerkleTreeWithHistory.sol\";\nimport \"@openzeppelin/contracts/utils/ReentrancyGuard.sol\";\n\ncontract IVerifier {\n function verifyProof(bytes memory _proof, uint256[6] memory _input) public returns(bool);\n}\n\ncontract IFeeManager {\n function feeTo() external view returns (address);\n function protocolFeeDivisor() external view returns (uint256);\n}\n\ncontract Tornado is MerkleTreeWithHistory, ReentrancyGuard {\n uint256 public denomination;\n mapping(bytes32 => bool) public nullifierHashes;\n // we store all commitments just to prevent accidental deposits with the same commitment\n mapping(bytes32 => bool) public commitments;\n IVerifier public verifier;\n IFeeManager public feeManager;\n\n // operator can update snark verification key\n // after the final trusted setup ceremony operator rights are supposed to be transferred to zero address\n address public operator;\n modifier onlyOperator {\n require(msg.sender == operator, \"Only operator can call this function.\");\n _;\n }\n\n event Deposit(bytes32 indexed commitment, uint32 leafIndex, uint256 timestamp);\n event Withdrawal(address to, bytes32 nullifierHash, address indexed relayer, uint256 fee);\n\n /**\n @dev The constructor\n @param _verifier the address of SNARK verifier for this contract\n @param _denomination transfer amount for each deposit\n @param _merkleTreeHeight the height of deposits' Merkle Tree\n @param _operator operator address (see operator comment above)\n */\n constructor(\n IVerifier _verifier,\n IFeeManager _feeManager,\n uint256 _denomination,\n uint32 _merkleTreeHeight,\n address _operator\n ) MerkleTreeWithHistory(_merkleTreeHeight) public {\n require(_denomination > 0, \"denomination should be greater than 0\");\n verifier = _verifier;\n feeManager = _feeManager;\n operator = _operator;\n denomination = _denomination;\n }\n\n /**\n @dev Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\n @param _commitment the note commitment, which is PedersenHash(nullifier + secret)\n */\n function deposit(bytes32 _commitment) external payable nonReentrant {\n require(!commitments[_commitment], \"The commitment has been submitted\");\n\n uint32 insertedIndex = _insert(_commitment);\n commitments[_commitment] = true;\n _processDeposit();\n\n emit Deposit(_commitment, insertedIndex, block.timestamp);\n }\n\n /** @dev this function is defined in a child contract */\n function _processDeposit() internal;\n\n /**\n @dev Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs\n `input` array consists of:\n - merkle root of all deposits in the contract\n - hash of unique deposit nullifier to prevent double spends\n - the recipient of funds\n - optional fee that goes to the transaction sender (usually a relay)\n */\n function withdraw(bytes calldata _proof, bytes32 _root, bytes32 _nullifierHash, address payable _recipient, address payable _relayer, uint256 _fee, uint256 _refund) external payable nonReentrant {\n require(_fee <= denomination, \"Fee exceeds transfer value\");\n require(!nullifierHashes[_nullifierHash], \"The note has been already spent\");\n require(isKnownRoot(_root), \"Cannot find your merkle root\"); // Make sure to use a recent one\n require(verifier.verifyProof(_proof, [uint256(_root), uint256(_nullifierHash), uint256(_recipient), uint256(_relayer), _fee, _refund]), \"Invalid withdraw proof\");\n\n nullifierHashes[_nullifierHash] = true;\n _processWithdraw(_recipient, _relayer, _fee, _refund);\n emit Withdrawal(_recipient, _nullifierHash, _relayer, _fee);\n }\n\n /** @dev this function is defined in a child contract */\n function _processWithdraw(address payable _recipient, address payable _relayer, uint256 _relayer_fee, uint256 _refund) internal;\n\n /** @dev whether a note is already spent */\n function isSpent(bytes32 _nullifierHash) public view returns(bool) {\n return nullifierHashes[_nullifierHash];\n }\n\n /** @dev whether an array of notes is already spent */\n function isSpentArray(bytes32[] calldata _nullifierHashes) external view returns(bool[] memory spent) {\n spent = new bool[](_nullifierHashes.length);\n for(uint i = 0; i < _nullifierHashes.length; i++) {\n if (isSpent(_nullifierHashes[i])) {\n spent[i] = true;\n }\n }\n }\n\n /**\n @dev allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held.\n After that operator rights are supposed to be transferred to zero address\n */\n function updateVerifier(address _newVerifier) external onlyOperator {\n verifier = IVerifier(_newVerifier);\n }\n\n /** @dev operator can change his address */\n function changeOperator(address _newOperator) external onlyOperator {\n operator = _newOperator;\n }\n}\n", + "source": "pragma solidity 0.5.17;\n\nimport \"./MerkleTreeWithHistory.sol\";\nimport \"@openzeppelin/contracts/utils/ReentrancyGuard.sol\";\n\ncontract IVerifier {\n function verifyProof(bytes memory _proof, uint256[6] memory _input) public returns(bool);\n}\n\ncontract IFeeManager {\n function feeTo() external view returns (address);\n function protocolFeeDivisor() external view returns (uint256);\n}\n\ncontract Tornado is MerkleTreeWithHistory, ReentrancyGuard {\n uint256 public denomination;\n mapping(bytes32 => bool) public nullifierHashes;\n // we store all commitments just to prevent accidental deposits with the same commitment\n mapping(bytes32 => bool) public commitments;\n IVerifier public verifier;\n IFeeManager public feeManager;\n\n // operator can update snark verification key\n // after the final trusted setup ceremony operator rights are supposed to be transferred to zero address\n address public operator;\n modifier onlyOperator {\n require(msg.sender == operator, \"Only operator can call this function.\");\n _;\n }\n\n event Deposit(bytes32 indexed commitment, uint32 leafIndex, uint256 timestamp);\n event Withdrawal(address to, bytes32 nullifierHash, address indexed relayer, uint256 fee);\n event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);\n event EncryptedNote(address indexed sender, bytes encryptedNote);\n\n /**\n @dev The constructor\n @param _verifier the address of SNARK verifier for this contract\n @param _denomination transfer amount for each deposit\n @param _merkleTreeHeight the height of deposits' Merkle Tree\n @param _operator operator address (see operator comment above)\n */\n constructor(\n IVerifier _verifier,\n IFeeManager _feeManager,\n uint256 _denomination,\n uint32 _merkleTreeHeight,\n address _operator\n ) MerkleTreeWithHistory(_merkleTreeHeight) public {\n require(_denomination > 0, \"denomination should be greater than 0\");\n verifier = _verifier;\n feeManager = _feeManager;\n operator = _operator;\n denomination = _denomination;\n }\n\n /**\n @dev Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\n @param _commitment the note commitment, which is PedersenHash(nullifier + secret)\n */\n function deposit(bytes32 _commitment, bytes calldata _encryptedNote) external payable nonReentrant {\n require(!commitments[_commitment], \"The commitment has been submitted\");\n\n uint32 insertedIndex = _insert(_commitment);\n commitments[_commitment] = true;\n _processDeposit();\n\n emit Deposit(_commitment, insertedIndex, block.timestamp);\n emit EncryptedNote(msg.sender, _encryptedNote);\n }\n\n /** @dev this function is defined in a child contract */\n function _processDeposit() internal;\n\n /**\n @dev Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs\n `input` array consists of:\n - merkle root of all deposits in the contract\n - hash of unique deposit nullifier to prevent double spends\n - the recipient of funds\n - optional fee that goes to the transaction sender (usually a relay)\n */\n function withdraw(bytes calldata _proof, bytes32 _root, bytes32 _nullifierHash, address payable _recipient, address payable _relayer, uint256 _fee, uint256 _refund) external payable nonReentrant {\n require(_fee <= denomination, \"Fee exceeds transfer value\");\n require(!nullifierHashes[_nullifierHash], \"The note has been already spent\");\n require(isKnownRoot(_root), \"Cannot find your merkle root\"); // Make sure to use a recent one\n require(verifier.verifyProof(_proof, [uint256(_root), uint256(_nullifierHash), uint256(_recipient), uint256(_relayer), _fee, _refund]), \"Invalid withdraw proof\");\n\n nullifierHashes[_nullifierHash] = true;\n _processWithdraw(_recipient, _relayer, _fee, _refund);\n emit Withdrawal(_recipient, _nullifierHash, _relayer, _fee);\n }\n\n /** @dev this function is defined in a child contract */\n function _processWithdraw(address payable _recipient, address payable _relayer, uint256 _relayer_fee, uint256 _refund) internal;\n\n /** @dev whether a note is already spent */\n function isSpent(bytes32 _nullifierHash) public view returns(bool) {\n return nullifierHashes[_nullifierHash];\n }\n\n /** @dev whether an array of notes is already spent */\n function isSpentArray(bytes32[] calldata _nullifierHashes) external view returns(bool[] memory spent) {\n spent = new bool[](_nullifierHashes.length);\n for(uint i = 0; i < _nullifierHashes.length; i++) {\n if (isSpent(_nullifierHashes[i])) {\n spent[i] = true;\n }\n }\n }\n\n /**\n @dev allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held.\n After that operator rights are supposed to be transferred to zero address\n */\n function updateVerifier(address _newVerifier) external onlyOperator {\n verifier = IVerifier(_newVerifier);\n }\n\n /** @dev operator can change his address */\n function changeOperator(address _newOperator) external onlyOperator {\n emit OwnershipTransferred(operator, _newOperator);\n operator = _newOperator;\n }\n}\n", "sourcePath": "/home/home/dotfiles/tornado-core/contracts/Tornado.sol", "ast": { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/Tornado.sol", "exportedSymbols": { "IFeeManager": [ - 1052 + 984 ], "IVerifier": [ - 1041 + 973 ], "Tornado": [ - 1363 + 1320 ] }, - "id": 1364, + "id": 1321, "nodeType": "SourceUnit", "nodes": [ { - "id": 1027, + "id": 959, "literals": [ "solidity", "0.5", ".17" ], "nodeType": "PragmaDirective", - "src": "0:23:5" + "src": "0:23:4" }, { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol", "file": "./MerkleTreeWithHistory.sol", - "id": 1028, + "id": 960, "nodeType": "ImportDirective", - "scope": 1364, - "sourceUnit": 839, - "src": "25:37:5", + "scope": 1321, + "sourceUnit": 771, + "src": "25:37:4", "symbolAliases": [], "unitAlias": "" }, { "absolutePath": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", "file": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", - "id": 1029, + "id": 961, "nodeType": "ImportDirective", - "scope": 1364, - "sourceUnit": 1394, - "src": "63:59:5", + "scope": 1321, + "sourceUnit": 1351, + "src": "63:59:4", "symbolAliases": [], "unitAlias": "" }, @@ -600,9 +643,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1041, + "id": 973, "linearizedBaseContracts": [ - 1041 + 973 ], "name": "IVerifier", "nodeType": "ContractDefinition", @@ -610,23 +653,23 @@ { "body": null, "documentation": null, - "id": 1040, + "id": 972, "implemented": false, "kind": "function", "modifiers": [], "name": "verifyProof", "nodeType": "FunctionDefinition", "parameters": { - "id": 1036, + "id": 968, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1031, + "id": 963, "name": "_proof", "nodeType": "VariableDeclaration", - "scope": 1040, - "src": "168:19:5", + "scope": 972, + "src": "168:19:4", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -634,10 +677,10 @@ "typeString": "bytes" }, "typeName": { - "id": 1030, + "id": 962, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "168:5:5", + "src": "168:5:4", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -648,11 +691,11 @@ }, { "constant": false, - "id": 1035, + "id": 967, "name": "_input", "nodeType": "VariableDeclaration", - "scope": 1040, - "src": "189:24:5", + "scope": 972, + "src": "189:24:4", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -661,27 +704,27 @@ }, "typeName": { "baseType": { - "id": 1032, + "id": 964, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "189:7:5", + "src": "189:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1034, + "id": 966, "length": { "argumentTypes": null, "hexValue": "36", - "id": 1033, + "id": 965, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "197:1:5", + "src": "197:1:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_6_by_1", @@ -690,7 +733,7 @@ "value": "6" }, "nodeType": "ArrayTypeName", - "src": "189:10:5", + "src": "189:10:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$6_storage_ptr", "typeString": "uint256[6]" @@ -700,19 +743,19 @@ "visibility": "internal" } ], - "src": "167:47:5" + "src": "167:47:4" }, "returnParameters": { - "id": 1039, + "id": 971, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1038, + "id": 970, "name": "", "nodeType": "VariableDeclaration", - "scope": 1040, - "src": "230:4:5", + "scope": 972, + "src": "230:4:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -720,10 +763,10 @@ "typeString": "bool" }, "typeName": { - "id": 1037, + "id": 969, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "230:4:5", + "src": "230:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -733,17 +776,17 @@ "visibility": "internal" } ], - "src": "229:6:5" + "src": "229:6:4" }, - "scope": 1041, - "src": "147:89:5", + "scope": 973, + "src": "147:89:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], - "scope": 1364, - "src": "124:114:5" + "scope": 1321, + "src": "124:114:4" }, { "baseContracts": [], @@ -751,9 +794,9 @@ "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1052, + "id": 984, "linearizedBaseContracts": [ - 1052 + 984 ], "name": "IFeeManager", "nodeType": "ContractDefinition", @@ -761,29 +804,29 @@ { "body": null, "documentation": null, - "id": 1046, + "id": 978, "implemented": false, "kind": "function", "modifiers": [], "name": "feeTo", "nodeType": "FunctionDefinition", "parameters": { - "id": 1042, + "id": 974, "nodeType": "ParameterList", "parameters": [], - "src": "279:2:5" + "src": "279:2:4" }, "returnParameters": { - "id": 1045, + "id": 977, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1044, + "id": 976, "name": "", "nodeType": "VariableDeclaration", - "scope": 1046, - "src": "305:7:5", + "scope": 978, + "src": "305:7:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -791,10 +834,10 @@ "typeString": "address" }, "typeName": { - "id": 1043, + "id": 975, "name": "address", "nodeType": "ElementaryTypeName", - "src": "305:7:5", + "src": "305:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -805,10 +848,10 @@ "visibility": "internal" } ], - "src": "304:9:5" + "src": "304:9:4" }, - "scope": 1052, - "src": "265:49:5", + "scope": 984, + "src": "265:49:4", "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -816,29 +859,29 @@ { "body": null, "documentation": null, - "id": 1051, + "id": 983, "implemented": false, "kind": "function", "modifiers": [], "name": "protocolFeeDivisor", "nodeType": "FunctionDefinition", "parameters": { - "id": 1047, + "id": 979, "nodeType": "ParameterList", "parameters": [], - "src": "344:2:5" + "src": "344:2:4" }, "returnParameters": { - "id": 1050, + "id": 982, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1049, + "id": 981, "name": "", "nodeType": "VariableDeclaration", - "scope": 1051, - "src": "370:7:5", + "scope": 983, + "src": "370:7:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -846,10 +889,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1048, + "id": 980, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "370:7:5", + "src": "370:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -859,17 +902,17 @@ "visibility": "internal" } ], - "src": "369:9:5" + "src": "369:9:4" }, - "scope": 1052, - "src": "317:62:5", + "scope": 984, + "src": "317:62:4", "stateMutability": "view", "superFunction": null, "visibility": "external" } ], - "scope": 1364, - "src": "240:141:5" + "scope": 1321, + "src": "240:141:4" }, { "baseContracts": [ @@ -877,62 +920,62 @@ "arguments": null, "baseName": { "contractScope": null, - "id": 1053, + "id": 985, "name": "MerkleTreeWithHistory", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 838, - "src": "403:21:5", + "referencedDeclaration": 770, + "src": "403:21:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_MerkleTreeWithHistory_$838", + "typeIdentifier": "t_contract$_MerkleTreeWithHistory_$770", "typeString": "contract MerkleTreeWithHistory" } }, - "id": 1054, + "id": 986, "nodeType": "InheritanceSpecifier", - "src": "403:21:5" + "src": "403:21:4" }, { "arguments": null, "baseName": { "contractScope": null, - "id": 1055, + "id": 987, "name": "ReentrancyGuard", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1393, - "src": "426:15:5", + "referencedDeclaration": 1350, + "src": "426:15:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_ReentrancyGuard_$1393", + "typeIdentifier": "t_contract$_ReentrancyGuard_$1350", "typeString": "contract ReentrancyGuard" } }, - "id": 1056, + "id": 988, "nodeType": "InheritanceSpecifier", - "src": "426:15:5" + "src": "426:15:4" } ], "contractDependencies": [ - 838, - 1393 + 770, + 1350 ], "contractKind": "contract", "documentation": null, "fullyImplemented": false, - "id": 1363, + "id": 1320, "linearizedBaseContracts": [ - 1363, - 1393, - 838 + 1320, + 1350, + 770 ], "name": "Tornado", "nodeType": "ContractDefinition", "nodes": [ { "constant": false, - "id": 1058, + "id": 990, "name": "denomination", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "446:27:5", + "scope": 1320, + "src": "446:27:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -940,10 +983,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1057, + "id": 989, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "446:7:5", + "src": "446:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -954,11 +997,11 @@ }, { "constant": false, - "id": 1062, + "id": 994, "name": "nullifierHashes", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "477:47:5", + "scope": 1320, + "src": "477:47:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -966,28 +1009,28 @@ "typeString": "mapping(bytes32 => bool)" }, "typeName": { - "id": 1061, + "id": 993, "keyType": { - "id": 1059, + "id": 991, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "485:7:5", + "src": "485:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "477:24:5", + "src": "477:24:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" }, "valueType": { - "id": 1060, + "id": 992, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "496:4:5", + "src": "496:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -999,11 +1042,11 @@ }, { "constant": false, - "id": 1066, + "id": 998, "name": "commitments", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "619:43:5", + "scope": 1320, + "src": "619:43:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1011,28 +1054,28 @@ "typeString": "mapping(bytes32 => bool)" }, "typeName": { - "id": 1065, + "id": 997, "keyType": { - "id": 1063, + "id": 995, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "627:7:5", + "src": "627:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, "nodeType": "Mapping", - "src": "619:24:5", + "src": "619:24:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" }, "valueType": { - "id": 1064, + "id": 996, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "638:4:5", + "src": "638:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1044,26 +1087,26 @@ }, { "constant": false, - "id": 1068, + "id": 1000, "name": "verifier", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "666:25:5", + "scope": 1320, + "src": "666:25:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" }, "typeName": { "contractScope": null, - "id": 1067, + "id": 999, "name": "IVerifier", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1041, - "src": "666:9:5", + "referencedDeclaration": 973, + "src": "666:9:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -1072,26 +1115,26 @@ }, { "constant": false, - "id": 1070, + "id": 1002, "name": "feeManager", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "695:29:5", + "scope": 1320, + "src": "695:29:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" }, "typeName": { "contractScope": null, - "id": 1069, + "id": 1001, "name": "IFeeManager", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1052, - "src": "695:11:5", + "referencedDeclaration": 984, + "src": "695:11:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -1100,11 +1143,11 @@ }, { "constant": false, - "id": 1072, + "id": 1004, "name": "operator", "nodeType": "VariableDeclaration", - "scope": 1363, - "src": "884:23:5", + "scope": 1320, + "src": "884:23:4", "stateVariable": true, "storageLocation": "default", "typeDescriptions": { @@ -1112,10 +1155,10 @@ "typeString": "address" }, "typeName": { - "id": 1071, + "id": 1003, "name": "address", "nodeType": "ElementaryTypeName", - "src": "884:7:5", + "src": "884:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1127,9 +1170,9 @@ }, { "body": { - "id": 1083, + "id": 1015, "nodeType": "Block", - "src": "933:90:5", + "src": "933:90:4", "statements": [ { "expression": { @@ -1141,7 +1184,7 @@ "typeIdentifier": "t_address", "typeString": "address" }, - "id": 1078, + "id": 1010, "isConstant": false, "isLValue": false, "isPure": false, @@ -1150,18 +1193,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1075, + "id": 1007, "name": "msg", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1408, - "src": "947:3:5", + "referencedDeclaration": 1365, + "src": "947:3:4", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" } }, - "id": 1076, + "id": 1008, "isConstant": false, "isLValue": false, "isPure": false, @@ -1169,7 +1212,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "947:10:5", + "src": "947:10:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -1179,18 +1222,18 @@ "operator": "==", "rightExpression": { "argumentTypes": null, - "id": 1077, + "id": 1009, "name": "operator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1072, - "src": "961:8:5", + "referencedDeclaration": 1004, + "src": "961:8:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "947:22:5", + "src": "947:22:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1199,14 +1242,14 @@ { "argumentTypes": null, "hexValue": "4f6e6c79206f70657261746f722063616e2063616c6c20746869732066756e6374696f6e2e", - "id": 1079, + "id": 1011, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "971:39:5", + "src": "971:39:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_e8393660073679be7a6133571fe2ca8983a31a683c72e9055f401ac33a2efffc", @@ -1226,21 +1269,21 @@ "typeString": "literal_string \"Only operator can call this function.\"" } ], - "id": 1074, + "id": 1006, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "939:7:5", + "referencedDeclaration": 1369, + "src": "939:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1080, + "id": 1012, "isConstant": false, "isLValue": false, "isPure": false, @@ -1248,54 +1291,54 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "939:72:5", + "src": "939:72:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1081, + "id": 1013, "nodeType": "ExpressionStatement", - "src": "939:72:5" + "src": "939:72:4" }, { - "id": 1082, + "id": 1014, "nodeType": "PlaceholderStatement", - "src": "1017:1:5" + "src": "1017:1:4" } ] }, "documentation": null, - "id": 1084, + "id": 1016, "name": "onlyOperator", "nodeType": "ModifierDefinition", "parameters": { - "id": 1073, + "id": 1005, "nodeType": "ParameterList", "parameters": [], - "src": "933:0:5" + "src": "933:0:4" }, - "src": "911:112:5", + "src": "911:112:4", "visibility": "internal" }, { "anonymous": false, "documentation": null, - "id": 1092, + "id": 1024, "name": "Deposit", "nodeType": "EventDefinition", "parameters": { - "id": 1091, + "id": 1023, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1086, + "id": 1018, "indexed": true, "name": "commitment", "nodeType": "VariableDeclaration", - "scope": 1092, - "src": "1041:26:5", + "scope": 1024, + "src": "1041:26:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1303,10 +1346,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1085, + "id": 1017, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1041:7:5", + "src": "1041:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1317,12 +1360,12 @@ }, { "constant": false, - "id": 1088, + "id": 1020, "indexed": false, "name": "leafIndex", "nodeType": "VariableDeclaration", - "scope": 1092, - "src": "1069:16:5", + "scope": 1024, + "src": "1069:16:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1330,10 +1373,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1087, + "id": 1019, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "1069:6:5", + "src": "1069:6:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -1344,12 +1387,12 @@ }, { "constant": false, - "id": 1090, + "id": 1022, "indexed": false, "name": "timestamp", "nodeType": "VariableDeclaration", - "scope": 1092, - "src": "1087:17:5", + "scope": 1024, + "src": "1087:17:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1357,10 +1400,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1089, + "id": 1021, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1087:7:5", + "src": "1087:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1370,28 +1413,28 @@ "visibility": "internal" } ], - "src": "1040:65:5" + "src": "1040:65:4" }, - "src": "1027:79:5" + "src": "1027:79:4" }, { "anonymous": false, "documentation": null, - "id": 1102, + "id": 1034, "name": "Withdrawal", "nodeType": "EventDefinition", "parameters": { - "id": 1101, + "id": 1033, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1094, + "id": 1026, "indexed": false, "name": "to", "nodeType": "VariableDeclaration", - "scope": 1102, - "src": "1126:10:5", + "scope": 1034, + "src": "1126:10:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1399,10 +1442,10 @@ "typeString": "address" }, "typeName": { - "id": 1093, + "id": 1025, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1126:7:5", + "src": "1126:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1414,12 +1457,12 @@ }, { "constant": false, - "id": 1096, + "id": 1028, "indexed": false, "name": "nullifierHash", "nodeType": "VariableDeclaration", - "scope": 1102, - "src": "1138:21:5", + "scope": 1034, + "src": "1138:21:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1427,10 +1470,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1095, + "id": 1027, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "1138:7:5", + "src": "1138:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -1441,12 +1484,12 @@ }, { "constant": false, - "id": 1098, + "id": 1030, "indexed": true, "name": "relayer", "nodeType": "VariableDeclaration", - "scope": 1102, - "src": "1161:23:5", + "scope": 1034, + "src": "1161:23:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1454,10 +1497,10 @@ "typeString": "address" }, "typeName": { - "id": 1097, + "id": 1029, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1161:7:5", + "src": "1161:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1469,12 +1512,12 @@ }, { "constant": false, - "id": 1100, + "id": 1032, "indexed": false, "name": "fee", "nodeType": "VariableDeclaration", - "scope": 1102, - "src": "1186:11:5", + "scope": 1034, + "src": "1186:11:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1482,10 +1525,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1099, + "id": 1031, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1186:7:5", + "src": "1186:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1495,15 +1538,156 @@ "visibility": "internal" } ], - "src": "1125:73:5" + "src": "1125:73:4" }, - "src": "1109:90:5" + "src": "1109:90:4" + }, + { + "anonymous": false, + "documentation": null, + "id": 1040, + "name": "OwnershipTransferred", + "nodeType": "EventDefinition", + "parameters": { + "id": 1039, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 1036, + "indexed": true, + "name": "previousOwner", + "nodeType": "VariableDeclaration", + "scope": 1040, + "src": "1229:29:4", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 1035, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1229:7:4", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 1038, + "indexed": true, + "name": "newOwner", + "nodeType": "VariableDeclaration", + "scope": 1040, + "src": "1260:24:4", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 1037, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1260:7:4", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "1228:57:4" + }, + "src": "1202:84:4" + }, + { + "anonymous": false, + "documentation": null, + "id": 1046, + "name": "EncryptedNote", + "nodeType": "EventDefinition", + "parameters": { + "id": 1045, + "nodeType": "ParameterList", + "parameters": [ + { + "constant": false, + "id": 1042, + "indexed": true, + "name": "sender", + "nodeType": "VariableDeclaration", + "scope": 1046, + "src": "1309:22:4", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + }, + "typeName": { + "id": 1041, + "name": "address", + "nodeType": "ElementaryTypeName", + "src": "1309:7:4", + "stateMutability": "nonpayable", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + "value": null, + "visibility": "internal" + }, + { + "constant": false, + "id": 1044, + "indexed": false, + "name": "encryptedNote", + "nodeType": "VariableDeclaration", + "scope": 1046, + "src": "1333:19:4", + "stateVariable": false, + "storageLocation": "default", + "typeDescriptions": { + "typeIdentifier": "t_bytes_memory_ptr", + "typeString": "bytes" + }, + "typeName": { + "id": 1043, + "name": "bytes", + "nodeType": "ElementaryTypeName", + "src": "1333:5:4", + "typeDescriptions": { + "typeIdentifier": "t_bytes_storage_ptr", + "typeString": "bytes" + } + }, + "value": null, + "visibility": "internal" + } + ], + "src": "1308:45:4" + }, + "src": "1289:65:4" }, { "body": { - "id": 1141, + "id": 1085, "nodeType": "Block", - "src": "1696:194:5", + "src": "1851:194:4", "statements": [ { "expression": { @@ -1515,19 +1699,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1121, + "id": 1065, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1119, + "id": 1063, "name": "_denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1108, - "src": "1710:13:5", + "referencedDeclaration": 1052, + "src": "1865:13:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1538,14 +1722,14 @@ "rightExpression": { "argumentTypes": null, "hexValue": "30", - "id": 1120, + "id": 1064, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "1726:1:5", + "src": "1881:1:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -1553,7 +1737,7 @@ }, "value": "0" }, - "src": "1710:17:5", + "src": "1865:17:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1562,14 +1746,14 @@ { "argumentTypes": null, "hexValue": "64656e6f6d696e6174696f6e2073686f756c642062652067726561746572207468616e2030", - "id": 1122, + "id": 1066, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "1729:39:5", + "src": "1884:39:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_04818fb803bf7e7ff6c9059d97eae335b77b108931ead0a529924d35ccaf3fc8", @@ -1589,21 +1773,21 @@ "typeString": "literal_string \"denomination should be greater than 0\"" } ], - "id": 1118, + "id": 1062, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "1702:7:5", + "referencedDeclaration": 1369, + "src": "1857:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1123, + "id": 1067, "isConstant": false, "isLValue": false, "isPure": false, @@ -1611,34 +1795,34 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "1702:67:5", + "src": "1857:67:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1124, + "id": 1068, "nodeType": "ExpressionStatement", - "src": "1702:67:5" + "src": "1857:67:4" }, { "expression": { "argumentTypes": null, - "id": 1127, + "id": 1071, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1125, + "id": 1069, "name": "verifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "1775:8:5", + "referencedDeclaration": 1000, + "src": "1930:8:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -1646,45 +1830,45 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1126, + "id": 1070, "name": "_verifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1104, - "src": "1786:9:5", + "referencedDeclaration": 1048, + "src": "1941:9:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "src": "1775:20:5", + "src": "1930:20:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "id": 1128, + "id": 1072, "nodeType": "ExpressionStatement", - "src": "1775:20:5" + "src": "1930:20:4" }, { "expression": { "argumentTypes": null, - "id": 1131, + "id": 1075, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1129, + "id": 1073, "name": "feeManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1070, - "src": "1801:10:5", + "referencedDeclaration": 1002, + "src": "1956:10:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -1692,43 +1876,43 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1130, + "id": 1074, "name": "_feeManager", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1106, - "src": "1814:11:5", + "referencedDeclaration": 1050, + "src": "1969:11:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, - "src": "1801:24:5", + "src": "1956:24:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, - "id": 1132, + "id": 1076, "nodeType": "ExpressionStatement", - "src": "1801:24:5" + "src": "1956:24:4" }, { "expression": { "argumentTypes": null, - "id": 1135, + "id": 1079, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1133, + "id": 1077, "name": "operator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1072, - "src": "1831:8:5", + "referencedDeclaration": 1004, + "src": "1986:8:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1738,43 +1922,43 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1134, + "id": 1078, "name": "_operator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1112, - "src": "1842:9:5", + "referencedDeclaration": 1056, + "src": "1997:9:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "1831:20:5", + "src": "1986:20:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1136, + "id": 1080, "nodeType": "ExpressionStatement", - "src": "1831:20:5" + "src": "1986:20:4" }, { "expression": { "argumentTypes": null, - "id": 1139, + "id": 1083, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1137, + "id": 1081, "name": "denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1058, - "src": "1857:12:5", + "referencedDeclaration": 990, + "src": "2012:12:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1784,31 +1968,31 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1138, + "id": 1082, "name": "_denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1108, - "src": "1872:13:5", + "referencedDeclaration": 1052, + "src": "2027:13:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "1857:28:5", + "src": "2012:28:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "id": 1140, + "id": 1084, "nodeType": "ExpressionStatement", - "src": "1857:28:5" + "src": "2012:28:4" } ] }, "documentation": "@dev The constructor\n@param _verifier the address of SNARK verifier for this contract\n@param _denomination transfer amount for each deposit\n@param _merkleTreeHeight the height of deposits' Merkle Tree\n@param _operator operator address (see operator comment above)", - "id": 1142, + "id": 1086, "implemented": true, "kind": "constructor", "modifiers": [ @@ -1816,64 +2000,64 @@ "arguments": [ { "argumentTypes": null, - "id": 1115, + "id": 1059, "name": "_merkleTreeHeight", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1110, - "src": "1670:17:5", + "referencedDeclaration": 1054, + "src": "1825:17:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" } } ], - "id": 1116, + "id": 1060, "modifierName": { "argumentTypes": null, - "id": 1114, + "id": 1058, "name": "MerkleTreeWithHistory", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 838, - "src": "1648:21:5", + "referencedDeclaration": 770, + "src": "1803:21:4", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_MerkleTreeWithHistory_$838_$", + "typeIdentifier": "t_type$_t_contract$_MerkleTreeWithHistory_$770_$", "typeString": "type(contract MerkleTreeWithHistory)" } }, "nodeType": "ModifierInvocation", - "src": "1648:40:5" + "src": "1803:40:4" } ], "name": "", "nodeType": "FunctionDefinition", "parameters": { - "id": 1113, + "id": 1057, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1104, + "id": 1048, "name": "_verifier", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1515:19:5", + "scope": 1086, + "src": "1670:19:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" }, "typeName": { "contractScope": null, - "id": 1103, + "id": 1047, "name": "IVerifier", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1041, - "src": "1515:9:5", + "referencedDeclaration": 973, + "src": "1670:9:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -1882,26 +2066,26 @@ }, { "constant": false, - "id": 1106, + "id": 1050, "name": "_feeManager", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1540:23:5", + "scope": 1086, + "src": "1695:23:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" }, "typeName": { "contractScope": null, - "id": 1105, + "id": 1049, "name": "IFeeManager", "nodeType": "UserDefinedTypeName", - "referencedDeclaration": 1052, - "src": "1540:11:5", + "referencedDeclaration": 984, + "src": "1695:11:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IFeeManager_$1052", + "typeIdentifier": "t_contract$_IFeeManager_$984", "typeString": "contract IFeeManager" } }, @@ -1910,11 +2094,11 @@ }, { "constant": false, - "id": 1108, + "id": 1052, "name": "_denomination", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1569:21:5", + "scope": 1086, + "src": "1724:21:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1922,10 +2106,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1107, + "id": 1051, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "1569:7:5", + "src": "1724:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1936,11 +2120,11 @@ }, { "constant": false, - "id": 1110, + "id": 1054, "name": "_merkleTreeHeight", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1596:24:5", + "scope": 1086, + "src": "1751:24:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1948,10 +2132,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1109, + "id": 1053, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "1596:6:5", + "src": "1751:6:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -1962,11 +2146,11 @@ }, { "constant": false, - "id": 1112, + "id": 1056, "name": "_operator", "nodeType": "VariableDeclaration", - "scope": 1142, - "src": "1626:17:5", + "scope": 1086, + "src": "1781:17:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1974,10 +2158,10 @@ "typeString": "address" }, "typeName": { - "id": 1111, + "id": 1055, "name": "address", "nodeType": "ElementaryTypeName", - "src": "1626:7:5", + "src": "1781:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -1988,25 +2172,25 @@ "visibility": "internal" } ], - "src": "1509:138:5" + "src": "1664:138:4" }, "returnParameters": { - "id": 1117, + "id": 1061, "nodeType": "ParameterList", "parameters": [], - "src": "1696:0:5" + "src": "1851:0:4" }, - "scope": 1363, - "src": "1498:392:5", + "scope": 1320, + "src": "1653:392:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1179, + "id": 1131, "nodeType": "Block", - "src": "2206:256:5", + "src": "2392:308:4", "statements": [ { "expression": { @@ -2014,7 +2198,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1153, + "id": 1099, "isConstant": false, "isLValue": false, "isPure": false, @@ -2022,31 +2206,31 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "2220:25:5", + "src": "2406:25:4", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1150, + "id": 1096, "name": "commitments", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1066, - "src": "2221:11:5", + "referencedDeclaration": 998, + "src": "2407:11:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1152, + "id": 1098, "indexExpression": { "argumentTypes": null, - "id": 1151, + "id": 1097, "name": "_commitment", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1144, - "src": "2233:11:5", + "referencedDeclaration": 1088, + "src": "2419:11:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2057,7 +2241,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "2221:24:5", + "src": "2407:24:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2071,14 +2255,14 @@ { "argumentTypes": null, "hexValue": "54686520636f6d6d69746d656e7420686173206265656e207375626d6974746564", - "id": 1154, + "id": 1100, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "2247:35:5", + "src": "2433:35:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_ae5f231636554c1cb3bf839359e4dfbb338ccb221c7c5dbdf2da91ddc6e2ee6b", @@ -2098,21 +2282,21 @@ "typeString": "literal_string \"The commitment has been submitted\"" } ], - "id": 1149, + "id": 1095, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "2212:7:5", + "referencedDeclaration": 1369, + "src": "2398:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1155, + "id": 1101, "isConstant": false, "isLValue": false, "isPure": false, @@ -2120,28 +2304,28 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2212:71:5", + "src": "2398:71:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1156, + "id": 1102, "nodeType": "ExpressionStatement", - "src": "2212:71:5" + "src": "2398:71:4" }, { "assignments": [ - 1158 + 1104 ], "declarations": [ { "constant": false, - "id": 1158, + "id": 1104, "name": "insertedIndex", "nodeType": "VariableDeclaration", - "scope": 1179, - "src": "2290:20:5", + "scope": 1131, + "src": "2476:20:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2149,10 +2333,10 @@ "typeString": "uint32" }, "typeName": { - "id": 1157, + "id": 1103, "name": "uint32", "nodeType": "ElementaryTypeName", - "src": "2290:6:5", + "src": "2476:6:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -2162,18 +2346,18 @@ "visibility": "internal" } ], - "id": 1162, + "id": 1108, "initialValue": { "argumentTypes": null, "arguments": [ { "argumentTypes": null, - "id": 1160, + "id": 1106, "name": "_commitment", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1144, - "src": "2321:11:5", + "referencedDeclaration": 1088, + "src": "2507:11:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2187,18 +2371,18 @@ "typeString": "bytes32" } ], - "id": 1159, + "id": 1105, "name": "_insert", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 780, - "src": "2313:7:5", + "referencedDeclaration": 712, + "src": "2499:7:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_bytes32_$returns$_t_uint32_$", "typeString": "function (bytes32) returns (uint32)" } }, - "id": 1161, + "id": 1107, "isConstant": false, "isLValue": false, "isPure": false, @@ -2206,19 +2390,19 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2313:20:5", + "src": "2499:20:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" } }, "nodeType": "VariableDeclarationStatement", - "src": "2290:43:5" + "src": "2476:43:4" }, { "expression": { "argumentTypes": null, - "id": 1167, + "id": 1113, "isConstant": false, "isLValue": false, "isPure": false, @@ -2227,26 +2411,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1163, + "id": 1109, "name": "commitments", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1066, - "src": "2339:11:5", + "referencedDeclaration": 998, + "src": "2525:11:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1165, + "id": 1111, "indexExpression": { "argumentTypes": null, - "id": 1164, + "id": 1110, "name": "_commitment", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1144, - "src": "2351:11:5", + "referencedDeclaration": 1088, + "src": "2537:11:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2257,7 +2441,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "2339:24:5", + "src": "2525:24:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2268,14 +2452,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1166, + "id": 1112, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "2366:4:5", + "src": "2552:4:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -2283,15 +2467,15 @@ }, "value": "true" }, - "src": "2339:31:5", + "src": "2525:31:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1168, + "id": 1114, "nodeType": "ExpressionStatement", - "src": "2339:31:5" + "src": "2525:31:4" }, { "expression": { @@ -2299,18 +2483,18 @@ "arguments": [], "expression": { "argumentTypes": [], - "id": 1169, + "id": 1115, "name": "_processDeposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1183, - "src": "2376:15:5", + "referencedDeclaration": 1135, + "src": "2562:15:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$", "typeString": "function ()" } }, - "id": 1170, + "id": 1116, "isConstant": false, "isLValue": false, "isPure": false, @@ -2318,15 +2502,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2376:17:5", + "src": "2562:17:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1171, + "id": 1117, "nodeType": "ExpressionStatement", - "src": "2376:17:5" + "src": "2562:17:4" }, { "eventCall": { @@ -2334,12 +2518,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1173, + "id": 1119, "name": "_commitment", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1144, - "src": "2413:11:5", + "referencedDeclaration": 1088, + "src": "2599:11:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2347,12 +2531,12 @@ }, { "argumentTypes": null, - "id": 1174, + "id": 1120, "name": "insertedIndex", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1158, - "src": "2426:13:5", + "referencedDeclaration": 1104, + "src": "2612:13:4", "typeDescriptions": { "typeIdentifier": "t_uint32", "typeString": "uint32" @@ -2362,18 +2546,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1175, + "id": 1121, "name": "block", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1398, - "src": "2441:5:5", + "referencedDeclaration": 1355, + "src": "2627:5:4", "typeDescriptions": { "typeIdentifier": "t_magic_block", "typeString": "block" } }, - "id": 1176, + "id": 1122, "isConstant": false, "isLValue": false, "isPure": false, @@ -2381,7 +2565,7 @@ "memberName": "timestamp", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "2441:15:5", + "src": "2627:15:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2403,18 +2587,18 @@ "typeString": "uint256" } ], - "id": 1172, + "id": 1118, "name": "Deposit", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1092, - "src": "2405:7:5", + "referencedDeclaration": 1024, + "src": "2591:7:4", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_bytes32_$_t_uint32_$_t_uint256_$returns$__$", "typeString": "function (bytes32,uint32,uint256)" } }, - "id": 1177, + "id": 1123, "isConstant": false, "isLValue": false, "isPure": false, @@ -2422,56 +2606,143 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "2405:52:5", + "src": "2591:52:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1178, + "id": 1124, "nodeType": "EmitStatement", - "src": "2400:57:5" + "src": "2586:57:4" + }, + { + "eventCall": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "expression": { + "argumentTypes": null, + "id": 1126, + "name": "msg", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1365, + "src": "2668:3:4", + "typeDescriptions": { + "typeIdentifier": "t_magic_message", + "typeString": "msg" + } + }, + "id": 1127, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "memberName": "sender", + "nodeType": "MemberAccess", + "referencedDeclaration": null, + "src": "2668:10:4", + "typeDescriptions": { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + } + }, + { + "argumentTypes": null, + "id": 1128, + "name": "_encryptedNote", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1090, + "src": "2680:14:4", + "typeDescriptions": { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + ], + "id": 1125, + "name": "EncryptedNote", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1046, + "src": "2654:13:4", + "typeDescriptions": { + "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$__$", + "typeString": "function (address,bytes memory)" + } + }, + "id": 1129, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "2654:41:4", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 1130, + "nodeType": "EmitStatement", + "src": "2649:46:4" } ] }, "documentation": "@dev Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.\n@param _commitment the note commitment, which is PedersenHash(nullifier + secret)", - "id": 1180, + "id": 1132, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 1147, + "id": 1093, "modifierName": { "argumentTypes": null, - "id": 1146, + "id": 1092, "name": "nonReentrant", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1392, - "src": "2193:12:5", + "referencedDeclaration": 1349, + "src": "2379:12:4", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "2193:12:5" + "src": "2379:12:4" } ], "name": "deposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 1145, + "id": 1091, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1144, + "id": 1088, "name": "_commitment", "nodeType": "VariableDeclaration", - "scope": 1180, - "src": "2155:19:5", + "scope": 1132, + "src": "2310:19:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2479,10 +2750,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1143, + "id": 1087, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2155:7:5", + "src": "2310:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2490,18 +2761,44 @@ }, "value": null, "visibility": "internal" + }, + { + "constant": false, + "id": 1090, + "name": "_encryptedNote", + "nodeType": "VariableDeclaration", + "scope": 1132, + "src": "2331:29:4", + "stateVariable": false, + "storageLocation": "calldata", + "typeDescriptions": { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes" + }, + "typeName": { + "id": 1089, + "name": "bytes", + "nodeType": "ElementaryTypeName", + "src": "2331:5:4", + "typeDescriptions": { + "typeIdentifier": "t_bytes_storage_ptr", + "typeString": "bytes" + } + }, + "value": null, + "visibility": "internal" } ], - "src": "2154:21:5" + "src": "2309:52:4" }, "returnParameters": { - "id": 1148, + "id": 1094, "nodeType": "ParameterList", "parameters": [], - "src": "2206:0:5" + "src": "2392:0:4" }, - "scope": 1363, - "src": "2138:324:5", + "scope": 1320, + "src": "2293:407:4", "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -2509,35 +2806,35 @@ { "body": null, "documentation": "@dev this function is defined in a child contract ", - "id": 1183, + "id": 1135, "implemented": false, "kind": "function", "modifiers": [], "name": "_processDeposit", "nodeType": "FunctionDefinition", "parameters": { - "id": 1181, + "id": 1133, "nodeType": "ParameterList", "parameters": [], - "src": "2549:2:5" + "src": "2787:2:4" }, "returnParameters": { - "id": 1182, + "id": 1134, "nodeType": "ParameterList", "parameters": [], - "src": "2560:0:5" + "src": "2798:0:4" }, - "scope": 1363, - "src": "2525:36:5", + "scope": 1320, + "src": "2763:36:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 1267, + "id": 1219, "nodeType": "Block", - "src": "3153:586:5", + "src": "3391:586:4", "statements": [ { "expression": { @@ -2549,19 +2846,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1205, + "id": 1157, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1203, + "id": 1155, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1195, - "src": "3167:4:5", + "referencedDeclaration": 1147, + "src": "3405:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2571,18 +2868,18 @@ "operator": "<=", "rightExpression": { "argumentTypes": null, - "id": 1204, + "id": 1156, "name": "denomination", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1058, - "src": "3175:12:5", + "referencedDeclaration": 990, + "src": "3413:12:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "3167:20:5", + "src": "3405:20:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2591,14 +2888,14 @@ { "argumentTypes": null, "hexValue": "4665652065786365656473207472616e736665722076616c7565", - "id": 1206, + "id": 1158, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3189:28:5", + "src": "3427:28:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_2ce218df547d416f80ea8a5deadaf9453d23523ffa5f2e880a48adfdb4053a9c", @@ -2618,21 +2915,21 @@ "typeString": "literal_string \"Fee exceeds transfer value\"" } ], - "id": 1202, + "id": 1154, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3159:7:5", + "referencedDeclaration": 1369, + "src": "3397:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1207, + "id": 1159, "isConstant": false, "isLValue": false, "isPure": false, @@ -2640,15 +2937,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3159:59:5", + "src": "3397:59:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1208, + "id": 1160, "nodeType": "ExpressionStatement", - "src": "3159:59:5" + "src": "3397:59:4" }, { "expression": { @@ -2656,7 +2953,7 @@ "arguments": [ { "argumentTypes": null, - "id": 1213, + "id": 1165, "isConstant": false, "isLValue": false, "isPure": false, @@ -2664,31 +2961,31 @@ "nodeType": "UnaryOperation", "operator": "!", "prefix": true, - "src": "3232:32:5", + "src": "3470:32:4", "subExpression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1210, + "id": 1162, "name": "nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "3233:15:5", + "referencedDeclaration": 994, + "src": "3471:15:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1212, + "id": 1164, "indexExpression": { "argumentTypes": null, - "id": 1211, + "id": 1163, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "3249:14:5", + "referencedDeclaration": 1141, + "src": "3487:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2699,7 +2996,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "3233:31:5", + "src": "3471:31:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2713,14 +3010,14 @@ { "argumentTypes": null, "hexValue": "546865206e6f746520686173206265656e20616c7265616479207370656e74", - "id": 1214, + "id": 1166, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3266:33:5", + "src": "3504:33:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_a1bef92d7a18b1c6975dc8de68df6140a52afea05a2c6c91da2b1562c617e896", @@ -2740,21 +3037,21 @@ "typeString": "literal_string \"The note has been already spent\"" } ], - "id": 1209, + "id": 1161, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3224:7:5", + "referencedDeclaration": 1369, + "src": "3462:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1215, + "id": 1167, "isConstant": false, "isLValue": false, "isPure": false, @@ -2762,15 +3059,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3224:76:5", + "src": "3462:76:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1216, + "id": 1168, "nodeType": "ExpressionStatement", - "src": "3224:76:5" + "src": "3462:76:4" }, { "expression": { @@ -2781,12 +3078,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1219, + "id": 1171, "name": "_root", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1187, - "src": "3326:5:5", + "referencedDeclaration": 1139, + "src": "3564:5:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2800,18 +3097,18 @@ "typeString": "bytes32" } ], - "id": 1218, + "id": 1170, "name": "isKnownRoot", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 827, - "src": "3314:11:5", + "referencedDeclaration": 759, + "src": "3552:11:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 1220, + "id": 1172, "isConstant": false, "isLValue": false, "isPure": false, @@ -2819,7 +3116,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3314:18:5", + "src": "3552:18:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2828,14 +3125,14 @@ { "argumentTypes": null, "hexValue": "43616e6e6f742066696e6420796f7572206d65726b6c6520726f6f74", - "id": 1221, + "id": 1173, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3334:30:5", + "src": "3572:30:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_2a69086763073955418d2fd7dfee3d2f1fbc5b21047a216b7855d3f313d8e204", @@ -2855,21 +3152,21 @@ "typeString": "literal_string \"Cannot find your merkle root\"" } ], - "id": 1217, + "id": 1169, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3306:7:5", + "referencedDeclaration": 1369, + "src": "3544:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1222, + "id": 1174, "isConstant": false, "isLValue": false, "isPure": false, @@ -2877,15 +3174,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3306:59:5", + "src": "3544:59:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1223, + "id": 1175, "nodeType": "ExpressionStatement", - "src": "3306:59:5" + "src": "3544:59:4" }, { "expression": { @@ -2896,12 +3193,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1227, + "id": 1179, "name": "_proof", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1185, - "src": "3433:6:5", + "referencedDeclaration": 1137, + "src": "3671:6:4", "typeDescriptions": { "typeIdentifier": "t_bytes_calldata_ptr", "typeString": "bytes calldata" @@ -2915,12 +3212,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1229, + "id": 1181, "name": "_root", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1187, - "src": "3450:5:5", + "referencedDeclaration": 1139, + "src": "3688:5:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2934,20 +3231,20 @@ "typeString": "bytes32" } ], - "id": 1228, + "id": 1180, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3442:7:5", + "src": "3680:7:4", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1230, + "id": 1182, "isConstant": false, "isLValue": false, "isPure": false, @@ -2955,7 +3252,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3442:14:5", + "src": "3680:14:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2966,12 +3263,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1232, + "id": 1184, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "3466:14:5", + "referencedDeclaration": 1141, + "src": "3704:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2985,20 +3282,20 @@ "typeString": "bytes32" } ], - "id": 1231, + "id": 1183, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3458:7:5", + "src": "3696:7:4", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1233, + "id": 1185, "isConstant": false, "isLValue": false, "isPure": false, @@ -3006,7 +3303,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3458:23:5", + "src": "3696:23:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3017,12 +3314,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1235, + "id": 1187, "name": "_recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1191, - "src": "3491:10:5", + "referencedDeclaration": 1143, + "src": "3729:10:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -3036,20 +3333,20 @@ "typeString": "address payable" } ], - "id": 1234, + "id": 1186, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3483:7:5", + "src": "3721:7:4", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1236, + "id": 1188, "isConstant": false, "isLValue": false, "isPure": false, @@ -3057,7 +3354,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3483:19:5", + "src": "3721:19:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3068,12 +3365,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1238, + "id": 1190, "name": "_relayer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1193, - "src": "3512:8:5", + "referencedDeclaration": 1145, + "src": "3750:8:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -3087,20 +3384,20 @@ "typeString": "address payable" } ], - "id": 1237, + "id": 1189, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "3504:7:5", + "src": "3742:7:4", "typeDescriptions": { "typeIdentifier": "t_type$_t_uint256_$", "typeString": "type(uint256)" }, "typeName": "uint256" }, - "id": 1239, + "id": 1191, "isConstant": false, "isLValue": false, "isPure": false, @@ -3108,7 +3405,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3504:17:5", + "src": "3742:17:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3116,12 +3413,12 @@ }, { "argumentTypes": null, - "id": 1240, + "id": 1192, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1195, - "src": "3523:4:5", + "referencedDeclaration": 1147, + "src": "3761:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3129,26 +3426,26 @@ }, { "argumentTypes": null, - "id": 1241, + "id": 1193, "name": "_refund", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1197, - "src": "3529:7:5", + "referencedDeclaration": 1149, + "src": "3767:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } } ], - "id": 1242, + "id": 1194, "isConstant": false, "isInlineArray": true, "isLValue": false, "isPure": false, "lValueRequested": false, "nodeType": "TupleExpression", - "src": "3441:96:5", + "src": "3679:96:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_uint256_$6_memory_ptr", "typeString": "uint256[6] memory" @@ -3168,32 +3465,32 @@ ], "expression": { "argumentTypes": null, - "id": 1225, + "id": 1177, "name": "verifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "3412:8:5", + "referencedDeclaration": 1000, + "src": "3650:8:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "id": 1226, + "id": 1178, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "memberName": "verifyProof", "nodeType": "MemberAccess", - "referencedDeclaration": 1040, - "src": "3412:20:5", + "referencedDeclaration": 972, + "src": "3650:20:4", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_bytes_memory_ptr_$_t_array$_t_uint256_$6_memory_ptr_$returns$_t_bool_$", "typeString": "function (bytes memory,uint256[6] memory) external returns (bool)" } }, - "id": 1243, + "id": 1195, "isConstant": false, "isLValue": false, "isPure": false, @@ -3201,7 +3498,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3412:126:5", + "src": "3650:126:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3210,14 +3507,14 @@ { "argumentTypes": null, "hexValue": "496e76616c69642077697468647261772070726f6f66", - "id": 1244, + "id": 1196, "isConstant": false, "isLValue": false, "isPure": true, "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "3540:24:5", + "src": "3778:24:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_7021ea58137dba96e572e94936410b0b0e4cbc344e1ab2ee7f47660768b81ff4", @@ -3237,21 +3534,21 @@ "typeString": "literal_string \"Invalid withdraw proof\"" } ], - "id": 1224, + "id": 1176, "name": "require", "nodeType": "Identifier", "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, - "src": "3404:7:5", + "referencedDeclaration": 1369, + "src": "3642:7:4", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$", "typeString": "function (bool,string memory) pure" } }, - "id": 1245, + "id": 1197, "isConstant": false, "isLValue": false, "isPure": false, @@ -3259,20 +3556,20 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3404:161:5", + "src": "3642:161:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1246, + "id": 1198, "nodeType": "ExpressionStatement", - "src": "3404:161:5" + "src": "3642:161:4" }, { "expression": { "argumentTypes": null, - "id": 1251, + "id": 1203, "isConstant": false, "isLValue": false, "isPure": false, @@ -3281,26 +3578,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1247, + "id": 1199, "name": "nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "3572:15:5", + "referencedDeclaration": 994, + "src": "3810:15:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1249, + "id": 1201, "indexExpression": { "argumentTypes": null, - "id": 1248, + "id": 1200, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "3588:14:5", + "referencedDeclaration": 1141, + "src": "3826:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3311,7 +3608,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "3572:31:5", + "src": "3810:31:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3322,14 +3619,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1250, + "id": 1202, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "3606:4:5", + "src": "3844:4:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -3337,15 +3634,15 @@ }, "value": "true" }, - "src": "3572:38:5", + "src": "3810:38:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1252, + "id": 1204, "nodeType": "ExpressionStatement", - "src": "3572:38:5" + "src": "3810:38:4" }, { "expression": { @@ -3353,12 +3650,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1254, + "id": 1206, "name": "_recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1191, - "src": "3633:10:5", + "referencedDeclaration": 1143, + "src": "3871:10:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -3366,12 +3663,12 @@ }, { "argumentTypes": null, - "id": 1255, + "id": 1207, "name": "_relayer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1193, - "src": "3645:8:5", + "referencedDeclaration": 1145, + "src": "3883:8:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -3379,12 +3676,12 @@ }, { "argumentTypes": null, - "id": 1256, + "id": 1208, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1195, - "src": "3655:4:5", + "referencedDeclaration": 1147, + "src": "3893:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3392,12 +3689,12 @@ }, { "argumentTypes": null, - "id": 1257, + "id": 1209, "name": "_refund", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1197, - "src": "3661:7:5", + "referencedDeclaration": 1149, + "src": "3899:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3423,18 +3720,18 @@ "typeString": "uint256" } ], - "id": 1253, + "id": 1205, "name": "_processWithdraw", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1279, - "src": "3616:16:5", + "referencedDeclaration": 1231, + "src": "3854:16:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_nonpayable$_t_address_payable_$_t_address_payable_$_t_uint256_$_t_uint256_$returns$__$", "typeString": "function (address payable,address payable,uint256,uint256)" } }, - "id": 1258, + "id": 1210, "isConstant": false, "isLValue": false, "isPure": false, @@ -3442,15 +3739,15 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3616:53:5", + "src": "3854:53:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1259, + "id": 1211, "nodeType": "ExpressionStatement", - "src": "3616:53:5" + "src": "3854:53:4" }, { "eventCall": { @@ -3458,12 +3755,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1261, + "id": 1213, "name": "_recipient", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1191, - "src": "3691:10:5", + "referencedDeclaration": 1143, + "src": "3929:10:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -3471,12 +3768,12 @@ }, { "argumentTypes": null, - "id": 1262, + "id": 1214, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1189, - "src": "3703:14:5", + "referencedDeclaration": 1141, + "src": "3941:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3484,12 +3781,12 @@ }, { "argumentTypes": null, - "id": 1263, + "id": 1215, "name": "_relayer", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1193, - "src": "3719:8:5", + "referencedDeclaration": 1145, + "src": "3957:8:4", "typeDescriptions": { "typeIdentifier": "t_address_payable", "typeString": "address payable" @@ -3497,12 +3794,12 @@ }, { "argumentTypes": null, - "id": 1264, + "id": 1216, "name": "_fee", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1195, - "src": "3729:4:5", + "referencedDeclaration": 1147, + "src": "3967:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3528,18 +3825,18 @@ "typeString": "uint256" } ], - "id": 1260, + "id": 1212, "name": "Withdrawal", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1102, - "src": "3680:10:5", + "referencedDeclaration": 1034, + "src": "3918:10:4", "typeDescriptions": { "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_bytes32_$_t_address_$_t_uint256_$returns$__$", "typeString": "function (address,bytes32,address,uint256)" } }, - "id": 1265, + "id": 1217, "isConstant": false, "isLValue": false, "isPure": false, @@ -3547,56 +3844,56 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "3680:54:5", + "src": "3918:54:4", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" } }, - "id": 1266, + "id": 1218, "nodeType": "EmitStatement", - "src": "3675:59:5" + "src": "3913:59:4" } ] }, "documentation": "@dev Withdraw a deposit from the contract. `proof` is a zkSNARK proof data, and input is an array of circuit public inputs\n`input` array consists of:\n- merkle root of all deposits in the contract\n- hash of unique deposit nullifier to prevent double spends\n- the recipient of funds\n- optional fee that goes to the transaction sender (usually a relay)", - "id": 1268, + "id": 1220, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 1200, + "id": 1152, "modifierName": { "argumentTypes": null, - "id": 1199, + "id": 1151, "name": "nonReentrant", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1392, - "src": "3140:12:5", + "referencedDeclaration": 1349, + "src": "3378:12:4", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "3140:12:5" + "src": "3378:12:4" } ], "name": "withdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1198, + "id": 1150, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1185, + "id": 1137, "name": "_proof", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "2976:21:5", + "scope": 1220, + "src": "3214:21:4", "stateVariable": false, "storageLocation": "calldata", "typeDescriptions": { @@ -3604,10 +3901,10 @@ "typeString": "bytes" }, "typeName": { - "id": 1184, + "id": 1136, "name": "bytes", "nodeType": "ElementaryTypeName", - "src": "2976:5:5", + "src": "3214:5:4", "typeDescriptions": { "typeIdentifier": "t_bytes_storage_ptr", "typeString": "bytes" @@ -3618,11 +3915,11 @@ }, { "constant": false, - "id": 1187, + "id": 1139, "name": "_root", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "2999:13:5", + "scope": 1220, + "src": "3237:13:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3630,10 +3927,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1186, + "id": 1138, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "2999:7:5", + "src": "3237:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3644,11 +3941,11 @@ }, { "constant": false, - "id": 1189, + "id": 1141, "name": "_nullifierHash", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3014:22:5", + "scope": 1220, + "src": "3252:22:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3656,10 +3953,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1188, + "id": 1140, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "3014:7:5", + "src": "3252:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3670,11 +3967,11 @@ }, { "constant": false, - "id": 1191, + "id": 1143, "name": "_recipient", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3038:26:5", + "scope": 1220, + "src": "3276:26:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3682,10 +3979,10 @@ "typeString": "address payable" }, "typeName": { - "id": 1190, + "id": 1142, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3038:15:5", + "src": "3276:15:4", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3697,11 +3994,11 @@ }, { "constant": false, - "id": 1193, + "id": 1145, "name": "_relayer", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3066:24:5", + "scope": 1220, + "src": "3304:24:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3709,10 +4006,10 @@ "typeString": "address payable" }, "typeName": { - "id": 1192, + "id": 1144, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3066:15:5", + "src": "3304:15:4", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3724,11 +4021,11 @@ }, { "constant": false, - "id": 1195, + "id": 1147, "name": "_fee", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3092:12:5", + "scope": 1220, + "src": "3330:12:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3736,10 +4033,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1194, + "id": 1146, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3092:7:5", + "src": "3330:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3750,11 +4047,11 @@ }, { "constant": false, - "id": 1197, + "id": 1149, "name": "_refund", "nodeType": "VariableDeclaration", - "scope": 1268, - "src": "3106:15:5", + "scope": 1220, + "src": "3344:15:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3762,10 +4059,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1196, + "id": 1148, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3106:7:5", + "src": "3344:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3775,16 +4072,16 @@ "visibility": "internal" } ], - "src": "2975:147:5" + "src": "3213:147:4" }, "returnParameters": { - "id": 1201, + "id": 1153, "nodeType": "ParameterList", "parameters": [], - "src": "3153:0:5" + "src": "3391:0:4" }, - "scope": 1363, - "src": "2958:781:5", + "scope": 1320, + "src": "3196:781:4", "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -3792,23 +4089,23 @@ { "body": null, "documentation": "@dev this function is defined in a child contract ", - "id": 1279, + "id": 1231, "implemented": false, "kind": "function", "modifiers": [], "name": "_processWithdraw", "nodeType": "FunctionDefinition", "parameters": { - "id": 1277, + "id": 1229, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1270, + "id": 1222, "name": "_recipient", "nodeType": "VariableDeclaration", - "scope": 1279, - "src": "3828:26:5", + "scope": 1231, + "src": "4066:26:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3816,10 +4113,10 @@ "typeString": "address payable" }, "typeName": { - "id": 1269, + "id": 1221, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3828:15:5", + "src": "4066:15:4", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3831,11 +4128,11 @@ }, { "constant": false, - "id": 1272, + "id": 1224, "name": "_relayer", "nodeType": "VariableDeclaration", - "scope": 1279, - "src": "3856:24:5", + "scope": 1231, + "src": "4094:24:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3843,10 +4140,10 @@ "typeString": "address payable" }, "typeName": { - "id": 1271, + "id": 1223, "name": "address", "nodeType": "ElementaryTypeName", - "src": "3856:15:5", + "src": "4094:15:4", "stateMutability": "payable", "typeDescriptions": { "typeIdentifier": "t_address_payable", @@ -3858,11 +4155,11 @@ }, { "constant": false, - "id": 1274, + "id": 1226, "name": "_relayer_fee", "nodeType": "VariableDeclaration", - "scope": 1279, - "src": "3882:20:5", + "scope": 1231, + "src": "4120:20:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3870,10 +4167,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1273, + "id": 1225, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3882:7:5", + "src": "4120:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3884,11 +4181,11 @@ }, { "constant": false, - "id": 1276, + "id": 1228, "name": "_refund", "nodeType": "VariableDeclaration", - "scope": 1279, - "src": "3904:15:5", + "scope": 1231, + "src": "4142:15:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3896,10 +4193,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1275, + "id": 1227, "name": "uint256", "nodeType": "ElementaryTypeName", - "src": "3904:7:5", + "src": "4142:7:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3909,51 +4206,51 @@ "visibility": "internal" } ], - "src": "3827:93:5" + "src": "4065:93:4" }, "returnParameters": { - "id": 1278, + "id": 1230, "nodeType": "ParameterList", "parameters": [], - "src": "3929:0:5" + "src": "4167:0:4" }, - "scope": 1363, - "src": "3802:128:5", + "scope": 1320, + "src": "4040:128:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" }, { "body": { - "id": 1290, + "id": 1242, "nodeType": "Block", - "src": "4047:49:5", + "src": "4285:49:4", "statements": [ { "expression": { "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1286, + "id": 1238, "name": "nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1062, - "src": "4060:15:5", + "referencedDeclaration": 994, + "src": "4298:15:4", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_bytes32_$_t_bool_$", "typeString": "mapping(bytes32 => bool)" } }, - "id": 1288, + "id": 1240, "indexExpression": { "argumentTypes": null, - "id": 1287, + "id": 1239, "name": "_nullifierHash", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1281, - "src": "4076:14:5", + "referencedDeclaration": 1233, + "src": "4314:14:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -3964,37 +4261,37 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4060:31:5", + "src": "4298:31:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "functionReturnParameters": 1285, - "id": 1289, + "functionReturnParameters": 1237, + "id": 1241, "nodeType": "Return", - "src": "4053:38:5" + "src": "4291:38:4" } ] }, "documentation": "@dev whether a note is already spent ", - "id": 1291, + "id": 1243, "implemented": true, "kind": "function", "modifiers": [], "name": "isSpent", "nodeType": "FunctionDefinition", "parameters": { - "id": 1282, + "id": 1234, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1281, + "id": 1233, "name": "_nullifierHash", "nodeType": "VariableDeclaration", - "scope": 1291, - "src": "3997:22:5", + "scope": 1243, + "src": "4235:22:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4002,10 +4299,10 @@ "typeString": "bytes32" }, "typeName": { - "id": 1280, + "id": 1232, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "3997:7:5", + "src": "4235:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4015,19 +4312,19 @@ "visibility": "internal" } ], - "src": "3996:24:5" + "src": "4234:24:4" }, "returnParameters": { - "id": 1285, + "id": 1237, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1284, + "id": 1236, "name": "", "nodeType": "VariableDeclaration", - "scope": 1291, - "src": "4041:4:5", + "scope": 1243, + "src": "4279:4:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4035,10 +4332,10 @@ "typeString": "bool" }, "typeName": { - "id": 1283, + "id": 1235, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "4041:4:5", + "src": "4279:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4048,36 +4345,36 @@ "visibility": "internal" } ], - "src": "4040:6:5" + "src": "4278:6:4" }, - "scope": 1363, - "src": "3980:116:5", + "scope": 1320, + "src": "4218:116:4", "stateMutability": "view", "superFunction": null, "visibility": "public" }, { "body": { - "id": 1335, + "id": 1287, "nodeType": "Block", - "src": "4259:191:5", + "src": "4497:191:4", "statements": [ { "expression": { "argumentTypes": null, - "id": 1307, + "id": 1259, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1300, + "id": 1252, "name": "spent", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1298, - "src": "4265:5:5", + "referencedDeclaration": 1250, + "src": "4503:5:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr", "typeString": "bool[] memory" @@ -4092,18 +4389,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1304, + "id": 1256, "name": "_nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1294, - "src": "4284:16:5", + "referencedDeclaration": 1246, + "src": "4522:16:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" } }, - "id": 1305, + "id": 1257, "isConstant": false, "isLValue": false, "isPure": false, @@ -4111,7 +4408,7 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4284:23:5", + "src": "4522:23:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4125,39 +4422,39 @@ "typeString": "uint256" } ], - "id": 1303, + "id": 1255, "isConstant": false, "isLValue": false, "isPure": true, "lValueRequested": false, "nodeType": "NewExpression", - "src": "4273:10:5", + "src": "4511:10:4", "typeDescriptions": { "typeIdentifier": "t_function_objectcreation_pure$_t_uint256_$returns$_t_array$_t_bool_$dyn_memory_$", "typeString": "function (uint256) pure returns (bool[] memory)" }, "typeName": { "baseType": { - "id": 1301, + "id": 1253, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "4277:4:5", + "src": "4515:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1302, + "id": 1254, "length": null, "nodeType": "ArrayTypeName", - "src": "4277:6:5", + "src": "4515:6:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr", "typeString": "bool[]" } } }, - "id": 1306, + "id": 1258, "isConstant": false, "isLValue": false, "isPure": false, @@ -4165,27 +4462,27 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4273:35:5", + "src": "4511:35:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_memory", "typeString": "bool[] memory" } }, - "src": "4265:43:5", + "src": "4503:43:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr", "typeString": "bool[] memory" } }, - "id": 1308, + "id": 1260, "nodeType": "ExpressionStatement", - "src": "4265:43:5" + "src": "4503:43:4" }, { "body": { - "id": 1333, + "id": 1285, "nodeType": "Block", - "src": "4364:82:5", + "src": "4602:82:4", "statements": [ { "condition": { @@ -4195,26 +4492,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1321, + "id": 1273, "name": "_nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1294, - "src": "4384:16:5", + "referencedDeclaration": 1246, + "src": "4622:16:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" } }, - "id": 1323, + "id": 1275, "indexExpression": { "argumentTypes": null, - "id": 1322, + "id": 1274, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1310, - "src": "4401:1:5", + "referencedDeclaration": 1262, + "src": "4639:1:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4225,7 +4522,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "4384:19:5", + "src": "4622:19:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -4239,18 +4536,18 @@ "typeString": "bytes32" } ], - "id": 1320, + "id": 1272, "name": "isSpent", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1291, - "src": "4376:7:5", + "referencedDeclaration": 1243, + "src": "4614:7:4", "typeDescriptions": { "typeIdentifier": "t_function_internal_view$_t_bytes32_$returns$_t_bool_$", "typeString": "function (bytes32) view returns (bool)" } }, - "id": 1324, + "id": 1276, "isConstant": false, "isLValue": false, "isPure": false, @@ -4258,25 +4555,25 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4376:28:5", + "src": "4614:28:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, "falseBody": null, - "id": 1332, + "id": 1284, "nodeType": "IfStatement", - "src": "4372:68:5", + "src": "4610:68:4", "trueBody": { - "id": 1331, + "id": 1283, "nodeType": "Block", - "src": "4406:34:5", + "src": "4644:34:4", "statements": [ { "expression": { "argumentTypes": null, - "id": 1329, + "id": 1281, "isConstant": false, "isLValue": false, "isPure": false, @@ -4285,26 +4582,26 @@ "argumentTypes": null, "baseExpression": { "argumentTypes": null, - "id": 1325, + "id": 1277, "name": "spent", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1298, - "src": "4416:5:5", + "referencedDeclaration": 1250, + "src": "4654:5:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_memory_ptr", "typeString": "bool[] memory" } }, - "id": 1327, + "id": 1279, "indexExpression": { "argumentTypes": null, - "id": 1326, + "id": 1278, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1310, - "src": "4422:1:5", + "referencedDeclaration": 1262, + "src": "4660:1:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4315,7 +4612,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "4416:8:5", + "src": "4654:8:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4326,14 +4623,14 @@ "rightHandSide": { "argumentTypes": null, "hexValue": "74727565", - "id": 1328, + "id": 1280, "isConstant": false, "isLValue": false, "isPure": true, "kind": "bool", "lValueRequested": false, "nodeType": "Literal", - "src": "4427:4:5", + "src": "4665:4:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_bool", @@ -4341,15 +4638,15 @@ }, "value": "true" }, - "src": "4416:15:5", + "src": "4654:15:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1330, + "id": 1282, "nodeType": "ExpressionStatement", - "src": "4416:15:5" + "src": "4654:15:4" } ] } @@ -4362,19 +4659,19 @@ "typeIdentifier": "t_uint256", "typeString": "uint256" }, - "id": 1316, + "id": 1268, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftExpression": { "argumentTypes": null, - "id": 1313, + "id": 1265, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1310, - "src": "4330:1:5", + "referencedDeclaration": 1262, + "src": "4568:1:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4386,18 +4683,18 @@ "argumentTypes": null, "expression": { "argumentTypes": null, - "id": 1314, + "id": 1266, "name": "_nullifierHashes", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1294, - "src": "4334:16:5", + "referencedDeclaration": 1246, + "src": "4572:16:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_calldata_ptr", "typeString": "bytes32[] calldata" } }, - "id": 1315, + "id": 1267, "isConstant": false, "isLValue": false, "isPure": false, @@ -4405,31 +4702,31 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "4334:23:5", + "src": "4572:23:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "4330:27:5", + "src": "4568:27:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1334, + "id": 1286, "initializationExpression": { "assignments": [ - 1310 + 1262 ], "declarations": [ { "constant": false, - "id": 1310, + "id": 1262, "name": "i", "nodeType": "VariableDeclaration", - "scope": 1334, - "src": "4318:6:5", + "scope": 1286, + "src": "4556:6:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4437,10 +4734,10 @@ "typeString": "uint256" }, "typeName": { - "id": 1309, + "id": 1261, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "4318:4:5", + "src": "4556:4:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4450,18 +4747,18 @@ "visibility": "internal" } ], - "id": 1312, + "id": 1264, "initialValue": { "argumentTypes": null, "hexValue": "30", - "id": 1311, + "id": 1263, "isConstant": false, "isLValue": false, "isPure": true, "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "4327:1:5", + "src": "4565:1:4", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -4470,12 +4767,12 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "4318:10:5" + "src": "4556:10:4" }, "loopExpression": { "expression": { "argumentTypes": null, - "id": 1318, + "id": 1270, "isConstant": false, "isLValue": false, "isPure": false, @@ -4483,15 +4780,15 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "4359:3:5", + "src": "4597:3:4", "subExpression": { "argumentTypes": null, - "id": 1317, + "id": 1269, "name": "i", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1310, - "src": "4359:1:5", + "referencedDeclaration": 1262, + "src": "4597:1:4", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4502,33 +4799,33 @@ "typeString": "uint256" } }, - "id": 1319, + "id": 1271, "nodeType": "ExpressionStatement", - "src": "4359:3:5" + "src": "4597:3:4" }, "nodeType": "ForStatement", - "src": "4314:132:5" + "src": "4552:132:4" } ] }, "documentation": "@dev whether an array of notes is already spent ", - "id": 1336, + "id": 1288, "implemented": true, "kind": "function", "modifiers": [], "name": "isSpentArray", "nodeType": "FunctionDefinition", "parameters": { - "id": 1295, + "id": 1247, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1294, + "id": 1246, "name": "_nullifierHashes", "nodeType": "VariableDeclaration", - "scope": 1336, - "src": "4179:35:5", + "scope": 1288, + "src": "4417:35:4", "stateVariable": false, "storageLocation": "calldata", "typeDescriptions": { @@ -4537,19 +4834,19 @@ }, "typeName": { "baseType": { - "id": 1292, + "id": 1244, "name": "bytes32", "nodeType": "ElementaryTypeName", - "src": "4179:7:5", + "src": "4417:7:4", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" } }, - "id": 1293, + "id": 1245, "length": null, "nodeType": "ArrayTypeName", - "src": "4179:9:5", + "src": "4417:9:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bytes32_$dyn_storage_ptr", "typeString": "bytes32[]" @@ -4559,19 +4856,19 @@ "visibility": "internal" } ], - "src": "4178:37:5" + "src": "4416:37:4" }, "returnParameters": { - "id": 1299, + "id": 1251, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1298, + "id": 1250, "name": "spent", "nodeType": "VariableDeclaration", - "scope": 1336, - "src": "4238:19:5", + "scope": 1288, + "src": "4476:19:4", "stateVariable": false, "storageLocation": "memory", "typeDescriptions": { @@ -4580,19 +4877,19 @@ }, "typeName": { "baseType": { - "id": 1296, + "id": 1248, "name": "bool", "nodeType": "ElementaryTypeName", - "src": "4238:4:5", + "src": "4476:4:4", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" } }, - "id": 1297, + "id": 1249, "length": null, "nodeType": "ArrayTypeName", - "src": "4238:6:5", + "src": "4476:6:4", "typeDescriptions": { "typeIdentifier": "t_array$_t_bool_$dyn_storage_ptr", "typeString": "bool[]" @@ -4602,38 +4899,38 @@ "visibility": "internal" } ], - "src": "4237:21:5" + "src": "4475:21:4" }, - "scope": 1363, - "src": "4157:293:5", + "scope": 1320, + "src": "4395:293:4", "stateMutability": "view", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1349, + "id": 1301, "nodeType": "Block", - "src": "4748:45:5", + "src": "4986:45:4", "statements": [ { "expression": { "argumentTypes": null, - "id": 1347, + "id": 1299, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1343, + "id": 1295, "name": "verifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1068, - "src": "4754:8:5", + "referencedDeclaration": 1000, + "src": "4992:8:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, @@ -4644,12 +4941,12 @@ "arguments": [ { "argumentTypes": null, - "id": 1345, + "id": 1297, "name": "_newVerifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1338, - "src": "4775:12:5", + "referencedDeclaration": 1290, + "src": "5013:12:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4663,18 +4960,18 @@ "typeString": "address" } ], - "id": 1344, + "id": 1296, "name": "IVerifier", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1041, - "src": "4765:9:5", + "referencedDeclaration": 973, + "src": "5003:9:4", "typeDescriptions": { - "typeIdentifier": "t_type$_t_contract$_IVerifier_$1041_$", + "typeIdentifier": "t_type$_t_contract$_IVerifier_$973_$", "typeString": "type(contract IVerifier)" } }, - "id": 1346, + "id": 1298, "isConstant": false, "isLValue": false, "isPure": false, @@ -4682,62 +4979,62 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "4765:23:5", + "src": "5003:23:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "src": "4754:34:5", + "src": "4992:34:4", "typeDescriptions": { - "typeIdentifier": "t_contract$_IVerifier_$1041", + "typeIdentifier": "t_contract$_IVerifier_$973", "typeString": "contract IVerifier" } }, - "id": 1348, + "id": 1300, "nodeType": "ExpressionStatement", - "src": "4754:34:5" + "src": "4992:34:4" } ] }, "documentation": "@dev allow operator to update SNARK verification keys. This is needed to update keys after the final trusted setup ceremony is held.\nAfter that operator rights are supposed to be transferred to zero address", - "id": 1350, + "id": 1302, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 1341, + "id": 1293, "modifierName": { "argumentTypes": null, - "id": 1340, + "id": 1292, "name": "onlyOperator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1084, - "src": "4735:12:5", + "referencedDeclaration": 1016, + "src": "4973:12:4", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "4735:12:5" + "src": "4973:12:4" } ], "name": "updateVerifier", "nodeType": "FunctionDefinition", "parameters": { - "id": 1339, + "id": 1291, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1338, + "id": 1290, "name": "_newVerifier", "nodeType": "VariableDeclaration", - "scope": 1350, - "src": "4704:20:5", + "scope": 1302, + "src": "4942:20:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4745,10 +5042,10 @@ "typeString": "address" }, "typeName": { - "id": 1337, + "id": 1289, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4704:7:5", + "src": "4942:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4759,42 +5056,113 @@ "visibility": "internal" } ], - "src": "4703:22:5" + "src": "4941:22:4" }, "returnParameters": { - "id": 1342, + "id": 1294, "nodeType": "ParameterList", "parameters": [], - "src": "4748:0:5" + "src": "4986:0:4" }, - "scope": 1363, - "src": "4680:113:5", + "scope": 1320, + "src": "4918:113:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" }, { "body": { - "id": 1361, + "id": 1318, "nodeType": "Block", - "src": "4911:34:5", + "src": "5149:89:4", "statements": [ + { + "eventCall": { + "argumentTypes": null, + "arguments": [ + { + "argumentTypes": null, + "id": 1310, + "name": "operator", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1004, + "src": "5181:8:4", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + }, + { + "argumentTypes": null, + "id": 1311, + "name": "_newOperator", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1304, + "src": "5191:12:4", + "typeDescriptions": { + "typeIdentifier": "t_address", + "typeString": "address" + } + } + ], + "expression": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "id": 1309, + "name": "OwnershipTransferred", + "nodeType": "Identifier", + "overloadedDeclarations": [], + "referencedDeclaration": 1040, + "src": "5160:20:4", + "typeDescriptions": { + "typeIdentifier": "t_function_event_nonpayable$_t_address_$_t_address_$returns$__$", + "typeString": "function (address,address)" + } + }, + "id": 1312, + "isConstant": false, + "isLValue": false, + "isPure": false, + "kind": "functionCall", + "lValueRequested": false, + "names": [], + "nodeType": "FunctionCall", + "src": "5160:44:4", + "typeDescriptions": { + "typeIdentifier": "t_tuple$__$", + "typeString": "tuple()" + } + }, + "id": 1313, + "nodeType": "EmitStatement", + "src": "5155:49:4" + }, { "expression": { "argumentTypes": null, - "id": 1359, + "id": 1316, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "leftHandSide": { "argumentTypes": null, - "id": 1357, + "id": 1314, "name": "operator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1072, - "src": "4917:8:5", + "referencedDeclaration": 1004, + "src": "5210:8:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4804,67 +5172,67 @@ "operator": "=", "rightHandSide": { "argumentTypes": null, - "id": 1358, + "id": 1315, "name": "_newOperator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1352, - "src": "4928:12:5", + "referencedDeclaration": 1304, + "src": "5221:12:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "4917:23:5", + "src": "5210:23:4", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "id": 1360, + "id": 1317, "nodeType": "ExpressionStatement", - "src": "4917:23:5" + "src": "5210:23:4" } ] }, "documentation": "@dev operator can change his address ", - "id": 1362, + "id": 1319, "implemented": true, "kind": "function", "modifiers": [ { "arguments": null, - "id": 1355, + "id": 1307, "modifierName": { "argumentTypes": null, - "id": 1354, + "id": 1306, "name": "onlyOperator", "nodeType": "Identifier", "overloadedDeclarations": [], - "referencedDeclaration": 1084, - "src": "4898:12:5", + "referencedDeclaration": 1016, + "src": "5136:12:4", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "4898:12:5" + "src": "5136:12:4" } ], "name": "changeOperator", "nodeType": "FunctionDefinition", "parameters": { - "id": 1353, + "id": 1305, "nodeType": "ParameterList", "parameters": [ { "constant": false, - "id": 1352, + "id": 1304, "name": "_newOperator", "nodeType": "VariableDeclaration", - "scope": 1362, - "src": "4867:20:5", + "scope": 1319, + "src": "5105:20:4", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4872,10 +5240,10 @@ "typeString": "address" }, "typeName": { - "id": 1351, + "id": 1303, "name": "address", "nodeType": "ElementaryTypeName", - "src": "4867:7:5", + "src": "5105:7:4", "stateMutability": "nonpayable", "typeDescriptions": { "typeIdentifier": "t_address", @@ -4886,39 +5254,39 @@ "visibility": "internal" } ], - "src": "4866:22:5" + "src": "5104:22:4" }, "returnParameters": { - "id": 1356, + "id": 1308, "nodeType": "ParameterList", "parameters": [], - "src": "4911:0:5" + "src": "5149:0:4" }, - "scope": 1363, - "src": "4843:102:5", + "scope": 1320, + "src": "5081:157:4", "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" } ], - "scope": 1364, - "src": "383:4564:5" + "scope": 1321, + "src": "383:4857:4" } ], - "src": "0:4948:5" + "src": "0:5241:4" }, "legacyAST": { "attributes": { "absolutePath": "/home/home/dotfiles/tornado-core/contracts/Tornado.sol", "exportedSymbols": { "IFeeManager": [ - 1052 + 984 ], "IVerifier": [ - 1041 + 973 ], "Tornado": [ - 1363 + 1320 ] } }, @@ -4931,39 +5299,39 @@ ".17" ] }, - "id": 1027, + "id": 959, "name": "PragmaDirective", - "src": "0:23:5" + "src": "0:23:4" }, { "attributes": { - "SourceUnit": 839, + "SourceUnit": 771, "absolutePath": "/home/home/dotfiles/tornado-core/contracts/MerkleTreeWithHistory.sol", "file": "./MerkleTreeWithHistory.sol", - "scope": 1364, + "scope": 1321, "symbolAliases": [ null ], "unitAlias": "" }, - "id": 1028, + "id": 960, "name": "ImportDirective", - "src": "25:37:5" + "src": "25:37:4" }, { "attributes": { - "SourceUnit": 1394, + "SourceUnit": 1351, "absolutePath": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", "file": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", - "scope": 1364, + "scope": 1321, "symbolAliases": [ null ], "unitAlias": "" }, - "id": 1029, + "id": 961, "name": "ImportDirective", - "src": "63:59:5" + "src": "63:59:4" }, { "attributes": { @@ -4977,10 +5345,10 @@ "documentation": null, "fullyImplemented": false, "linearizedBaseContracts": [ - 1041 + 973 ], "name": "IVerifier", - "scope": 1364 + "scope": 1321 }, "children": [ { @@ -4994,7 +5362,7 @@ null ], "name": "verifyProof", - "scope": 1041, + "scope": 973, "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -5006,7 +5374,7 @@ "attributes": { "constant": false, "name": "_proof", - "scope": 1040, + "scope": 972, "stateVariable": false, "storageLocation": "memory", "type": "bytes", @@ -5019,20 +5387,20 @@ "name": "bytes", "type": "bytes" }, - "id": 1030, + "id": 962, "name": "ElementaryTypeName", - "src": "168:5:5" + "src": "168:5:4" } ], - "id": 1031, + "id": 963, "name": "VariableDeclaration", - "src": "168:19:5" + "src": "168:19:4" }, { "attributes": { "constant": false, "name": "_input", - "scope": 1040, + "scope": 972, "stateVariable": false, "storageLocation": "memory", "type": "uint256[6]", @@ -5050,9 +5418,9 @@ "name": "uint256", "type": "uint256" }, - "id": 1032, + "id": 964, "name": "ElementaryTypeName", - "src": "189:7:5" + "src": "189:7:4" }, { "attributes": { @@ -5067,24 +5435,24 @@ "type": "int_const 6", "value": "6" }, - "id": 1033, + "id": 965, "name": "Literal", - "src": "197:1:5" + "src": "197:1:4" } ], - "id": 1034, + "id": 966, "name": "ArrayTypeName", - "src": "189:10:5" + "src": "189:10:4" } ], - "id": 1035, + "id": 967, "name": "VariableDeclaration", - "src": "189:24:5" + "src": "189:24:4" } ], - "id": 1036, + "id": 968, "name": "ParameterList", - "src": "167:47:5" + "src": "167:47:4" }, { "children": [ @@ -5092,7 +5460,7 @@ "attributes": { "constant": false, "name": "", - "scope": 1040, + "scope": 972, "stateVariable": false, "storageLocation": "default", "type": "bool", @@ -5105,29 +5473,29 @@ "name": "bool", "type": "bool" }, - "id": 1037, + "id": 969, "name": "ElementaryTypeName", - "src": "230:4:5" + "src": "230:4:4" } ], - "id": 1038, + "id": 970, "name": "VariableDeclaration", - "src": "230:4:5" + "src": "230:4:4" } ], - "id": 1039, + "id": 971, "name": "ParameterList", - "src": "229:6:5" + "src": "229:6:4" } ], - "id": 1040, + "id": 972, "name": "FunctionDefinition", - "src": "147:89:5" + "src": "147:89:4" } ], - "id": 1041, + "id": 973, "name": "ContractDefinition", - "src": "124:114:5" + "src": "124:114:4" }, { "attributes": { @@ -5141,10 +5509,10 @@ "documentation": null, "fullyImplemented": false, "linearizedBaseContracts": [ - 1052 + 984 ], "name": "IFeeManager", - "scope": 1364 + "scope": 1321 }, "children": [ { @@ -5158,7 +5526,7 @@ null ], "name": "feeTo", - "scope": 1052, + "scope": 984, "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -5171,9 +5539,9 @@ ] }, "children": [], - "id": 1042, + "id": 974, "name": "ParameterList", - "src": "279:2:5" + "src": "279:2:4" }, { "children": [ @@ -5181,7 +5549,7 @@ "attributes": { "constant": false, "name": "", - "scope": 1046, + "scope": 978, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -5195,24 +5563,24 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1043, + "id": 975, "name": "ElementaryTypeName", - "src": "305:7:5" + "src": "305:7:4" } ], - "id": 1044, + "id": 976, "name": "VariableDeclaration", - "src": "305:7:5" + "src": "305:7:4" } ], - "id": 1045, + "id": 977, "name": "ParameterList", - "src": "304:9:5" + "src": "304:9:4" } ], - "id": 1046, + "id": 978, "name": "FunctionDefinition", - "src": "265:49:5" + "src": "265:49:4" }, { "attributes": { @@ -5225,7 +5593,7 @@ null ], "name": "protocolFeeDivisor", - "scope": 1052, + "scope": 984, "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -5238,9 +5606,9 @@ ] }, "children": [], - "id": 1047, + "id": 979, "name": "ParameterList", - "src": "344:2:5" + "src": "344:2:4" }, { "children": [ @@ -5248,7 +5616,7 @@ "attributes": { "constant": false, "name": "", - "scope": 1051, + "scope": 983, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -5261,46 +5629,46 @@ "name": "uint256", "type": "uint256" }, - "id": 1048, + "id": 980, "name": "ElementaryTypeName", - "src": "370:7:5" + "src": "370:7:4" } ], - "id": 1049, + "id": 981, "name": "VariableDeclaration", - "src": "370:7:5" + "src": "370:7:4" } ], - "id": 1050, + "id": 982, "name": "ParameterList", - "src": "369:9:5" + "src": "369:9:4" } ], - "id": 1051, + "id": 983, "name": "FunctionDefinition", - "src": "317:62:5" + "src": "317:62:4" } ], - "id": 1052, + "id": 984, "name": "ContractDefinition", - "src": "240:141:5" + "src": "240:141:4" }, { "attributes": { "contractDependencies": [ - 838, - 1393 + 770, + 1350 ], "contractKind": "contract", "documentation": null, "fullyImplemented": false, "linearizedBaseContracts": [ - 1363, - 1393, - 838 + 1320, + 1350, + 770 ], "name": "Tornado", - "scope": 1364 + "scope": 1321 }, "children": [ { @@ -5312,17 +5680,17 @@ "attributes": { "contractScope": null, "name": "MerkleTreeWithHistory", - "referencedDeclaration": 838, + "referencedDeclaration": 770, "type": "contract MerkleTreeWithHistory" }, - "id": 1053, + "id": 985, "name": "UserDefinedTypeName", - "src": "403:21:5" + "src": "403:21:4" } ], - "id": 1054, + "id": 986, "name": "InheritanceSpecifier", - "src": "403:21:5" + "src": "403:21:4" }, { "attributes": { @@ -5333,23 +5701,23 @@ "attributes": { "contractScope": null, "name": "ReentrancyGuard", - "referencedDeclaration": 1393, + "referencedDeclaration": 1350, "type": "contract ReentrancyGuard" }, - "id": 1055, + "id": 987, "name": "UserDefinedTypeName", - "src": "426:15:5" + "src": "426:15:4" } ], - "id": 1056, + "id": 988, "name": "InheritanceSpecifier", - "src": "426:15:5" + "src": "426:15:4" }, { "attributes": { "constant": false, "name": "denomination", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "uint256", @@ -5362,20 +5730,20 @@ "name": "uint256", "type": "uint256" }, - "id": 1057, + "id": 989, "name": "ElementaryTypeName", - "src": "446:7:5" + "src": "446:7:4" } ], - "id": 1058, + "id": 990, "name": "VariableDeclaration", - "src": "446:27:5" + "src": "446:27:4" }, { "attributes": { "constant": false, "name": "nullifierHashes", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "mapping(bytes32 => bool)", @@ -5393,34 +5761,34 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1059, + "id": 991, "name": "ElementaryTypeName", - "src": "485:7:5" + "src": "485:7:4" }, { "attributes": { "name": "bool", "type": "bool" }, - "id": 1060, + "id": 992, "name": "ElementaryTypeName", - "src": "496:4:5" + "src": "496:4:4" } ], - "id": 1061, + "id": 993, "name": "Mapping", - "src": "477:24:5" + "src": "477:24:4" } ], - "id": 1062, + "id": 994, "name": "VariableDeclaration", - "src": "477:47:5" + "src": "477:47:4" }, { "attributes": { "constant": false, "name": "commitments", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "mapping(bytes32 => bool)", @@ -5438,34 +5806,34 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1063, + "id": 995, "name": "ElementaryTypeName", - "src": "627:7:5" + "src": "627:7:4" }, { "attributes": { "name": "bool", "type": "bool" }, - "id": 1064, + "id": 996, "name": "ElementaryTypeName", - "src": "638:4:5" + "src": "638:4:4" } ], - "id": 1065, + "id": 997, "name": "Mapping", - "src": "619:24:5" + "src": "619:24:4" } ], - "id": 1066, + "id": 998, "name": "VariableDeclaration", - "src": "619:43:5" + "src": "619:43:4" }, { "attributes": { "constant": false, "name": "verifier", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "contract IVerifier", @@ -5477,23 +5845,23 @@ "attributes": { "contractScope": null, "name": "IVerifier", - "referencedDeclaration": 1041, + "referencedDeclaration": 973, "type": "contract IVerifier" }, - "id": 1067, + "id": 999, "name": "UserDefinedTypeName", - "src": "666:9:5" + "src": "666:9:4" } ], - "id": 1068, + "id": 1000, "name": "VariableDeclaration", - "src": "666:25:5" + "src": "666:25:4" }, { "attributes": { "constant": false, "name": "feeManager", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "contract IFeeManager", @@ -5505,23 +5873,23 @@ "attributes": { "contractScope": null, "name": "IFeeManager", - "referencedDeclaration": 1052, + "referencedDeclaration": 984, "type": "contract IFeeManager" }, - "id": 1069, + "id": 1001, "name": "UserDefinedTypeName", - "src": "695:11:5" + "src": "695:11:4" } ], - "id": 1070, + "id": 1002, "name": "VariableDeclaration", - "src": "695:29:5" + "src": "695:29:4" }, { "attributes": { "constant": false, "name": "operator", - "scope": 1363, + "scope": 1320, "stateVariable": true, "storageLocation": "default", "type": "address", @@ -5535,14 +5903,14 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1071, + "id": 1003, "name": "ElementaryTypeName", - "src": "884:7:5" + "src": "884:7:4" } ], - "id": 1072, + "id": 1004, "name": "VariableDeclaration", - "src": "884:23:5" + "src": "884:23:4" }, { "attributes": { @@ -5558,9 +5926,9 @@ ] }, "children": [], - "id": 1073, + "id": 1005, "name": "ParameterList", - "src": "933:0:5" + "src": "933:0:4" }, { "children": [ @@ -5594,16 +5962,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1074, + "id": 1006, "name": "Identifier", - "src": "939:7:5" + "src": "939:7:4" }, { "attributes": { @@ -5638,18 +6006,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1408, + "referencedDeclaration": 1365, "type": "msg", "value": "msg" }, - "id": 1075, + "id": 1007, "name": "Identifier", - "src": "947:3:5" + "src": "947:3:4" } ], - "id": 1076, + "id": 1008, "name": "MemberAccess", - "src": "947:10:5" + "src": "947:10:4" }, { "attributes": { @@ -5657,18 +6025,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1072, + "referencedDeclaration": 1004, "type": "address", "value": "operator" }, - "id": 1077, + "id": 1009, "name": "Identifier", - "src": "961:8:5" + "src": "961:8:4" } ], - "id": 1078, + "id": 1010, "name": "BinaryOperation", - "src": "947:22:5" + "src": "947:22:4" }, { "attributes": { @@ -5683,34 +6051,34 @@ "type": "literal_string \"Only operator can call this function.\"", "value": "Only operator can call this function." }, - "id": 1079, + "id": 1011, "name": "Literal", - "src": "971:39:5" + "src": "971:39:4" } ], - "id": 1080, + "id": 1012, "name": "FunctionCall", - "src": "939:72:5" + "src": "939:72:4" } ], - "id": 1081, + "id": 1013, "name": "ExpressionStatement", - "src": "939:72:5" + "src": "939:72:4" }, { - "id": 1082, + "id": 1014, "name": "PlaceholderStatement", - "src": "1017:1:5" + "src": "1017:1:4" } ], - "id": 1083, + "id": 1015, "name": "Block", - "src": "933:90:5" + "src": "933:90:4" } ], - "id": 1084, + "id": 1016, "name": "ModifierDefinition", - "src": "911:112:5" + "src": "911:112:4" }, { "attributes": { @@ -5726,7 +6094,7 @@ "constant": false, "indexed": true, "name": "commitment", - "scope": 1092, + "scope": 1024, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -5739,21 +6107,21 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1085, + "id": 1017, "name": "ElementaryTypeName", - "src": "1041:7:5" + "src": "1041:7:4" } ], - "id": 1086, + "id": 1018, "name": "VariableDeclaration", - "src": "1041:26:5" + "src": "1041:26:4" }, { "attributes": { "constant": false, "indexed": false, "name": "leafIndex", - "scope": 1092, + "scope": 1024, "stateVariable": false, "storageLocation": "default", "type": "uint32", @@ -5766,21 +6134,21 @@ "name": "uint32", "type": "uint32" }, - "id": 1087, + "id": 1019, "name": "ElementaryTypeName", - "src": "1069:6:5" + "src": "1069:6:4" } ], - "id": 1088, + "id": 1020, "name": "VariableDeclaration", - "src": "1069:16:5" + "src": "1069:16:4" }, { "attributes": { "constant": false, "indexed": false, "name": "timestamp", - "scope": 1092, + "scope": 1024, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -5793,24 +6161,24 @@ "name": "uint256", "type": "uint256" }, - "id": 1089, + "id": 1021, "name": "ElementaryTypeName", - "src": "1087:7:5" + "src": "1087:7:4" } ], - "id": 1090, + "id": 1022, "name": "VariableDeclaration", - "src": "1087:17:5" + "src": "1087:17:4" } ], - "id": 1091, + "id": 1023, "name": "ParameterList", - "src": "1040:65:5" + "src": "1040:65:4" } ], - "id": 1092, + "id": 1024, "name": "EventDefinition", - "src": "1027:79:5" + "src": "1027:79:4" }, { "attributes": { @@ -5826,7 +6194,7 @@ "constant": false, "indexed": false, "name": "to", - "scope": 1102, + "scope": 1034, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -5840,21 +6208,21 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1093, + "id": 1025, "name": "ElementaryTypeName", - "src": "1126:7:5" + "src": "1126:7:4" } ], - "id": 1094, + "id": 1026, "name": "VariableDeclaration", - "src": "1126:10:5" + "src": "1126:10:4" }, { "attributes": { "constant": false, "indexed": false, "name": "nullifierHash", - "scope": 1102, + "scope": 1034, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -5867,21 +6235,21 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1095, + "id": 1027, "name": "ElementaryTypeName", - "src": "1138:7:5" + "src": "1138:7:4" } ], - "id": 1096, + "id": 1028, "name": "VariableDeclaration", - "src": "1138:21:5" + "src": "1138:21:4" }, { "attributes": { "constant": false, "indexed": true, "name": "relayer", - "scope": 1102, + "scope": 1034, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -5895,21 +6263,21 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1097, + "id": 1029, "name": "ElementaryTypeName", - "src": "1161:7:5" + "src": "1161:7:4" } ], - "id": 1098, + "id": 1030, "name": "VariableDeclaration", - "src": "1161:23:5" + "src": "1161:23:4" }, { "attributes": { "constant": false, "indexed": false, "name": "fee", - "scope": 1102, + "scope": 1034, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -5922,24 +6290,173 @@ "name": "uint256", "type": "uint256" }, - "id": 1099, + "id": 1031, "name": "ElementaryTypeName", - "src": "1186:7:5" + "src": "1186:7:4" } ], - "id": 1100, + "id": 1032, "name": "VariableDeclaration", - "src": "1186:11:5" + "src": "1186:11:4" } ], - "id": 1101, + "id": 1033, "name": "ParameterList", - "src": "1125:73:5" + "src": "1125:73:4" } ], - "id": 1102, + "id": 1034, "name": "EventDefinition", - "src": "1109:90:5" + "src": "1109:90:4" + }, + { + "attributes": { + "anonymous": false, + "documentation": null, + "name": "OwnershipTransferred" + }, + "children": [ + { + "children": [ + { + "attributes": { + "constant": false, + "indexed": true, + "name": "previousOwner", + "scope": 1040, + "stateVariable": false, + "storageLocation": "default", + "type": "address", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "address", + "stateMutability": "nonpayable", + "type": "address" + }, + "id": 1035, + "name": "ElementaryTypeName", + "src": "1229:7:4" + } + ], + "id": 1036, + "name": "VariableDeclaration", + "src": "1229:29:4" + }, + { + "attributes": { + "constant": false, + "indexed": true, + "name": "newOwner", + "scope": 1040, + "stateVariable": false, + "storageLocation": "default", + "type": "address", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "address", + "stateMutability": "nonpayable", + "type": "address" + }, + "id": 1037, + "name": "ElementaryTypeName", + "src": "1260:7:4" + } + ], + "id": 1038, + "name": "VariableDeclaration", + "src": "1260:24:4" + } + ], + "id": 1039, + "name": "ParameterList", + "src": "1228:57:4" + } + ], + "id": 1040, + "name": "EventDefinition", + "src": "1202:84:4" + }, + { + "attributes": { + "anonymous": false, + "documentation": null, + "name": "EncryptedNote" + }, + "children": [ + { + "children": [ + { + "attributes": { + "constant": false, + "indexed": true, + "name": "sender", + "scope": 1046, + "stateVariable": false, + "storageLocation": "default", + "type": "address", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "address", + "stateMutability": "nonpayable", + "type": "address" + }, + "id": 1041, + "name": "ElementaryTypeName", + "src": "1309:7:4" + } + ], + "id": 1042, + "name": "VariableDeclaration", + "src": "1309:22:4" + }, + { + "attributes": { + "constant": false, + "indexed": false, + "name": "encryptedNote", + "scope": 1046, + "stateVariable": false, + "storageLocation": "default", + "type": "bytes", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "bytes", + "type": "bytes" + }, + "id": 1043, + "name": "ElementaryTypeName", + "src": "1333:5:4" + } + ], + "id": 1044, + "name": "VariableDeclaration", + "src": "1333:19:4" + } + ], + "id": 1045, + "name": "ParameterList", + "src": "1308:45:4" + } + ], + "id": 1046, + "name": "EventDefinition", + "src": "1289:65:4" }, { "attributes": { @@ -5948,7 +6465,7 @@ "isConstructor": true, "kind": "constructor", "name": "", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -5960,7 +6477,7 @@ "attributes": { "constant": false, "name": "_verifier", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "contract IVerifier", @@ -5972,23 +6489,23 @@ "attributes": { "contractScope": null, "name": "IVerifier", - "referencedDeclaration": 1041, + "referencedDeclaration": 973, "type": "contract IVerifier" }, - "id": 1103, + "id": 1047, "name": "UserDefinedTypeName", - "src": "1515:9:5" + "src": "1670:9:4" } ], - "id": 1104, + "id": 1048, "name": "VariableDeclaration", - "src": "1515:19:5" + "src": "1670:19:4" }, { "attributes": { "constant": false, "name": "_feeManager", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "contract IFeeManager", @@ -6000,23 +6517,23 @@ "attributes": { "contractScope": null, "name": "IFeeManager", - "referencedDeclaration": 1052, + "referencedDeclaration": 984, "type": "contract IFeeManager" }, - "id": 1105, + "id": 1049, "name": "UserDefinedTypeName", - "src": "1540:11:5" + "src": "1695:11:4" } ], - "id": 1106, + "id": 1050, "name": "VariableDeclaration", - "src": "1540:23:5" + "src": "1695:23:4" }, { "attributes": { "constant": false, "name": "_denomination", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -6029,20 +6546,20 @@ "name": "uint256", "type": "uint256" }, - "id": 1107, + "id": 1051, "name": "ElementaryTypeName", - "src": "1569:7:5" + "src": "1724:7:4" } ], - "id": 1108, + "id": 1052, "name": "VariableDeclaration", - "src": "1569:21:5" + "src": "1724:21:4" }, { "attributes": { "constant": false, "name": "_merkleTreeHeight", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "uint32", @@ -6055,20 +6572,20 @@ "name": "uint32", "type": "uint32" }, - "id": 1109, + "id": 1053, "name": "ElementaryTypeName", - "src": "1596:6:5" + "src": "1751:6:4" } ], - "id": 1110, + "id": 1054, "name": "VariableDeclaration", - "src": "1596:24:5" + "src": "1751:24:4" }, { "attributes": { "constant": false, "name": "_operator", - "scope": 1142, + "scope": 1086, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -6082,19 +6599,19 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1111, + "id": 1055, "name": "ElementaryTypeName", - "src": "1626:7:5" + "src": "1781:7:4" } ], - "id": 1112, + "id": 1056, "name": "VariableDeclaration", - "src": "1626:17:5" + "src": "1781:17:4" } ], - "id": 1113, + "id": 1057, "name": "ParameterList", - "src": "1509:138:5" + "src": "1664:138:4" }, { "attributes": { @@ -6103,9 +6620,9 @@ ] }, "children": [], - "id": 1117, + "id": 1061, "name": "ParameterList", - "src": "1696:0:5" + "src": "1851:0:4" }, { "children": [ @@ -6115,13 +6632,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 838, + "referencedDeclaration": 770, "type": "type(contract MerkleTreeWithHistory)", "value": "MerkleTreeWithHistory" }, - "id": 1114, + "id": 1058, "name": "Identifier", - "src": "1648:21:5" + "src": "1803:21:4" }, { "attributes": { @@ -6129,18 +6646,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1110, + "referencedDeclaration": 1054, "type": "uint32", "value": "_merkleTreeHeight" }, - "id": 1115, + "id": 1059, "name": "Identifier", - "src": "1670:17:5" + "src": "1825:17:4" } ], - "id": 1116, + "id": 1060, "name": "ModifierInvocation", - "src": "1648:40:5" + "src": "1803:40:4" }, { "children": [ @@ -6174,16 +6691,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1118, + "id": 1062, "name": "Identifier", - "src": "1702:7:5" + "src": "1857:7:4" }, { "attributes": { @@ -6206,13 +6723,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1108, + "referencedDeclaration": 1052, "type": "uint256", "value": "_denomination" }, - "id": 1119, + "id": 1063, "name": "Identifier", - "src": "1710:13:5" + "src": "1865:13:4" }, { "attributes": { @@ -6227,14 +6744,14 @@ "type": "int_const 0", "value": "0" }, - "id": 1120, + "id": 1064, "name": "Literal", - "src": "1726:1:5" + "src": "1881:1:4" } ], - "id": 1121, + "id": 1065, "name": "BinaryOperation", - "src": "1710:17:5" + "src": "1865:17:4" }, { "attributes": { @@ -6249,19 +6766,19 @@ "type": "literal_string \"denomination should be greater than 0\"", "value": "denomination should be greater than 0" }, - "id": 1122, + "id": 1066, "name": "Literal", - "src": "1729:39:5" + "src": "1884:39:4" } ], - "id": 1123, + "id": 1067, "name": "FunctionCall", - "src": "1702:67:5" + "src": "1857:67:4" } ], - "id": 1124, + "id": 1068, "name": "ExpressionStatement", - "src": "1702:67:5" + "src": "1857:67:4" }, { "children": [ @@ -6282,13 +6799,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1068, + "referencedDeclaration": 1000, "type": "contract IVerifier", "value": "verifier" }, - "id": 1125, + "id": 1069, "name": "Identifier", - "src": "1775:8:5" + "src": "1930:8:4" }, { "attributes": { @@ -6296,23 +6813,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1104, + "referencedDeclaration": 1048, "type": "contract IVerifier", "value": "_verifier" }, - "id": 1126, + "id": 1070, "name": "Identifier", - "src": "1786:9:5" + "src": "1941:9:4" } ], - "id": 1127, + "id": 1071, "name": "Assignment", - "src": "1775:20:5" + "src": "1930:20:4" } ], - "id": 1128, + "id": 1072, "name": "ExpressionStatement", - "src": "1775:20:5" + "src": "1930:20:4" }, { "children": [ @@ -6333,13 +6850,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1070, + "referencedDeclaration": 1002, "type": "contract IFeeManager", "value": "feeManager" }, - "id": 1129, + "id": 1073, "name": "Identifier", - "src": "1801:10:5" + "src": "1956:10:4" }, { "attributes": { @@ -6347,23 +6864,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1106, + "referencedDeclaration": 1050, "type": "contract IFeeManager", "value": "_feeManager" }, - "id": 1130, + "id": 1074, "name": "Identifier", - "src": "1814:11:5" + "src": "1969:11:4" } ], - "id": 1131, + "id": 1075, "name": "Assignment", - "src": "1801:24:5" + "src": "1956:24:4" } ], - "id": 1132, + "id": 1076, "name": "ExpressionStatement", - "src": "1801:24:5" + "src": "1956:24:4" }, { "children": [ @@ -6384,13 +6901,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1072, + "referencedDeclaration": 1004, "type": "address", "value": "operator" }, - "id": 1133, + "id": 1077, "name": "Identifier", - "src": "1831:8:5" + "src": "1986:8:4" }, { "attributes": { @@ -6398,23 +6915,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1112, + "referencedDeclaration": 1056, "type": "address", "value": "_operator" }, - "id": 1134, + "id": 1078, "name": "Identifier", - "src": "1842:9:5" + "src": "1997:9:4" } ], - "id": 1135, + "id": 1079, "name": "Assignment", - "src": "1831:20:5" + "src": "1986:20:4" } ], - "id": 1136, + "id": 1080, "name": "ExpressionStatement", - "src": "1831:20:5" + "src": "1986:20:4" }, { "children": [ @@ -6435,13 +6952,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1058, + "referencedDeclaration": 990, "type": "uint256", "value": "denomination" }, - "id": 1137, + "id": 1081, "name": "Identifier", - "src": "1857:12:5" + "src": "2012:12:4" }, { "attributes": { @@ -6449,33 +6966,33 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1108, + "referencedDeclaration": 1052, "type": "uint256", "value": "_denomination" }, - "id": 1138, + "id": 1082, "name": "Identifier", - "src": "1872:13:5" + "src": "2027:13:4" } ], - "id": 1139, + "id": 1083, "name": "Assignment", - "src": "1857:28:5" + "src": "2012:28:4" } ], - "id": 1140, + "id": 1084, "name": "ExpressionStatement", - "src": "1857:28:5" + "src": "2012:28:4" } ], - "id": 1141, + "id": 1085, "name": "Block", - "src": "1696:194:5" + "src": "1851:194:4" } ], - "id": 1142, + "id": 1086, "name": "FunctionDefinition", - "src": "1498:392:5" + "src": "1653:392:4" }, { "attributes": { @@ -6484,7 +7001,7 @@ "isConstructor": false, "kind": "function", "name": "deposit", - "scope": 1363, + "scope": 1320, "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -6496,7 +7013,7 @@ "attributes": { "constant": false, "name": "_commitment", - "scope": 1180, + "scope": 1132, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -6509,19 +7026,45 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1143, + "id": 1087, "name": "ElementaryTypeName", - "src": "2155:7:5" + "src": "2310:7:4" } ], - "id": 1144, + "id": 1088, "name": "VariableDeclaration", - "src": "2155:19:5" + "src": "2310:19:4" + }, + { + "attributes": { + "constant": false, + "name": "_encryptedNote", + "scope": 1132, + "stateVariable": false, + "storageLocation": "calldata", + "type": "bytes", + "value": null, + "visibility": "internal" + }, + "children": [ + { + "attributes": { + "name": "bytes", + "type": "bytes" + }, + "id": 1089, + "name": "ElementaryTypeName", + "src": "2331:5:4" + } + ], + "id": 1090, + "name": "VariableDeclaration", + "src": "2331:29:4" } ], - "id": 1145, + "id": 1091, "name": "ParameterList", - "src": "2154:21:5" + "src": "2309:52:4" }, { "attributes": { @@ -6530,9 +7073,9 @@ ] }, "children": [], - "id": 1148, + "id": 1094, "name": "ParameterList", - "src": "2206:0:5" + "src": "2392:0:4" }, { "attributes": { @@ -6545,18 +7088,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1392, + "referencedDeclaration": 1349, "type": "modifier ()", "value": "nonReentrant" }, - "id": 1146, + "id": 1092, "name": "Identifier", - "src": "2193:12:5" + "src": "2379:12:4" } ], - "id": 1147, + "id": 1093, "name": "ModifierInvocation", - "src": "2193:12:5" + "src": "2379:12:4" }, { "children": [ @@ -6590,16 +7133,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1149, + "id": 1095, "name": "Identifier", - "src": "2212:7:5" + "src": "2398:7:4" }, { "attributes": { @@ -6629,13 +7172,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1066, + "referencedDeclaration": 998, "type": "mapping(bytes32 => bool)", "value": "commitments" }, - "id": 1150, + "id": 1096, "name": "Identifier", - "src": "2221:11:5" + "src": "2407:11:4" }, { "attributes": { @@ -6643,23 +7186,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1144, + "referencedDeclaration": 1088, "type": "bytes32", "value": "_commitment" }, - "id": 1151, + "id": 1097, "name": "Identifier", - "src": "2233:11:5" + "src": "2419:11:4" } ], - "id": 1152, + "id": 1098, "name": "IndexAccess", - "src": "2221:24:5" + "src": "2407:24:4" } ], - "id": 1153, + "id": 1099, "name": "UnaryOperation", - "src": "2220:25:5" + "src": "2406:25:4" }, { "attributes": { @@ -6674,24 +7217,24 @@ "type": "literal_string \"The commitment has been submitted\"", "value": "The commitment has been submitted" }, - "id": 1154, + "id": 1100, "name": "Literal", - "src": "2247:35:5" + "src": "2433:35:4" } ], - "id": 1155, + "id": 1101, "name": "FunctionCall", - "src": "2212:71:5" + "src": "2398:71:4" } ], - "id": 1156, + "id": 1102, "name": "ExpressionStatement", - "src": "2212:71:5" + "src": "2398:71:4" }, { "attributes": { "assignments": [ - 1158 + 1104 ] }, "children": [ @@ -6699,7 +7242,7 @@ "attributes": { "constant": false, "name": "insertedIndex", - "scope": 1179, + "scope": 1131, "stateVariable": false, "storageLocation": "default", "type": "uint32", @@ -6712,14 +7255,14 @@ "name": "uint32", "type": "uint32" }, - "id": 1157, + "id": 1103, "name": "ElementaryTypeName", - "src": "2290:6:5" + "src": "2476:6:4" } ], - "id": 1158, + "id": 1104, "name": "VariableDeclaration", - "src": "2290:20:5" + "src": "2476:20:4" }, { "attributes": { @@ -6747,13 +7290,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 780, + "referencedDeclaration": 712, "type": "function (bytes32) returns (uint32)", "value": "_insert" }, - "id": 1159, + "id": 1105, "name": "Identifier", - "src": "2313:7:5" + "src": "2499:7:4" }, { "attributes": { @@ -6761,23 +7304,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1144, + "referencedDeclaration": 1088, "type": "bytes32", "value": "_commitment" }, - "id": 1160, + "id": 1106, "name": "Identifier", - "src": "2321:11:5" + "src": "2507:11:4" } ], - "id": 1161, + "id": 1107, "name": "FunctionCall", - "src": "2313:20:5" + "src": "2499:20:4" } ], - "id": 1162, + "id": 1108, "name": "VariableDeclarationStatement", - "src": "2290:43:5" + "src": "2476:43:4" }, { "children": [ @@ -6808,13 +7351,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1066, + "referencedDeclaration": 998, "type": "mapping(bytes32 => bool)", "value": "commitments" }, - "id": 1163, + "id": 1109, "name": "Identifier", - "src": "2339:11:5" + "src": "2525:11:4" }, { "attributes": { @@ -6822,18 +7365,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1144, + "referencedDeclaration": 1088, "type": "bytes32", "value": "_commitment" }, - "id": 1164, + "id": 1110, "name": "Identifier", - "src": "2351:11:5" + "src": "2537:11:4" } ], - "id": 1165, + "id": 1111, "name": "IndexAccess", - "src": "2339:24:5" + "src": "2525:24:4" }, { "attributes": { @@ -6848,19 +7391,19 @@ "type": "bool", "value": "true" }, - "id": 1166, + "id": 1112, "name": "Literal", - "src": "2366:4:5" + "src": "2552:4:4" } ], - "id": 1167, + "id": 1113, "name": "Assignment", - "src": "2339:31:5" + "src": "2525:31:4" } ], - "id": 1168, + "id": 1114, "name": "ExpressionStatement", - "src": "2339:31:5" + "src": "2525:31:4" }, { "children": [ @@ -6890,23 +7433,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1183, + "referencedDeclaration": 1135, "type": "function ()", "value": "_processDeposit" }, - "id": 1169, + "id": 1115, "name": "Identifier", - "src": "2376:15:5" + "src": "2562:15:4" } ], - "id": 1170, + "id": 1116, "name": "FunctionCall", - "src": "2376:17:5" + "src": "2562:17:4" } ], - "id": 1171, + "id": 1117, "name": "ExpressionStatement", - "src": "2376:17:5" + "src": "2562:17:4" }, { "children": [ @@ -6944,13 +7487,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1092, + "referencedDeclaration": 1024, "type": "function (bytes32,uint32,uint256)", "value": "Deposit" }, - "id": 1172, + "id": 1118, "name": "Identifier", - "src": "2405:7:5" + "src": "2591:7:4" }, { "attributes": { @@ -6958,13 +7501,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1144, + "referencedDeclaration": 1088, "type": "bytes32", "value": "_commitment" }, - "id": 1173, + "id": 1119, "name": "Identifier", - "src": "2413:11:5" + "src": "2599:11:4" }, { "attributes": { @@ -6972,13 +7515,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1158, + "referencedDeclaration": 1104, "type": "uint32", "value": "insertedIndex" }, - "id": 1174, + "id": 1120, "name": "Identifier", - "src": "2426:13:5" + "src": "2612:13:4" }, { "attributes": { @@ -6998,38 +7541,133 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1398, + "referencedDeclaration": 1355, "type": "block", "value": "block" }, - "id": 1175, + "id": 1121, "name": "Identifier", - "src": "2441:5:5" + "src": "2627:5:4" } ], - "id": 1176, + "id": 1122, "name": "MemberAccess", - "src": "2441:15:5" + "src": "2627:15:4" } ], - "id": 1177, + "id": 1123, "name": "FunctionCall", - "src": "2405:52:5" + "src": "2591:52:4" } ], - "id": 1178, + "id": 1124, "name": "EmitStatement", - "src": "2400:57:5" + "src": "2586:57:4" + }, + { + "children": [ + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "isStructConstructorCall": false, + "lValueRequested": false, + "names": [ + null + ], + "type": "tuple()", + "type_conversion": false + }, + "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_address_payable", + "typeString": "address payable" + }, + { + "typeIdentifier": "t_bytes_calldata_ptr", + "typeString": "bytes calldata" + } + ], + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1046, + "type": "function (address,bytes memory)", + "value": "EncryptedNote" + }, + "id": 1125, + "name": "Identifier", + "src": "2654:13:4" + }, + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "lValueRequested": false, + "member_name": "sender", + "referencedDeclaration": null, + "type": "address payable" + }, + "children": [ + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1365, + "type": "msg", + "value": "msg" + }, + "id": 1126, + "name": "Identifier", + "src": "2668:3:4" + } + ], + "id": 1127, + "name": "MemberAccess", + "src": "2668:10:4" + }, + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1090, + "type": "bytes calldata", + "value": "_encryptedNote" + }, + "id": 1128, + "name": "Identifier", + "src": "2680:14:4" + } + ], + "id": 1129, + "name": "FunctionCall", + "src": "2654:41:4" + } + ], + "id": 1130, + "name": "EmitStatement", + "src": "2649:46:4" } ], - "id": 1179, + "id": 1131, "name": "Block", - "src": "2206:256:5" + "src": "2392:308:4" } ], - "id": 1180, + "id": 1132, "name": "FunctionDefinition", - "src": "2138:324:5" + "src": "2293:407:4" }, { "attributes": { @@ -7042,7 +7680,7 @@ null ], "name": "_processDeposit", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" @@ -7055,9 +7693,9 @@ ] }, "children": [], - "id": 1181, + "id": 1133, "name": "ParameterList", - "src": "2549:2:5" + "src": "2787:2:4" }, { "attributes": { @@ -7066,14 +7704,14 @@ ] }, "children": [], - "id": 1182, + "id": 1134, "name": "ParameterList", - "src": "2560:0:5" + "src": "2798:0:4" } ], - "id": 1183, + "id": 1135, "name": "FunctionDefinition", - "src": "2525:36:5" + "src": "2763:36:4" }, { "attributes": { @@ -7082,7 +7720,7 @@ "isConstructor": false, "kind": "function", "name": "withdraw", - "scope": 1363, + "scope": 1320, "stateMutability": "payable", "superFunction": null, "visibility": "external" @@ -7094,7 +7732,7 @@ "attributes": { "constant": false, "name": "_proof", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "calldata", "type": "bytes", @@ -7107,20 +7745,20 @@ "name": "bytes", "type": "bytes" }, - "id": 1184, + "id": 1136, "name": "ElementaryTypeName", - "src": "2976:5:5" + "src": "3214:5:4" } ], - "id": 1185, + "id": 1137, "name": "VariableDeclaration", - "src": "2976:21:5" + "src": "3214:21:4" }, { "attributes": { "constant": false, "name": "_root", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -7133,20 +7771,20 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1186, + "id": 1138, "name": "ElementaryTypeName", - "src": "2999:7:5" + "src": "3237:7:4" } ], - "id": 1187, + "id": 1139, "name": "VariableDeclaration", - "src": "2999:13:5" + "src": "3237:13:4" }, { "attributes": { "constant": false, "name": "_nullifierHash", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -7159,20 +7797,20 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1188, + "id": 1140, "name": "ElementaryTypeName", - "src": "3014:7:5" + "src": "3252:7:4" } ], - "id": 1189, + "id": 1141, "name": "VariableDeclaration", - "src": "3014:22:5" + "src": "3252:22:4" }, { "attributes": { "constant": false, "name": "_recipient", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -7186,20 +7824,20 @@ "stateMutability": "payable", "type": "address payable" }, - "id": 1190, + "id": 1142, "name": "ElementaryTypeName", - "src": "3038:15:5" + "src": "3276:15:4" } ], - "id": 1191, + "id": 1143, "name": "VariableDeclaration", - "src": "3038:26:5" + "src": "3276:26:4" }, { "attributes": { "constant": false, "name": "_relayer", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -7213,20 +7851,20 @@ "stateMutability": "payable", "type": "address payable" }, - "id": 1192, + "id": 1144, "name": "ElementaryTypeName", - "src": "3066:15:5" + "src": "3304:15:4" } ], - "id": 1193, + "id": 1145, "name": "VariableDeclaration", - "src": "3066:24:5" + "src": "3304:24:4" }, { "attributes": { "constant": false, "name": "_fee", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -7239,20 +7877,20 @@ "name": "uint256", "type": "uint256" }, - "id": 1194, + "id": 1146, "name": "ElementaryTypeName", - "src": "3092:7:5" + "src": "3330:7:4" } ], - "id": 1195, + "id": 1147, "name": "VariableDeclaration", - "src": "3092:12:5" + "src": "3330:12:4" }, { "attributes": { "constant": false, "name": "_refund", - "scope": 1268, + "scope": 1220, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -7265,19 +7903,19 @@ "name": "uint256", "type": "uint256" }, - "id": 1196, + "id": 1148, "name": "ElementaryTypeName", - "src": "3106:7:5" + "src": "3344:7:4" } ], - "id": 1197, + "id": 1149, "name": "VariableDeclaration", - "src": "3106:15:5" + "src": "3344:15:4" } ], - "id": 1198, + "id": 1150, "name": "ParameterList", - "src": "2975:147:5" + "src": "3213:147:4" }, { "attributes": { @@ -7286,9 +7924,9 @@ ] }, "children": [], - "id": 1201, + "id": 1153, "name": "ParameterList", - "src": "3153:0:5" + "src": "3391:0:4" }, { "attributes": { @@ -7301,18 +7939,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1392, + "referencedDeclaration": 1349, "type": "modifier ()", "value": "nonReentrant" }, - "id": 1199, + "id": 1151, "name": "Identifier", - "src": "3140:12:5" + "src": "3378:12:4" } ], - "id": 1200, + "id": 1152, "name": "ModifierInvocation", - "src": "3140:12:5" + "src": "3378:12:4" }, { "children": [ @@ -7346,16 +7984,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1202, + "id": 1154, "name": "Identifier", - "src": "3159:7:5" + "src": "3397:7:4" }, { "attributes": { @@ -7378,13 +8016,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1195, + "referencedDeclaration": 1147, "type": "uint256", "value": "_fee" }, - "id": 1203, + "id": 1155, "name": "Identifier", - "src": "3167:4:5" + "src": "3405:4:4" }, { "attributes": { @@ -7392,18 +8030,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1058, + "referencedDeclaration": 990, "type": "uint256", "value": "denomination" }, - "id": 1204, + "id": 1156, "name": "Identifier", - "src": "3175:12:5" + "src": "3413:12:4" } ], - "id": 1205, + "id": 1157, "name": "BinaryOperation", - "src": "3167:20:5" + "src": "3405:20:4" }, { "attributes": { @@ -7418,19 +8056,19 @@ "type": "literal_string \"Fee exceeds transfer value\"", "value": "Fee exceeds transfer value" }, - "id": 1206, + "id": 1158, "name": "Literal", - "src": "3189:28:5" + "src": "3427:28:4" } ], - "id": 1207, + "id": 1159, "name": "FunctionCall", - "src": "3159:59:5" + "src": "3397:59:4" } ], - "id": 1208, + "id": 1160, "name": "ExpressionStatement", - "src": "3159:59:5" + "src": "3397:59:4" }, { "children": [ @@ -7462,16 +8100,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1209, + "id": 1161, "name": "Identifier", - "src": "3224:7:5" + "src": "3462:7:4" }, { "attributes": { @@ -7501,13 +8139,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1062, + "referencedDeclaration": 994, "type": "mapping(bytes32 => bool)", "value": "nullifierHashes" }, - "id": 1210, + "id": 1162, "name": "Identifier", - "src": "3233:15:5" + "src": "3471:15:4" }, { "attributes": { @@ -7515,23 +8153,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1189, + "referencedDeclaration": 1141, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1211, + "id": 1163, "name": "Identifier", - "src": "3249:14:5" + "src": "3487:14:4" } ], - "id": 1212, + "id": 1164, "name": "IndexAccess", - "src": "3233:31:5" + "src": "3471:31:4" } ], - "id": 1213, + "id": 1165, "name": "UnaryOperation", - "src": "3232:32:5" + "src": "3470:32:4" }, { "attributes": { @@ -7546,19 +8184,19 @@ "type": "literal_string \"The note has been already spent\"", "value": "The note has been already spent" }, - "id": 1214, + "id": 1166, "name": "Literal", - "src": "3266:33:5" + "src": "3504:33:4" } ], - "id": 1215, + "id": 1167, "name": "FunctionCall", - "src": "3224:76:5" + "src": "3462:76:4" } ], - "id": 1216, + "id": 1168, "name": "ExpressionStatement", - "src": "3224:76:5" + "src": "3462:76:4" }, { "children": [ @@ -7590,16 +8228,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1217, + "id": 1169, "name": "Identifier", - "src": "3306:7:5" + "src": "3544:7:4" }, { "attributes": { @@ -7627,13 +8265,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 827, + "referencedDeclaration": 759, "type": "function (bytes32) view returns (bool)", "value": "isKnownRoot" }, - "id": 1218, + "id": 1170, "name": "Identifier", - "src": "3314:11:5" + "src": "3552:11:4" }, { "attributes": { @@ -7641,18 +8279,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1187, + "referencedDeclaration": 1139, "type": "bytes32", "value": "_root" }, - "id": 1219, + "id": 1171, "name": "Identifier", - "src": "3326:5:5" + "src": "3564:5:4" } ], - "id": 1220, + "id": 1172, "name": "FunctionCall", - "src": "3314:18:5" + "src": "3552:18:4" }, { "attributes": { @@ -7667,19 +8305,19 @@ "type": "literal_string \"Cannot find your merkle root\"", "value": "Cannot find your merkle root" }, - "id": 1221, + "id": 1173, "name": "Literal", - "src": "3334:30:5" + "src": "3572:30:4" } ], - "id": 1222, + "id": 1174, "name": "FunctionCall", - "src": "3306:59:5" + "src": "3544:59:4" } ], - "id": 1223, + "id": 1175, "name": "ExpressionStatement", - "src": "3306:59:5" + "src": "3544:59:4" }, { "children": [ @@ -7711,16 +8349,16 @@ } ], "overloadedDeclarations": [ - 1411, - 1412 + 1368, + 1369 ], - "referencedDeclaration": 1412, + "referencedDeclaration": 1369, "type": "function (bool,string memory) pure", "value": "require" }, - "id": 1224, + "id": 1176, "name": "Identifier", - "src": "3404:7:5" + "src": "3642:7:4" }, { "attributes": { @@ -7754,7 +8392,7 @@ "isPure": false, "lValueRequested": false, "member_name": "verifyProof", - "referencedDeclaration": 1040, + "referencedDeclaration": 972, "type": "function (bytes memory,uint256[6] memory) external returns (bool)" }, "children": [ @@ -7764,18 +8402,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1068, + "referencedDeclaration": 1000, "type": "contract IVerifier", "value": "verifier" }, - "id": 1225, + "id": 1177, "name": "Identifier", - "src": "3412:8:5" + "src": "3650:8:4" } ], - "id": 1226, + "id": 1178, "name": "MemberAccess", - "src": "3412:20:5" + "src": "3650:20:4" }, { "attributes": { @@ -7783,13 +8421,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1185, + "referencedDeclaration": 1137, "type": "bytes calldata", "value": "_proof" }, - "id": 1227, + "id": 1179, "name": "Identifier", - "src": "3433:6:5" + "src": "3671:6:4" }, { "attributes": { @@ -7832,9 +8470,9 @@ "type": "type(uint256)", "value": "uint256" }, - "id": 1228, + "id": 1180, "name": "ElementaryTypeNameExpression", - "src": "3442:7:5" + "src": "3680:7:4" }, { "attributes": { @@ -7842,18 +8480,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1187, + "referencedDeclaration": 1139, "type": "bytes32", "value": "_root" }, - "id": 1229, + "id": 1181, "name": "Identifier", - "src": "3450:5:5" + "src": "3688:5:4" } ], - "id": 1230, + "id": 1182, "name": "FunctionCall", - "src": "3442:14:5" + "src": "3680:14:4" }, { "attributes": { @@ -7885,9 +8523,9 @@ "type": "type(uint256)", "value": "uint256" }, - "id": 1231, + "id": 1183, "name": "ElementaryTypeNameExpression", - "src": "3458:7:5" + "src": "3696:7:4" }, { "attributes": { @@ -7895,18 +8533,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1189, + "referencedDeclaration": 1141, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1232, + "id": 1184, "name": "Identifier", - "src": "3466:14:5" + "src": "3704:14:4" } ], - "id": 1233, + "id": 1185, "name": "FunctionCall", - "src": "3458:23:5" + "src": "3696:23:4" }, { "attributes": { @@ -7938,9 +8576,9 @@ "type": "type(uint256)", "value": "uint256" }, - "id": 1234, + "id": 1186, "name": "ElementaryTypeNameExpression", - "src": "3483:7:5" + "src": "3721:7:4" }, { "attributes": { @@ -7948,18 +8586,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1191, + "referencedDeclaration": 1143, "type": "address payable", "value": "_recipient" }, - "id": 1235, + "id": 1187, "name": "Identifier", - "src": "3491:10:5" + "src": "3729:10:4" } ], - "id": 1236, + "id": 1188, "name": "FunctionCall", - "src": "3483:19:5" + "src": "3721:19:4" }, { "attributes": { @@ -7991,9 +8629,9 @@ "type": "type(uint256)", "value": "uint256" }, - "id": 1237, + "id": 1189, "name": "ElementaryTypeNameExpression", - "src": "3504:7:5" + "src": "3742:7:4" }, { "attributes": { @@ -8001,18 +8639,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1193, + "referencedDeclaration": 1145, "type": "address payable", "value": "_relayer" }, - "id": 1238, + "id": 1190, "name": "Identifier", - "src": "3512:8:5" + "src": "3750:8:4" } ], - "id": 1239, + "id": 1191, "name": "FunctionCall", - "src": "3504:17:5" + "src": "3742:17:4" }, { "attributes": { @@ -8020,13 +8658,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1195, + "referencedDeclaration": 1147, "type": "uint256", "value": "_fee" }, - "id": 1240, + "id": 1192, "name": "Identifier", - "src": "3523:4:5" + "src": "3761:4:4" }, { "attributes": { @@ -8034,23 +8672,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1197, + "referencedDeclaration": 1149, "type": "uint256", "value": "_refund" }, - "id": 1241, + "id": 1193, "name": "Identifier", - "src": "3529:7:5" + "src": "3767:7:4" } ], - "id": 1242, + "id": 1194, "name": "TupleExpression", - "src": "3441:96:5" + "src": "3679:96:4" } ], - "id": 1243, + "id": 1195, "name": "FunctionCall", - "src": "3412:126:5" + "src": "3650:126:4" }, { "attributes": { @@ -8065,19 +8703,19 @@ "type": "literal_string \"Invalid withdraw proof\"", "value": "Invalid withdraw proof" }, - "id": 1244, + "id": 1196, "name": "Literal", - "src": "3540:24:5" + "src": "3778:24:4" } ], - "id": 1245, + "id": 1197, "name": "FunctionCall", - "src": "3404:161:5" + "src": "3642:161:4" } ], - "id": 1246, + "id": 1198, "name": "ExpressionStatement", - "src": "3404:161:5" + "src": "3642:161:4" }, { "children": [ @@ -8108,13 +8746,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1062, + "referencedDeclaration": 994, "type": "mapping(bytes32 => bool)", "value": "nullifierHashes" }, - "id": 1247, + "id": 1199, "name": "Identifier", - "src": "3572:15:5" + "src": "3810:15:4" }, { "attributes": { @@ -8122,18 +8760,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1189, + "referencedDeclaration": 1141, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1248, + "id": 1200, "name": "Identifier", - "src": "3588:14:5" + "src": "3826:14:4" } ], - "id": 1249, + "id": 1201, "name": "IndexAccess", - "src": "3572:31:5" + "src": "3810:31:4" }, { "attributes": { @@ -8148,19 +8786,19 @@ "type": "bool", "value": "true" }, - "id": 1250, + "id": 1202, "name": "Literal", - "src": "3606:4:5" + "src": "3844:4:4" } ], - "id": 1251, + "id": 1203, "name": "Assignment", - "src": "3572:38:5" + "src": "3810:38:4" } ], - "id": 1252, + "id": 1204, "name": "ExpressionStatement", - "src": "3572:38:5" + "src": "3810:38:4" }, { "children": [ @@ -8202,13 +8840,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1279, + "referencedDeclaration": 1231, "type": "function (address payable,address payable,uint256,uint256)", "value": "_processWithdraw" }, - "id": 1253, + "id": 1205, "name": "Identifier", - "src": "3616:16:5" + "src": "3854:16:4" }, { "attributes": { @@ -8216,13 +8854,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1191, + "referencedDeclaration": 1143, "type": "address payable", "value": "_recipient" }, - "id": 1254, + "id": 1206, "name": "Identifier", - "src": "3633:10:5" + "src": "3871:10:4" }, { "attributes": { @@ -8230,13 +8868,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1193, + "referencedDeclaration": 1145, "type": "address payable", "value": "_relayer" }, - "id": 1255, + "id": 1207, "name": "Identifier", - "src": "3645:8:5" + "src": "3883:8:4" }, { "attributes": { @@ -8244,13 +8882,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1195, + "referencedDeclaration": 1147, "type": "uint256", "value": "_fee" }, - "id": 1256, + "id": 1208, "name": "Identifier", - "src": "3655:4:5" + "src": "3893:4:4" }, { "attributes": { @@ -8258,23 +8896,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1197, + "referencedDeclaration": 1149, "type": "uint256", "value": "_refund" }, - "id": 1257, + "id": 1209, "name": "Identifier", - "src": "3661:7:5" + "src": "3899:7:4" } ], - "id": 1258, + "id": 1210, "name": "FunctionCall", - "src": "3616:53:5" + "src": "3854:53:4" } ], - "id": 1259, + "id": 1211, "name": "ExpressionStatement", - "src": "3616:53:5" + "src": "3854:53:4" }, { "children": [ @@ -8316,13 +8954,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1102, + "referencedDeclaration": 1034, "type": "function (address,bytes32,address,uint256)", "value": "Withdrawal" }, - "id": 1260, + "id": 1212, "name": "Identifier", - "src": "3680:10:5" + "src": "3918:10:4" }, { "attributes": { @@ -8330,13 +8968,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1191, + "referencedDeclaration": 1143, "type": "address payable", "value": "_recipient" }, - "id": 1261, + "id": 1213, "name": "Identifier", - "src": "3691:10:5" + "src": "3929:10:4" }, { "attributes": { @@ -8344,13 +8982,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1189, + "referencedDeclaration": 1141, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1262, + "id": 1214, "name": "Identifier", - "src": "3703:14:5" + "src": "3941:14:4" }, { "attributes": { @@ -8358,13 +8996,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1193, + "referencedDeclaration": 1145, "type": "address payable", "value": "_relayer" }, - "id": 1263, + "id": 1215, "name": "Identifier", - "src": "3719:8:5" + "src": "3957:8:4" }, { "attributes": { @@ -8372,33 +9010,33 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1195, + "referencedDeclaration": 1147, "type": "uint256", "value": "_fee" }, - "id": 1264, + "id": 1216, "name": "Identifier", - "src": "3729:4:5" + "src": "3967:4:4" } ], - "id": 1265, + "id": 1217, "name": "FunctionCall", - "src": "3680:54:5" + "src": "3918:54:4" } ], - "id": 1266, + "id": 1218, "name": "EmitStatement", - "src": "3675:59:5" + "src": "3913:59:4" } ], - "id": 1267, + "id": 1219, "name": "Block", - "src": "3153:586:5" + "src": "3391:586:4" } ], - "id": 1268, + "id": 1220, "name": "FunctionDefinition", - "src": "2958:781:5" + "src": "3196:781:4" }, { "attributes": { @@ -8411,7 +9049,7 @@ null ], "name": "_processWithdraw", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "internal" @@ -8423,7 +9061,7 @@ "attributes": { "constant": false, "name": "_recipient", - "scope": 1279, + "scope": 1231, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -8437,20 +9075,20 @@ "stateMutability": "payable", "type": "address payable" }, - "id": 1269, + "id": 1221, "name": "ElementaryTypeName", - "src": "3828:15:5" + "src": "4066:15:4" } ], - "id": 1270, + "id": 1222, "name": "VariableDeclaration", - "src": "3828:26:5" + "src": "4066:26:4" }, { "attributes": { "constant": false, "name": "_relayer", - "scope": 1279, + "scope": 1231, "stateVariable": false, "storageLocation": "default", "type": "address payable", @@ -8464,20 +9102,20 @@ "stateMutability": "payable", "type": "address payable" }, - "id": 1271, + "id": 1223, "name": "ElementaryTypeName", - "src": "3856:15:5" + "src": "4094:15:4" } ], - "id": 1272, + "id": 1224, "name": "VariableDeclaration", - "src": "3856:24:5" + "src": "4094:24:4" }, { "attributes": { "constant": false, "name": "_relayer_fee", - "scope": 1279, + "scope": 1231, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -8490,20 +9128,20 @@ "name": "uint256", "type": "uint256" }, - "id": 1273, + "id": 1225, "name": "ElementaryTypeName", - "src": "3882:7:5" + "src": "4120:7:4" } ], - "id": 1274, + "id": 1226, "name": "VariableDeclaration", - "src": "3882:20:5" + "src": "4120:20:4" }, { "attributes": { "constant": false, "name": "_refund", - "scope": 1279, + "scope": 1231, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -8516,19 +9154,19 @@ "name": "uint256", "type": "uint256" }, - "id": 1275, + "id": 1227, "name": "ElementaryTypeName", - "src": "3904:7:5" + "src": "4142:7:4" } ], - "id": 1276, + "id": 1228, "name": "VariableDeclaration", - "src": "3904:15:5" + "src": "4142:15:4" } ], - "id": 1277, + "id": 1229, "name": "ParameterList", - "src": "3827:93:5" + "src": "4065:93:4" }, { "attributes": { @@ -8537,14 +9175,14 @@ ] }, "children": [], - "id": 1278, + "id": 1230, "name": "ParameterList", - "src": "3929:0:5" + "src": "4167:0:4" } ], - "id": 1279, + "id": 1231, "name": "FunctionDefinition", - "src": "3802:128:5" + "src": "4040:128:4" }, { "attributes": { @@ -8556,7 +9194,7 @@ null ], "name": "isSpent", - "scope": 1363, + "scope": 1320, "stateMutability": "view", "superFunction": null, "visibility": "public" @@ -8568,7 +9206,7 @@ "attributes": { "constant": false, "name": "_nullifierHash", - "scope": 1291, + "scope": 1243, "stateVariable": false, "storageLocation": "default", "type": "bytes32", @@ -8581,19 +9219,19 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1280, + "id": 1232, "name": "ElementaryTypeName", - "src": "3997:7:5" + "src": "4235:7:4" } ], - "id": 1281, + "id": 1233, "name": "VariableDeclaration", - "src": "3997:22:5" + "src": "4235:22:4" } ], - "id": 1282, + "id": 1234, "name": "ParameterList", - "src": "3996:24:5" + "src": "4234:24:4" }, { "children": [ @@ -8601,7 +9239,7 @@ "attributes": { "constant": false, "name": "", - "scope": 1291, + "scope": 1243, "stateVariable": false, "storageLocation": "default", "type": "bool", @@ -8614,25 +9252,25 @@ "name": "bool", "type": "bool" }, - "id": 1283, + "id": 1235, "name": "ElementaryTypeName", - "src": "4041:4:5" + "src": "4279:4:4" } ], - "id": 1284, + "id": 1236, "name": "VariableDeclaration", - "src": "4041:4:5" + "src": "4279:4:4" } ], - "id": 1285, + "id": 1237, "name": "ParameterList", - "src": "4040:6:5" + "src": "4278:6:4" }, { "children": [ { "attributes": { - "functionReturnParameters": 1285 + "functionReturnParameters": 1237 }, "children": [ { @@ -8651,13 +9289,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1062, + "referencedDeclaration": 994, "type": "mapping(bytes32 => bool)", "value": "nullifierHashes" }, - "id": 1286, + "id": 1238, "name": "Identifier", - "src": "4060:15:5" + "src": "4298:15:4" }, { "attributes": { @@ -8665,33 +9303,33 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1281, + "referencedDeclaration": 1233, "type": "bytes32", "value": "_nullifierHash" }, - "id": 1287, + "id": 1239, "name": "Identifier", - "src": "4076:14:5" + "src": "4314:14:4" } ], - "id": 1288, + "id": 1240, "name": "IndexAccess", - "src": "4060:31:5" + "src": "4298:31:4" } ], - "id": 1289, + "id": 1241, "name": "Return", - "src": "4053:38:5" + "src": "4291:38:4" } ], - "id": 1290, + "id": 1242, "name": "Block", - "src": "4047:49:5" + "src": "4285:49:4" } ], - "id": 1291, + "id": 1243, "name": "FunctionDefinition", - "src": "3980:116:5" + "src": "4218:116:4" }, { "attributes": { @@ -8703,7 +9341,7 @@ null ], "name": "isSpentArray", - "scope": 1363, + "scope": 1320, "stateMutability": "view", "superFunction": null, "visibility": "external" @@ -8715,7 +9353,7 @@ "attributes": { "constant": false, "name": "_nullifierHashes", - "scope": 1336, + "scope": 1288, "stateVariable": false, "storageLocation": "calldata", "type": "bytes32[]", @@ -8734,24 +9372,24 @@ "name": "bytes32", "type": "bytes32" }, - "id": 1292, + "id": 1244, "name": "ElementaryTypeName", - "src": "4179:7:5" + "src": "4417:7:4" } ], - "id": 1293, + "id": 1245, "name": "ArrayTypeName", - "src": "4179:9:5" + "src": "4417:9:4" } ], - "id": 1294, + "id": 1246, "name": "VariableDeclaration", - "src": "4179:35:5" + "src": "4417:35:4" } ], - "id": 1295, + "id": 1247, "name": "ParameterList", - "src": "4178:37:5" + "src": "4416:37:4" }, { "children": [ @@ -8759,7 +9397,7 @@ "attributes": { "constant": false, "name": "spent", - "scope": 1336, + "scope": 1288, "stateVariable": false, "storageLocation": "memory", "type": "bool[]", @@ -8778,24 +9416,24 @@ "name": "bool", "type": "bool" }, - "id": 1296, + "id": 1248, "name": "ElementaryTypeName", - "src": "4238:4:5" + "src": "4476:4:4" } ], - "id": 1297, + "id": 1249, "name": "ArrayTypeName", - "src": "4238:6:5" + "src": "4476:6:4" } ], - "id": 1298, + "id": 1250, "name": "VariableDeclaration", - "src": "4238:19:5" + "src": "4476:19:4" } ], - "id": 1299, + "id": 1251, "name": "ParameterList", - "src": "4237:21:5" + "src": "4475:21:4" }, { "children": [ @@ -8818,13 +9456,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1298, + "referencedDeclaration": 1250, "type": "bool[] memory", "value": "spent" }, - "id": 1300, + "id": 1252, "name": "Identifier", - "src": "4265:5:5" + "src": "4503:5:4" }, { "attributes": { @@ -8867,19 +9505,19 @@ "name": "bool", "type": "bool" }, - "id": 1301, + "id": 1253, "name": "ElementaryTypeName", - "src": "4277:4:5" + "src": "4515:4:4" } ], - "id": 1302, + "id": 1254, "name": "ArrayTypeName", - "src": "4277:6:5" + "src": "4515:6:4" } ], - "id": 1303, + "id": 1255, "name": "NewExpression", - "src": "4273:10:5" + "src": "4511:10:4" }, { "attributes": { @@ -8899,40 +9537,40 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1294, + "referencedDeclaration": 1246, "type": "bytes32[] calldata", "value": "_nullifierHashes" }, - "id": 1304, + "id": 1256, "name": "Identifier", - "src": "4284:16:5" + "src": "4522:16:4" } ], - "id": 1305, + "id": 1257, "name": "MemberAccess", - "src": "4284:23:5" + "src": "4522:23:4" } ], - "id": 1306, + "id": 1258, "name": "FunctionCall", - "src": "4273:35:5" + "src": "4511:35:4" } ], - "id": 1307, + "id": 1259, "name": "Assignment", - "src": "4265:43:5" + "src": "4503:43:4" } ], - "id": 1308, + "id": 1260, "name": "ExpressionStatement", - "src": "4265:43:5" + "src": "4503:43:4" }, { "children": [ { "attributes": { "assignments": [ - 1310 + 1262 ] }, "children": [ @@ -8940,7 +9578,7 @@ "attributes": { "constant": false, "name": "i", - "scope": 1334, + "scope": 1286, "stateVariable": false, "storageLocation": "default", "type": "uint256", @@ -8953,14 +9591,14 @@ "name": "uint", "type": "uint256" }, - "id": 1309, + "id": 1261, "name": "ElementaryTypeName", - "src": "4318:4:5" + "src": "4556:4:4" } ], - "id": 1310, + "id": 1262, "name": "VariableDeclaration", - "src": "4318:6:5" + "src": "4556:6:4" }, { "attributes": { @@ -8975,14 +9613,14 @@ "type": "int_const 0", "value": "0" }, - "id": 1311, + "id": 1263, "name": "Literal", - "src": "4327:1:5" + "src": "4565:1:4" } ], - "id": 1312, + "id": 1264, "name": "VariableDeclarationStatement", - "src": "4318:10:5" + "src": "4556:10:4" }, { "attributes": { @@ -9005,13 +9643,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1310, + "referencedDeclaration": 1262, "type": "uint256", "value": "i" }, - "id": 1313, + "id": 1265, "name": "Identifier", - "src": "4330:1:5" + "src": "4568:1:4" }, { "attributes": { @@ -9031,23 +9669,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1294, + "referencedDeclaration": 1246, "type": "bytes32[] calldata", "value": "_nullifierHashes" }, - "id": 1314, + "id": 1266, "name": "Identifier", - "src": "4334:16:5" + "src": "4572:16:4" } ], - "id": 1315, + "id": 1267, "name": "MemberAccess", - "src": "4334:23:5" + "src": "4572:23:4" } ], - "id": 1316, + "id": 1268, "name": "BinaryOperation", - "src": "4330:27:5" + "src": "4568:27:4" }, { "children": [ @@ -9069,23 +9707,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1310, + "referencedDeclaration": 1262, "type": "uint256", "value": "i" }, - "id": 1317, + "id": 1269, "name": "Identifier", - "src": "4359:1:5" + "src": "4597:1:4" } ], - "id": 1318, + "id": 1270, "name": "UnaryOperation", - "src": "4359:3:5" + "src": "4597:3:4" } ], - "id": 1319, + "id": 1271, "name": "ExpressionStatement", - "src": "4359:3:5" + "src": "4597:3:4" }, { "children": [ @@ -9120,13 +9758,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1291, + "referencedDeclaration": 1243, "type": "function (bytes32) view returns (bool)", "value": "isSpent" }, - "id": 1320, + "id": 1272, "name": "Identifier", - "src": "4376:7:5" + "src": "4614:7:4" }, { "attributes": { @@ -9144,13 +9782,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1294, + "referencedDeclaration": 1246, "type": "bytes32[] calldata", "value": "_nullifierHashes" }, - "id": 1321, + "id": 1273, "name": "Identifier", - "src": "4384:16:5" + "src": "4622:16:4" }, { "attributes": { @@ -9158,23 +9796,23 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1310, + "referencedDeclaration": 1262, "type": "uint256", "value": "i" }, - "id": 1322, + "id": 1274, "name": "Identifier", - "src": "4401:1:5" + "src": "4639:1:4" } ], - "id": 1323, + "id": 1275, "name": "IndexAccess", - "src": "4384:19:5" + "src": "4622:19:4" } ], - "id": 1324, + "id": 1276, "name": "FunctionCall", - "src": "4376:28:5" + "src": "4614:28:4" }, { "children": [ @@ -9207,13 +9845,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1298, + "referencedDeclaration": 1250, "type": "bool[] memory", "value": "spent" }, - "id": 1325, + "id": 1277, "name": "Identifier", - "src": "4416:5:5" + "src": "4654:5:4" }, { "attributes": { @@ -9221,18 +9859,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1310, + "referencedDeclaration": 1262, "type": "uint256", "value": "i" }, - "id": 1326, + "id": 1278, "name": "Identifier", - "src": "4422:1:5" + "src": "4660:1:4" } ], - "id": 1327, + "id": 1279, "name": "IndexAccess", - "src": "4416:8:5" + "src": "4654:8:4" }, { "attributes": { @@ -9247,49 +9885,49 @@ "type": "bool", "value": "true" }, - "id": 1328, + "id": 1280, "name": "Literal", - "src": "4427:4:5" + "src": "4665:4:4" } ], - "id": 1329, + "id": 1281, "name": "Assignment", - "src": "4416:15:5" + "src": "4654:15:4" } ], - "id": 1330, + "id": 1282, "name": "ExpressionStatement", - "src": "4416:15:5" + "src": "4654:15:4" } ], - "id": 1331, + "id": 1283, "name": "Block", - "src": "4406:34:5" + "src": "4644:34:4" } ], - "id": 1332, + "id": 1284, "name": "IfStatement", - "src": "4372:68:5" + "src": "4610:68:4" } ], - "id": 1333, + "id": 1285, "name": "Block", - "src": "4364:82:5" + "src": "4602:82:4" } ], - "id": 1334, + "id": 1286, "name": "ForStatement", - "src": "4314:132:5" + "src": "4552:132:4" } ], - "id": 1335, + "id": 1287, "name": "Block", - "src": "4259:191:5" + "src": "4497:191:4" } ], - "id": 1336, + "id": 1288, "name": "FunctionDefinition", - "src": "4157:293:5" + "src": "4395:293:4" }, { "attributes": { @@ -9298,7 +9936,7 @@ "isConstructor": false, "kind": "function", "name": "updateVerifier", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -9310,7 +9948,7 @@ "attributes": { "constant": false, "name": "_newVerifier", - "scope": 1350, + "scope": 1302, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -9324,19 +9962,19 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1337, + "id": 1289, "name": "ElementaryTypeName", - "src": "4704:7:5" + "src": "4942:7:4" } ], - "id": 1338, + "id": 1290, "name": "VariableDeclaration", - "src": "4704:20:5" + "src": "4942:20:4" } ], - "id": 1339, + "id": 1291, "name": "ParameterList", - "src": "4703:22:5" + "src": "4941:22:4" }, { "attributes": { @@ -9345,9 +9983,9 @@ ] }, "children": [], - "id": 1342, + "id": 1294, "name": "ParameterList", - "src": "4748:0:5" + "src": "4986:0:4" }, { "attributes": { @@ -9360,18 +9998,18 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1084, + "referencedDeclaration": 1016, "type": "modifier ()", "value": "onlyOperator" }, - "id": 1340, + "id": 1292, "name": "Identifier", - "src": "4735:12:5" + "src": "4973:12:4" } ], - "id": 1341, + "id": 1293, "name": "ModifierInvocation", - "src": "4735:12:5" + "src": "4973:12:4" }, { "children": [ @@ -9394,13 +10032,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1068, + "referencedDeclaration": 1000, "type": "contract IVerifier", "value": "verifier" }, - "id": 1343, + "id": 1295, "name": "Identifier", - "src": "4754:8:5" + "src": "4992:8:4" }, { "attributes": { @@ -9428,13 +10066,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1041, + "referencedDeclaration": 973, "type": "type(contract IVerifier)", "value": "IVerifier" }, - "id": 1344, + "id": 1296, "name": "Identifier", - "src": "4765:9:5" + "src": "5003:9:4" }, { "attributes": { @@ -9442,38 +10080,38 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1338, + "referencedDeclaration": 1290, "type": "address", "value": "_newVerifier" }, - "id": 1345, + "id": 1297, "name": "Identifier", - "src": "4775:12:5" + "src": "5013:12:4" } ], - "id": 1346, + "id": 1298, "name": "FunctionCall", - "src": "4765:23:5" + "src": "5003:23:4" } ], - "id": 1347, + "id": 1299, "name": "Assignment", - "src": "4754:34:5" + "src": "4992:34:4" } ], - "id": 1348, + "id": 1300, "name": "ExpressionStatement", - "src": "4754:34:5" + "src": "4992:34:4" } ], - "id": 1349, + "id": 1301, "name": "Block", - "src": "4748:45:5" + "src": "4986:45:4" } ], - "id": 1350, + "id": 1302, "name": "FunctionDefinition", - "src": "4680:113:5" + "src": "4918:113:4" }, { "attributes": { @@ -9482,7 +10120,7 @@ "isConstructor": false, "kind": "function", "name": "changeOperator", - "scope": 1363, + "scope": 1320, "stateMutability": "nonpayable", "superFunction": null, "visibility": "external" @@ -9494,7 +10132,7 @@ "attributes": { "constant": false, "name": "_newOperator", - "scope": 1362, + "scope": 1319, "stateVariable": false, "storageLocation": "default", "type": "address", @@ -9508,19 +10146,19 @@ "stateMutability": "nonpayable", "type": "address" }, - "id": 1351, + "id": 1303, "name": "ElementaryTypeName", - "src": "4867:7:5" + "src": "5105:7:4" } ], - "id": 1352, + "id": 1304, "name": "VariableDeclaration", - "src": "4867:20:5" + "src": "5105:20:4" } ], - "id": 1353, + "id": 1305, "name": "ParameterList", - "src": "4866:22:5" + "src": "5104:22:4" }, { "attributes": { @@ -9529,9 +10167,9 @@ ] }, "children": [], - "id": 1356, + "id": 1308, "name": "ParameterList", - "src": "4911:0:5" + "src": "5149:0:4" }, { "attributes": { @@ -9544,21 +10182,99 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1084, + "referencedDeclaration": 1016, "type": "modifier ()", "value": "onlyOperator" }, - "id": 1354, + "id": 1306, "name": "Identifier", - "src": "4898:12:5" + "src": "5136:12:4" } ], - "id": 1355, + "id": 1307, "name": "ModifierInvocation", - "src": "4898:12:5" + "src": "5136:12:4" }, { "children": [ + { + "children": [ + { + "attributes": { + "argumentTypes": null, + "isConstant": false, + "isLValue": false, + "isPure": false, + "isStructConstructorCall": false, + "lValueRequested": false, + "names": [ + null + ], + "type": "tuple()", + "type_conversion": false + }, + "children": [ + { + "attributes": { + "argumentTypes": [ + { + "typeIdentifier": "t_address", + "typeString": "address" + }, + { + "typeIdentifier": "t_address", + "typeString": "address" + } + ], + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1040, + "type": "function (address,address)", + "value": "OwnershipTransferred" + }, + "id": 1309, + "name": "Identifier", + "src": "5160:20:4" + }, + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1004, + "type": "address", + "value": "operator" + }, + "id": 1310, + "name": "Identifier", + "src": "5181:8:4" + }, + { + "attributes": { + "argumentTypes": null, + "overloadedDeclarations": [ + null + ], + "referencedDeclaration": 1304, + "type": "address", + "value": "_newOperator" + }, + "id": 1311, + "name": "Identifier", + "src": "5191:12:4" + } + ], + "id": 1312, + "name": "FunctionCall", + "src": "5160:44:4" + } + ], + "id": 1313, + "name": "EmitStatement", + "src": "5155:49:4" + }, { "children": [ { @@ -9578,13 +10294,13 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1072, + "referencedDeclaration": 1004, "type": "address", "value": "operator" }, - "id": 1357, + "id": 1314, "name": "Identifier", - "src": "4917:8:5" + "src": "5210:8:4" }, { "attributes": { @@ -9592,43 +10308,43 @@ "overloadedDeclarations": [ null ], - "referencedDeclaration": 1352, + "referencedDeclaration": 1304, "type": "address", "value": "_newOperator" }, - "id": 1358, + "id": 1315, "name": "Identifier", - "src": "4928:12:5" + "src": "5221:12:4" } ], - "id": 1359, + "id": 1316, "name": "Assignment", - "src": "4917:23:5" + "src": "5210:23:4" } ], - "id": 1360, + "id": 1317, "name": "ExpressionStatement", - "src": "4917:23:5" + "src": "5210:23:4" } ], - "id": 1361, + "id": 1318, "name": "Block", - "src": "4911:34:5" + "src": "5149:89:4" } ], - "id": 1362, + "id": 1319, "name": "FunctionDefinition", - "src": "4843:102:5" + "src": "5081:157:4" } ], - "id": 1363, + "id": 1320, "name": "ContractDefinition", - "src": "383:4564:5" + "src": "383:4857:4" } ], - "id": 1364, + "id": 1321, "name": "SourceUnit", - "src": "0:4948:5" + "src": "0:5241:4" }, "compiler": { "name": "solc", @@ -9636,7 +10352,7 @@ }, "networks": {}, "schemaVersion": "3.3.4", - "updatedAt": "2021-04-12T00:15:10.071Z", + "updatedAt": "2021-04-18T15:21:30.819Z", "devdoc": { "methods": { "changeOperator(address)": { @@ -9651,7 +10367,7 @@ "_verifier": "the address of SNARK verifier for this contract" } }, - "deposit(bytes32)": { + "deposit(bytes32,bytes)": { "details": "Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance.", "params": { "_commitment": "the note commitment, which is PedersenHash(nullifier + secret)" diff --git a/contracts/Tornado.sol b/contracts/Tornado.sol index 7ababeb..8cb5f90 100644 --- a/contracts/Tornado.sol +++ b/contracts/Tornado.sol @@ -31,6 +31,7 @@ contract Tornado is MerkleTreeWithHistory, ReentrancyGuard { event Deposit(bytes32 indexed commitment, uint32 leafIndex, uint256 timestamp); event Withdrawal(address to, bytes32 nullifierHash, address indexed relayer, uint256 fee); event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); + event EncryptedNote(address indexed sender, bytes encryptedNote); /** @dev The constructor @@ -57,7 +58,7 @@ contract Tornado is MerkleTreeWithHistory, ReentrancyGuard { @dev Deposit funds into the contract. The caller must send (for ETH) or approve (for ERC20) value equal to or `denomination` of this instance. @param _commitment the note commitment, which is PedersenHash(nullifier + secret) */ - function deposit(bytes32 _commitment) external payable nonReentrant { + function deposit(bytes32 _commitment, bytes calldata _encryptedNote) external payable nonReentrant { require(!commitments[_commitment], "The commitment has been submitted"); uint32 insertedIndex = _insert(_commitment); @@ -65,6 +66,7 @@ contract Tornado is MerkleTreeWithHistory, ReentrancyGuard { _processDeposit(); emit Deposit(_commitment, insertedIndex, block.timestamp); + emit EncryptedNote(msg.sender, _encryptedNote); } /** @dev this function is defined in a child contract */ diff --git a/test/ERC20Tornado.test.js b/test/ERC20Tornado.test.js index 49de4fd..81c4181 100644 --- a/test/ERC20Tornado.test.js +++ b/test/ERC20Tornado.test.js @@ -94,7 +94,7 @@ contract('ERC20Tornado', accounts => { const commitment = toFixedHex(43) await token.approve(tornado.address, tokenDenomination) - let { logs } = await tornado.deposit(commitment, { from: sender }) + let { logs } = await tornado.deposit(commitment, [], { from: sender }) logs[0].event.should.be.equal('Deposit') logs[0].args.commitment.should.be.equal(commitment) @@ -105,7 +105,7 @@ contract('ERC20Tornado', accounts => { const commitment = toFixedHex(43) await token.approve(tornado.address, tokenDenomination) - let error = await tornado.deposit(commitment, { from: sender, value: 1e6 }).should.be.rejected + let error = await tornado.deposit(commitment, [], { from: sender, value: 1e6 }).should.be.rejected error.reason.should.be.equal('ETH value is supposed to be 0 for ERC20 instance') }) }) @@ -122,7 +122,7 @@ contract('ERC20Tornado', accounts => { // Uncomment to measure gas usage // let gas = await tornado.deposit.estimateGas(toBN(deposit.commitment.toString()), { from: user, gasPrice: '0' }) // console.log('deposit gas:', gas) - await tornado.deposit(toFixedHex(deposit.commitment), { from: user, gasPrice: '0' }) + await tornado.deposit(toFixedHex(deposit.commitment), [], { from: user, gasPrice: '0' }) const balanceUserAfter = await token.balanceOf(user) balanceUserAfter.should.be.eq.BN(toBN(balanceUserBefore).sub(toBN(tokenDenomination))) @@ -209,7 +209,7 @@ contract('ERC20Tornado', accounts => { // Uncomment to measure gas usage // let gas = await tornado.deposit.estimateGas(toBN(deposit.commitment.toString()), { from: user, gasPrice: '0' }) // console.log('deposit gas:', gas) - await tornado.deposit(toFixedHex(deposit.commitment), { + await tornado.deposit(toFixedHex(deposit.commitment), [], { from: user, gasPrice: "0", }); @@ -329,7 +329,7 @@ contract('ERC20Tornado', accounts => { const balanceUserBefore = await token.balanceOf(user) await token.approve(tornado.address, tokenDenomination, { from: user }) - await tornado.deposit(toFixedHex(deposit.commitment), { from: user, gasPrice: '0' }) + await tornado.deposit(toFixedHex(deposit.commitment), [], { from: user, gasPrice: '0' }) const balanceUserAfter = await token.balanceOf(user) balanceUserAfter.should.be.eq.BN(toBN(balanceUserBefore).sub(toBN(tokenDenomination))) @@ -405,7 +405,7 @@ contract('ERC20Tornado', accounts => { await tree.insert(deposit.commitment) await token.mint(user, tokenDenomination) await token.approve(tornado.address, tokenDenomination, { from: user }) - await tornado.deposit(toFixedHex(deposit.commitment), { from: user, gasPrice: '0' }) + await tornado.deposit(toFixedHex(deposit.commitment), [], { from: user, gasPrice: '0' }) const { root, path_elements, path_index } = await tree.path(0) @@ -468,7 +468,7 @@ contract('ERC20Tornado', accounts => { console.log('approve done') const allowanceUser = await usdtToken.allowance(user, tornado.address) console.log('allowanceUser', allowanceUser.toString()) - await tornado.deposit(toFixedHex(deposit.commitment), { from: user, gasPrice: '0' }) + await tornado.deposit(toFixedHex(deposit.commitment), [], { from: user, gasPrice: '0' }) console.log('deposit done') const balanceUserAfter = await usdtToken.balanceOf(user) @@ -557,7 +557,7 @@ contract('ERC20Tornado', accounts => { console.log('balanceUserBefore', balanceUserBefore.toString()) await token.approve(tornado.address, tokenDenomination, { from: user }) console.log('approve done') - await tornado.deposit(toFixedHex(deposit.commitment), { from: user, gasPrice: '0' }) + await tornado.deposit(toFixedHex(deposit.commitment), [], { from: user, gasPrice: '0' }) console.log('deposit done') const balanceUserAfter = await token.balanceOf(user)